[maemo-commits] [maemo-commits] r10575 - in projects/haf/trunk/hildon-desktop: . debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Mar 14 12:51:57 EET 2007
- Previous message: [maemo-commits] r10574 - in projects/haf/branches/hildon-control-panel/refactoring: . debian src
- Next message: [maemo-commits] r10576 - projects/haf/branches/hildon-control-panel/refactoring/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-03-14 12:51:54 +0200 (Wed, 14 Mar 2007) New Revision: 10575 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/configure.ac projects/haf/trunk/hildon-desktop/debian/changelog projects/haf/trunk/hildon-desktop/debian/control projects/haf/trunk/hildon-desktop/src/Makefile.am projects/haf/trunk/hildon-desktop/src/hd-desktop.c projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c projects/haf/trunk/hildon-desktop/src/hd-home-window.c projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.h Log: 2007-03-14 Lucas Rocha <lucas.rocha at nokia.com> * debian/control, debian/changelog, src/hd-desktop.c, src/hd-select-plugins-dialog.c, src/hd-home-window.c, src/hd-select-plugins-dialog.h, src/Makefile.am, src/hd-home-background-dialog.c, configure.ac: Moved from libosso-help to hildon-help. Patch from Gabriel Schulhof <gabriel.schulhof at nokia.com>. Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-03-14 10:51:54 UTC (rev 10575) @@ -1,5 +1,13 @@ 2007-03-14 Lucas Rocha <lucas.rocha at nokia.com> + * debian/control, debian/changelog, src/hd-desktop.c, + src/hd-select-plugins-dialog.c, src/hd-home-window.c, + src/hd-select-plugins-dialog.h, src/Makefile.am, + src/hd-home-background-dialog.c, configure.ac: Moved from libosso-help + to hildon-help. Patch from Gabriel Schulhof <gabriel.schulhof at nokia.com>. + +2007-03-14 Lucas Rocha <lucas.rocha at nokia.com> + * src/hd-desktop.c: activate the "stretch" property for panel containers. * src/hn-others-button.c: replace some error with warnings as they are Modified: projects/haf/trunk/hildon-desktop/configure.ac =================================================================== --- projects/haf/trunk/hildon-desktop/configure.ac 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/configure.ac 2007-03-14 10:51:54 UTC (rev 10575) @@ -98,12 +98,12 @@ AC_SUBST(OSSO_LIBS) AC_SUBST(OSSO_CFLAGS) -PKG_CHECK_MODULES(OSSO_HELP, - [libossohelp], - AC_DEFINE(HAVE_LIBOSSOHELP, [], [Whether libossohelp is present on the system]), - [AC_MSG_NOTICE([libossohelp not present.])]) -AC_SUBST(OSSO_HELP_CFLAGS) -AC_SUBST(OSSO_HELP_LIBS) +PKG_CHECK_MODULES(HILDON_HELP, + [hildon-help], + AC_DEFINE(HAVE_LIBHILDONHELP, [], [Whether hildon-help is present on the system]), + [AC_MSG_NOTICE([hildon-help not present.])]) +AC_SUBST(HILDON_HELP_CFLAGS) +AC_SUBST(HILDON_HELP_LIBS) PKG_CHECK_MODULES(HILDON, [hildon-1], Modified: projects/haf/trunk/hildon-desktop/debian/changelog =================================================================== --- projects/haf/trunk/hildon-desktop/debian/changelog 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/debian/changelog 2007-03-14 10:51:54 UTC (rev 10575) @@ -1,3 +1,9 @@ +hildon-desktop (0.0.0-33) unstable; urgency=low + + * Move from libosso-help to hildon-help + + -- Lucas Rocha <lucas.rocha at nokia.com> Wed, 14 Mar 2007 12:45:22 +0200 + hildon-desktop (0.0.0-32) unstable; urgency=low * New experimental snapshot Modified: projects/haf/trunk/hildon-desktop/debian/control =================================================================== --- projects/haf/trunk/hildon-desktop/debian/control 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/debian/control 2007-03-14 10:51:54 UTC (rev 10575) @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Johan Bilien <johan.bilien at nokia.com> -Build-Depends: debhelper (>= 4.0.0), libhildon1-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev, libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev +Build-Depends: debhelper (>= 4.0.0), libhildon1-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev, libhildonhelp-dev, libxtst-dev, libxml2-dev, osso-esd-dev Standards-Version: 3.6.0 Package: hildon-desktop Modified: projects/haf/trunk/hildon-desktop/src/Makefile.am =================================================================== --- projects/haf/trunk/hildon-desktop/src/Makefile.am 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/src/Makefile.am 2007-03-14 10:51:54 UTC (rev 10575) @@ -10,7 +10,7 @@ $(HILDON_CFLAGS) \ $(HILDON_FM_CFLAGS) \ $(OSSO_CFLAGS) \ - $(OSSO_HELP_CFLAGS) \ + $(HILDON_HELP_CFLAGS) \ $(GCONF_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ @@ -34,7 +34,7 @@ $(HILDON_FM_LIBS) \ $(OSSO_LIBS) \ $(GCONF_LIBS) \ - $(OSSO_HELP_LIBS) \ + $(HILDON_HELP_LIBS) \ $(GNOME_VFS_LIBS) \ $(DBUS_GLIB_LIBS) Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-desktop.c 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c 2007-03-14 10:51:54 UTC (rev 10575) @@ -321,7 +321,7 @@ loaded_plugins = gtk_container_get_children (window->container); response = hd_select_plugins_dialog_run (loaded_plugins, -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP priv->osso_context, #endif info->plugin_dir, Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/src/hd-home-background-dialog.c 2007-03-14 10:51:54 UTC (rev 10575) @@ -26,8 +26,8 @@ #include <config.h> #endif -#ifdef HAVE_LIBOSSOHELP -#include <osso-helplib.h> +#ifdef HAVE_LIBHILDONHELP +#include <hildon/hildon-help.h> #endif #ifdef HAVE_LIBOSSO @@ -379,12 +379,12 @@ case PROP_OSSO_CONTEXT: priv->osso_context = g_value_get_pointer (value); -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP /* Add help button */ if (priv->osso_context) - ossohelp_dialog_help_enable (GTK_DIALOG (gobject), - HH_HELP_SET_BACKGROUND, - priv->osso_context); + hildon_help_dialog_help_enable (GTK_DIALOG (gobject), + HH_HELP_SET_BACKGROUND, + priv->osso_context); #endif break; @@ -415,7 +415,7 @@ g_value_set_string (value, priv->background_dir); break; -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP case PROP_OSSO_CONTEXT: g_value_set_pointer (value, priv->osso_context); break; @@ -486,11 +486,11 @@ NULL); #endif -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP if (priv->osso_context) - ossohelp_dialog_help_enable (GTK_DIALOG(fdialog), - HH_HELP_SELECT_IMAGE, - priv->osso_context); + hildon_help_dialog_help_enable (GTK_DIALOG(fdialog), + HH_HELP_SELECT_IMAGE, + priv->osso_context); #endif mime_type_filter = gtk_file_filter_new(); Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-03-14 10:51:54 UTC (rev 10575) @@ -26,8 +26,8 @@ #include <config.h> #endif -#ifdef HAVE_LIBOSSOHELP -#include <osso-helplib.h> +#ifdef HAVE_LIBHILDONHELP +#include <hildon/hildon-help.h> #endif #ifdef HAVE_LIBOSSO @@ -138,7 +138,7 @@ static void hd_home_window_calibration_activate (HDHomeWindow *window); -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP static void hd_home_window_help_activate (HDHomeWindow *window); #endif @@ -768,7 +768,7 @@ gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item); gtk_widget_show (menu_item); -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP /* help */ menu_item = gtk_menu_item_new_with_label (HH_MENU_HELP); gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item); @@ -827,7 +827,7 @@ } gtk_widget_show (mi); -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP mi = gtk_menu_item_new_with_label (HH_MENU_LAYOUT_HELP); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); g_signal_connect_swapped (mi, "activate", @@ -881,7 +881,7 @@ } #endif -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP static void hd_home_window_help_activate (HDHomeWindow *window) { @@ -899,13 +899,13 @@ return; if (hildon_home_area_get_layout_mode (area)) - res = ossohelp_show (priv->osso_context, - HH_HELP_LAYOUT_MODE, - OSSO_HELP_SHOW_DIALOG); + res = hildon_help_show (priv->osso_context, + HH_HELP_LAYOUT_MODE, + HILDON_HELP_SHOW_DIALOG); else - res = ossohelp_show (priv->osso_context, - HH_HELP, - 0); + res = hildon_help_show (priv->osso_context, + HH_HELP, + 0); switch (res) { @@ -1063,7 +1063,7 @@ if (HILDON_IS_HOME_TITLEBAR (titlebar)) { -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP g_signal_connect_swapped (titlebar, "help-activate", G_CALLBACK (hd_home_window_help_activate), window); Modified: projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.c 2007-03-14 10:51:54 UTC (rev 10575) @@ -32,9 +32,9 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP #include <libosso.h> -#include <osso-helplib.h> +#include <hildon/hildon-help.h> #endif #include "hd-select-plugins-dialog.h" @@ -227,7 +227,7 @@ gint hd_select_plugins_dialog_run (GList *loaded_plugins, -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP osso_context_t *osso_context, #endif const gchar *plugin_dir, @@ -261,11 +261,11 @@ gtk_widget_set_size_request (dialog, HD_SELECT_PLUGINS_DIALOG_WIDTH, -1); -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP /* Add help button to the dialog */ - ossohelp_dialog_help_enable (GTK_DIALOG (dialog), - HD_SELECT_PLUGINS_HELP_TOPIC, - osso_context); + hildon_help_dialog_help_enable (GTK_DIALOG (dialog), + HD_SELECT_PLUGINS_HELP_TOPIC, + osso_context); #endif scrollwindow = gtk_scrolled_window_new (NULL, NULL); Modified: projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.h =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.h 2007-03-14 10:44:48 UTC (rev 10574) +++ projects/haf/trunk/hildon-desktop/src/hd-select-plugins-dialog.h 2007-03-14 10:51:54 UTC (rev 10575) @@ -30,14 +30,14 @@ #include <config.h> #endif -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP #include <libosso.h> #endif #include <gtk/gtk.h> gint hd_select_plugins_dialog_run (GList *loaded_plugins, -#ifdef HAVE_LIBOSSOHELP +#ifdef HAVE_LIBHILDONHELP osso_context_t *osso_context, #endif const gchar *plugin_dir,
- Previous message: [maemo-commits] r10574 - in projects/haf/branches/hildon-control-panel/refactoring: . debian src
- Next message: [maemo-commits] r10576 - projects/haf/branches/hildon-control-panel/refactoring/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]