[maemo-commits] [maemo-commits] r8918 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Jan 3 11:53:52 EET 2007
- Previous message: [maemo-commits] r8917 - projects/haf/trunk/glib/glib
- Next message: [maemo-commits] r8919 - projects/haf/branches/maemo-af-desktop/hildon-desktop/src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-01-03 11:53:48 +0200 (Wed, 03 Jan 2007) New Revision: 8918 Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-python.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/main.c Log: 2007-01-03 Lucas Rocha <lucas.rocha at nokia.com> * src/*.[ch]: several coding style and GObject standards fixes. config.h included in all files for consistency. Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-01-03 09:53:48 UTC (rev 8918) @@ -1,3 +1,8 @@ +2007-01-03 Lucas Rocha <lucas.rocha at nokia.com> + + * src/*.[ch]: several coding style and GObject standards fixes. + config.h included in all files for consistency. + 2007-01-02 Lucas Rocha <lucas.rocha at nokia.com> * src/hd-plugin-loader-python.c: improve memory management by Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-config.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -22,8 +22,8 @@ * */ -#ifndef HD_CONFIG_FILES_H -#define HD_CONFIG_FILES_H +#ifndef __HD_CONFIG_FILES_H__ +#define __HD_CONFIG_FILES_H__ #define HD_DESKTOP_CONFIG_KEY_TYPE "X-Type" #define HD_DESKTOP_CONFIG_KEY_POSITION_X "X-Position-X" @@ -53,4 +53,4 @@ #define HD_PLUGIN_CONFIG_KEY_TN "X-task-navigator-plugin" -#endif +#endif /* __HD_CONFIG_FILES_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -28,12 +28,11 @@ #include <stdlib.h> -#include <hildon-base-lib/hildon-base-dnotify.h> - #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> +#include <hildon-base-lib/hildon-base-dnotify.h> #include <libhildondesktop/desktop-panel-window.h> #include <libhildondesktop/hildon-desktop-window.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -22,8 +22,8 @@ * */ -#ifndef HD_DESKTOP_H -#define HD_DESKTOP_H +#ifndef __HD_DESKTOP_H__ +#define __HD_DESKTOP_H__ #include <glib-object.h> @@ -60,4 +60,4 @@ G_END_DECLS -#endif +#endif /* __HD_DESKTOP_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,17 +23,10 @@ * */ -#include "hd-home-background-dialog.h" -#include <libosso.h> -#include <osso-helplib.h> -#include <hildon-widgets/hildon-file-chooser-dialog.h> -#include <hildon-widgets/hildon-color-button.h> -#include <hildon-widgets/hildon-caption.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif -#include <libhildondesktop/hildon-home-l10n.h> - -#include "background-manager/hildon-background-manager.h" - #include <string.h> #include <glib.h> @@ -46,11 +39,22 @@ #include <gtk/gtkcellrenderertext.h> #include <gtk/gtkcelllayout.h> +#include <libosso.h> +#include <osso-helplib.h> +#include <hildon-widgets/hildon-file-chooser-dialog.h> +#include <hildon-widgets/hildon-color-button.h> +#include <hildon-widgets/hildon-caption.h> +#include <libhildondesktop/hildon-home-l10n.h> + +#include "hd-home-background-dialog.h" +#include "background-manager/hildon-background-manager.h" + #define BG_DESKTOP_GROUP "Desktop Entry" #define BG_DESKTOP_IMAGE_NAME "Name" #define BG_DESKTOP_IMAGE_FILENAME "File" #define BG_DESKTOP_IMAGE_PRIORITY "X-Order" #define BG_IMG_INFO_FILE_TYPE "desktop" + #define HOME_BG_IMG_DEFAULT_PRIORITY 15327 /* this is a random number */ #define HILDON_HOME_HC_USER_IMAGE_DIR "MyDocs/.images" @@ -66,29 +70,37 @@ #define HILDON_HOME_SET_BG_RESPONSE_IMAGE GTK_RESPONSE_YES #define HILDON_HOME_SET_BG_RESPONSE_PREVIEW GTK_RESPONSE_APPLY +#define HILDON_HOME_BACKGROUND_NO_IMAGE "no_image" -#define HILDON_HOME_BACKGROUND_NO_IMAGE "no_image" -enum { +#define HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HD_TYPE_HOME_BACKGROUND_DIALOG, HDHomeBackgroundDialogPrivate)) + +G_DEFINE_TYPE (HDHomeBackgroundDialog, hd_home_background_dialog, GTK_TYPE_DIALOG); + +enum +{ BG_IMAGE_NAME, BG_IMAGE_FILENAME, BG_IMAGE_PRIORITY -}; +}; -enum { - PROP_BACKGROUND_DIR = 1, +enum +{ + PROP_0, + PROP_BACKGROUND_DIR }; -typedef struct +struct _HDHomeBackgroundDialogPrivate { gchar *background_dir; GtkListStore *combobox_contents; GtkTreeIter active_iter; + GtkWidget *color_button; + GtkWidget *img_combo; + GtkWidget *mode_combo; +}; - GtkWidget *color_button, *img_combo, *mode_combo; - -} HDHomeBackgroundDialogPrivate; - static void hd_home_background_dialog_set_property (GObject *gobject, guint prop_id, @@ -114,12 +126,6 @@ (HDHomeBackgroundDialog *dialog); -G_DEFINE_TYPE (HDHomeBackgroundDialog, hd_home_background_dialog, GTK_TYPE_DIALOG); - -#define HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE(obj) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((obj), HD_TYPE_HOME_BACKGROUND_DIALOG, HDHomeBackgroundDialogPrivate)) - - static void hd_home_background_dialog_class_init (HDHomeBackgroundDialogClass *klass) { @@ -299,16 +305,16 @@ GParamSpec *pspec) { switch (prop_id) - { - case PROP_BACKGROUND_DIR: - hd_home_background_dialog_set_background_dir ( - HD_HOME_BACKGROUND_DIALOG (gobject), - g_value_get_string (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); - break; - } + { + case PROP_BACKGROUND_DIR: + hd_home_background_dialog_set_background_dir ( + HD_HOME_BACKGROUND_DIALOG (gobject), + g_value_get_string (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); + break; + } } static void @@ -322,14 +328,14 @@ priv = HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE (gobject); switch (prop_id) - { - case PROP_BACKGROUND_DIR: - g_value_set_string (value, priv->background_dir); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); - break; - } + { + case PROP_BACKGROUND_DIR: + g_value_set_string (value, priv->background_dir); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); + break; + } } #if 0 @@ -525,13 +531,13 @@ &error); if (error) - { - g_warning ("Could not open background directory %s: %s", - priv->background_dir, - error->message); - g_error_free (error); - return; - } + { + g_warning ("Could not open background directory %s: %s", + priv->background_dir, + error->message); + g_error_free (error); + return; + } /* No background file option */ @@ -667,12 +673,12 @@ if (!priv->background_dir || !g_str_equal (dir, priv->background_dir)) - { - g_free (priv->background_dir); + { + g_free (priv->background_dir); - priv->background_dir = g_strdup (dir); - g_object_notify (G_OBJECT (dialog), "background-dir"); - g_signal_emit_by_name (dialog, "background-dir-changed"); - } + priv->background_dir = g_strdup (dir); + g_object_notify (G_OBJECT (dialog), "background-dir"); + g_signal_emit_by_name (dialog, "background-dir-changed"); + } } Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,8 +23,8 @@ * */ -#ifndef __HD_BACKGROUND_DIALOG_H__ -#define __HD_BACKGROUND_DIALOG_H__ +#ifndef __HD_HOME_BACKGROUND_DIALOG_H__ +#define __HD_HOME_BACKGROUND_DIALOG_H__ #include <gtk/gtkdialog.h> @@ -32,6 +32,7 @@ typedef struct _HDHomeBackgroundDialog HDHomeBackgroundDialog; typedef struct _HDHomeBackgroundDialogClass HDHomeBackgroundDialogClass; +typedef struct _HDHomeBackgroundDialogPrivate HDHomeBackgroundDialogPrivate; #define HD_TYPE_HOME_BACKGROUND_DIALOG (hd_home_background_dialog_get_type ()) #define HD_HOME_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HD_TYPE_HOME_BACKGROUND_DIALOG, HDHomeBackgroundDialog)) @@ -54,8 +55,8 @@ }; -GType hd_home_background_dialog_get_type (void); +GType hd_home_background_dialog_get_type (void); G_END_DECLS -#endif +#endif /* __HD_HOME_BACKGROUND_DIALOG_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -22,29 +22,33 @@ * */ -#include "hd-home-window.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <libosso.h> #include <osso-helplib.h> - #include <libhildondesktop/hildon-home-area.h> #include <libhildondesktop/hildon-home-titlebar.h> - #include <libhildondesktop/hildon-home-l10n.h> +#include "hd-home-window.h" + +#define HD_HOME_WINDOW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HD_TYPE_HOME_WINDOW, HDHomeWindowPrivate)) + G_DEFINE_TYPE (HDHomeWindow, hd_home_window, HILDON_TYPE_HOME_WINDOW); -typedef struct _HDHomeWindowPrivate +struct _HDHomeWindowPrivate { osso_context_t *osso_context; -} HDHomeWindowPrivate; +}; -#define HD_HOME_WINDOW_GET_PRIVATE(obj) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((obj), HD_TYPE_HOME_WINDOW, HDHomeWindowPrivate)) - /* Properties */ -enum { - PROP_OSSO_CONTEXT = 1 +enum +{ + PROP_0, + PROP_OSSO_CONTEXT }; static void @@ -101,17 +105,18 @@ HDHomeWindow *window = HD_HOME_WINDOW (gobject); switch (prop_id) - { - case PROP_OSSO_CONTEXT: - hd_home_window_set_osso_context (window, - (osso_context_t *) - g_value_get_pointer (value)); + { + case PROP_OSSO_CONTEXT: + hd_home_window_set_osso_context (window, + (osso_context_t *) + g_value_get_pointer (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); - break; - } + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); + break; + } } static void @@ -123,14 +128,15 @@ HDHomeWindowPrivate *priv = HD_HOME_WINDOW_GET_PRIVATE (gobject); switch (prop_id) - { - case PROP_OSSO_CONTEXT: - g_value_set_pointer (value, priv->osso_context); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); - break; - } + { + case PROP_OSSO_CONTEXT: + g_value_set_pointer (value, priv->osso_context); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); + break; + } } static void @@ -150,23 +156,26 @@ NULL, TRUE); switch (res) - { - case OSSO_OK: - break; - case OSSO_ERROR: - g_warning ("OSSO_ERROR (No plugin found)\n"); - break; - case OSSO_RPC_ERROR: - g_warning ("OSSO_RPC_ERROR (RPC failed for plugin)\n"); - break; - case OSSO_INVALID: - g_warning ("OSSO_INVALID (Invalid argument)\n"); - break; - default: - g_warning ("Unknown error!\n"); - break; - } + { + case OSSO_OK: + break; + case OSSO_ERROR: + g_warning ("OSSO_ERROR (No plugin found)\n"); + break; + + case OSSO_RPC_ERROR: + g_warning ("OSSO_RPC_ERROR (RPC failed for plugin)\n"); + break; + + case OSSO_INVALID: + g_warning ("OSSO_INVALID (Invalid argument)\n"); + break; + + default: + g_warning ("Unknown error!\n"); + break; + } } static void @@ -195,22 +204,26 @@ 0); switch (res) - { + { case OSSO_OK: break; + case OSSO_ERROR: g_warning ("OSSO_ERROR (No help for such topic ID)\n"); break; + case OSSO_RPC_ERROR: g_warning ("OSSO_RPC_ERROR (Unable to contact HelpApp or Browser)\n"); break; + case OSSO_INVALID: g_warning ("OSSO_INVALID (Parameter not formally correct)\n"); break; + default: g_warning ("Unknown error!\n"); break; - } + } } static void @@ -224,25 +237,23 @@ priv = HD_HOME_WINDOW_GET_PRIVATE (window); if (priv->osso_context != osso_context) - { - GtkWidget *titlebar; + { + GtkWidget *titlebar; - priv->osso_context = osso_context; - g_object_notify (G_OBJECT (window), "osso-context"); + priv->osso_context = osso_context; + g_object_notify (G_OBJECT (window), "osso-context"); - titlebar = hildon_home_window_get_titlebar (HILDON_HOME_WINDOW (window)); + titlebar = hildon_home_window_get_titlebar (HILDON_HOME_WINDOW (window)); - if (HILDON_IS_HOME_TITLEBAR (titlebar)) - { - g_signal_connect_swapped (titlebar, "help-activate", - G_CALLBACK (hd_home_window_help_activate), - window); - - g_signal_connect_swapped (titlebar, "applet-activate", - G_CALLBACK (hd_home_window_applet_activate), - window); - } + if (HILDON_IS_HOME_TITLEBAR (titlebar)) + { + g_signal_connect_swapped (titlebar, "help-activate", + G_CALLBACK (hd_home_window_help_activate), + window); + + g_signal_connect_swapped (titlebar, "applet-activate", + G_CALLBACK (hd_home_window_applet_activate), + window); } + } } - - Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -32,6 +32,7 @@ typedef struct _HDHomeWindow HDHomeWindow; typedef struct _HDHomeWindowClass HDHomeWindowClass; +typedef struct _HDHomeWindowPrivate HDHomeWindowPrivate; #define HD_TYPE_HOME_WINDOW (hd_home_window_get_type ()) #define HD_HOME_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HD_TYPE_HOME_WINDOW, HDHomeWindow)) @@ -43,16 +44,14 @@ struct _HDHomeWindow { HildonHomeWindow parent; - }; struct _HDHomeWindowClass { HildonHomeWindowClass parent_class; - }; -GType hd_home_window_get_type (void); +GType hd_home_window_get_type (void); G_END_DECLS Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <libhildondesktop/hildon-desktop-plugin.h> #include "hd-plugin-loader-default.h" Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-default.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -57,4 +57,4 @@ G_END_DECLS -#endif +#endif /* __HD_PLUGIN_LOADER_DEFAULT_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -22,8 +22,8 @@ * */ -#ifndef HD_PLUGIN_LOADER_FACTORY_H -#define HD_PLUGIN_LOADER_FACTORY_H +#ifndef __HD_PLUGIN_LOADER_FACTORY_H__ +#define __HD_PLUGIN_LOADER_FACTORY_H__ #include <glib-object.h> @@ -45,6 +45,7 @@ #define HD_PLUGIN_LOADER_TYPE_DEFAULT "default" #define HD_PLUGIN_LOADER_TYPE_OLD_API "old_api" #define HD_PLUGIN_LOADER_TYPE_OLD_API_HOME "HildonHomeApplet" + #ifdef ENABLE_PYTHON #define HD_PLUGIN_LOADER_TYPE_PYTHON "python" #endif @@ -70,4 +71,4 @@ G_END_DECLS -#endif +#endif /* __HD_PLUGIN_LOADER_FACTORY_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,10 +23,16 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <string.h> + +#include <glib/gkeyfile.h> + #include <libhildondesktop/hildon-home-applet.h> #include <libhildondesktop/tasknavigator-item-wrapper.h> -#include <glib/gkeyfile.h> -#include <string.h> /* strcmp */ #include "hd-plugin-loader-legacy.h" #include "hd-config.h" @@ -37,7 +43,8 @@ G_DEFINE_TYPE (HDPluginLoaderLegacy, hd_plugin_loader_legacy, HD_TYPE_PLUGIN_LOADER); /* Type of legacy plugin */ -typedef enum { +typedef enum +{ HD_PLUGIN_LOADER_LEGACY_TYPE_UNKNOWN = 0, HD_PLUGIN_LOADER_LEGACY_TYPE_HOME, HD_PLUGIN_LOADER_LEGACY_TYPE_STATUS_BAR, @@ -45,7 +52,8 @@ } HDPluginLoaderLegacyType; /* Used to map plugin symbols to object signals */ -typedef struct _SymbolMapping { +typedef struct _SymbolMapping +{ const gchar *symbol_name; const gchar *signal; } SymbolMapping; @@ -62,17 +70,20 @@ gpointer module_data; const gchar *library_key; const gchar *module_dir; +}; +static const SymbolMapping home_symbol_mapping[] = +{ + {"hildon_home_applet_lib_initialize", NULL}, + {"hildon_home_applet_lib_background", "background"}, + {"hildon_home_applet_lib_foreground", "foreground"}, + {"hildon_home_applet_lib_settings", "settings"}, + {"hildon_home_applet_lib_deinitialize", "destroy"}, + {NULL, NULL} }; -static const SymbolMapping home_symbol_mapping[] = - { {"hildon_home_applet_lib_initialize", NULL}, - {"hildon_home_applet_lib_background", "background"}, - {"hildon_home_applet_lib_foreground", "foreground"}, - {"hildon_home_applet_lib_settings", "settings"}, - {"hildon_home_applet_lib_deinitialize", "destroy"}, - {NULL, NULL}}; -enum { +enum +{ HD_PLUGIN_LOADER_LEGACY_HOME_SYMBOL_INITIALIZE = 0, HD_PLUGIN_LOADER_LEGACY_HOME_SYMBOL_BACKGROUND, HD_PLUGIN_LOADER_LEGACY_HOME_SYMBOL_FOREGROUND, @@ -82,12 +93,16 @@ }; static const SymbolMapping navigator_symbol_mapping[] = - { {"hildon_navigator_lib_create", NULL}, - {"hildon_navigator_lib_initialize_menu", NULL}, - {"hildon_navigator_lib_get_button_widget", NULL}, - {"hildon_navigator_lib_destroy", "destroy"}, - {NULL, NULL}}; -enum { +{ + {"hildon_navigator_lib_create", NULL}, + {"hildon_navigator_lib_initialize_menu", NULL}, + {"hildon_navigator_lib_get_button_widget", NULL}, + {"hildon_navigator_lib_destroy", "destroy"}, + {NULL, NULL} +}; + +enum +{ HD_PLUGIN_LOADER_LEGACY_NAVIGATOR_SYMBOL_CREATE = 0, HD_PLUGIN_LOADER_LEGACY_NAVIGATOR_SYMBOL_INITIALIZE_MENU, HD_PLUGIN_LOADER_LEGACY_NAVIGATOR_SYMBOL_GET_BUTTON, @@ -170,28 +185,29 @@ hd_plugin_loader_legacy_guess_type (HD_PLUGIN_LOADER_LEGACY (loader)); switch (priv->plugin_type) - { - case HD_PLUGIN_LOADER_LEGACY_TYPE_HOME: - priv->symbol_mapping = (SymbolMapping *)home_symbol_mapping; - priv->init_func = hd_plugin_loader_legacy_home_init; - priv->library_key = HD_PLUGIN_CONFIG_KEY_HOME_APPLET; - priv->module_dir = HD_PLUGIN_LOADER_LEGACY_HOME_MODULE_PATH; - break; - - case HD_PLUGIN_LOADER_LEGACY_TYPE_NAVIGATOR: - priv->symbol_mapping = (SymbolMapping *)navigator_symbol_mapping; - priv->init_func = hd_plugin_loader_legacy_navigator_init; - priv->library_key = HD_PLUGIN_CONFIG_KEY_TN; - priv->module_dir = HD_PLUGIN_LOADER_LEGACY_NAVIGATOR_MODULE_PATH; - break; - default: - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_UNKNOWN_TYPE, - "Could not determine the Hildon Desktop plugin type"); - return NULL; - } + { + case HD_PLUGIN_LOADER_LEGACY_TYPE_HOME: + priv->symbol_mapping = (SymbolMapping *)home_symbol_mapping; + priv->init_func = hd_plugin_loader_legacy_home_init; + priv->library_key = HD_PLUGIN_CONFIG_KEY_HOME_APPLET; + priv->module_dir = HD_PLUGIN_LOADER_LEGACY_HOME_MODULE_PATH; + break; + + case HD_PLUGIN_LOADER_LEGACY_TYPE_NAVIGATOR: + priv->symbol_mapping = (SymbolMapping *)navigator_symbol_mapping; + priv->init_func = hd_plugin_loader_legacy_navigator_init; + priv->library_key = HD_PLUGIN_CONFIG_KEY_TN; + priv->module_dir = HD_PLUGIN_LOADER_LEGACY_NAVIGATOR_MODULE_PATH; + break; + default: + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_UNKNOWN_TYPE, + "Could not determine the Hildon Desktop plugin type"); + return NULL; + } + /* Open the module */ hd_plugin_loader_legacy_open_module (HD_PLUGIN_LOADER_LEGACY (loader), &local_error); @@ -213,13 +229,16 @@ error: g_propagate_error (error, local_error); + if (item) gtk_widget_destroy (item); + if (priv->module) - { - g_module_close (priv->module); - priv->module = NULL; - } + { + g_module_close (priv->module); + priv->module = NULL; + } + return NULL; } @@ -243,35 +262,34 @@ &keyfile_error); if (keyfile_error) - { - g_propagate_error (error, keyfile_error); - return; - } + { + g_propagate_error (error, keyfile_error); + return; + } if (g_path_is_absolute (module_file)) module_path = module_file; else - { - module_path = g_build_path (G_DIR_SEPARATOR_S, - priv->module_dir, - module_file, - NULL); + { + module_path = g_build_path (G_DIR_SEPARATOR_S, + priv->module_dir, + module_file, + NULL); - g_free (module_file); - } + g_free (module_file); + } priv->module = g_module_open (module_path, 0); g_free (module_path); if (!priv->module) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_OPEN, - g_module_error ()); - return; - } - + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_OPEN, + g_module_error ()); + return; + } } static void @@ -288,29 +306,27 @@ mapping = priv->symbol_mapping; while (mapping->symbol_name) + { + gpointer symbol = NULL; + + if (!mapping->signal) { - gpointer symbol = NULL; + mapping ++; + continue; + } - if (!mapping->signal) - { - mapping ++; - continue; - } + g_module_symbol (priv->module, mapping->symbol_name, &symbol); - g_module_symbol (priv->module, mapping->symbol_name, &symbol); + fprintf (stderr, "Found symbol %s, connecting to %s\n", mapping->symbol_name, mapping->signal ); - fprintf (stderr, "Found symbol %s, connecting to %s\n", mapping->symbol_name, mapping->signal ); + if (symbol) + g_signal_connect_swapped (G_OBJECT (item), + mapping->signal, + symbol, + priv->module_data); - if (symbol) - g_signal_connect_swapped (G_OBJECT (item), - mapping->signal, - symbol, - priv->module_data); - - mapping ++; - - } - + mapping ++; + } } static void @@ -332,11 +348,11 @@ NULL); if (value && strcmp (value, "HildonHomeApplet") == 0) - { - priv->plugin_type = HD_PLUGIN_LOADER_LEGACY_TYPE_HOME; - g_free (value); - return; - } + { + priv->plugin_type = HD_PLUGIN_LOADER_LEGACY_TYPE_HOME; + g_free (value); + return; + } g_free (value); @@ -347,12 +363,11 @@ NULL); if (value) - { - priv->plugin_type = HD_PLUGIN_LOADER_LEGACY_TYPE_NAVIGATOR; - g_free (value); - return; - } - + { + priv->plugin_type = HD_PLUGIN_LOADER_LEGACY_TYPE_NAVIGATOR; + g_free (value); + return; + } } static GtkWidget * @@ -378,26 +393,26 @@ g_module_symbol (priv->module, s->symbol_name, &symbol); if (!symbol) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_SYMBOL, - g_module_error ()); - return NULL; - } + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_SYMBOL, + g_module_error ()); + return NULL; + } priv->module_data = ((HomeInitializeFn)symbol) (&state_data, &state_data_length, &module_widget); if (!module_widget || !GTK_IS_WIDGET (module_widget)) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_INIT, - "Hildon Home Home Applet did not return a widget"); - return NULL; - } + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_INIT, + "Hildon Home Home Applet did not return a widget"); + return NULL; + } applet = hildon_home_applet_new (); @@ -427,13 +442,13 @@ g_module_symbol (priv->module, s->symbol_name, &symbol); if (!symbol) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_SYMBOL, - g_module_error ()); - return NULL; - } + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_SYMBOL, + g_module_error ()); + return NULL; + } priv->module_data = ((NavigatorCreateFn)symbol) (); @@ -443,24 +458,24 @@ g_module_symbol (priv->module, s->symbol_name, &symbol); if (!symbol) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_SYMBOL, - g_module_error ()); - return NULL; - } + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_SYMBOL, + g_module_error ()); + return NULL; + } module_widget = ((NavigatorGetButtonFn)symbol) (priv->module_data); if (!module_widget || !GTK_IS_WIDGET (module_widget)) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_INIT, - "Hildon Navigator Item did not return a widget"); - return NULL; - } + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_INIT, + "Hildon Navigator Item did not return a widget"); + return NULL; + } item = g_object_new (TASKNAVIGATOR_TYPE_ITEM, NULL); @@ -471,13 +486,13 @@ g_module_symbol (priv->module, s->symbol_name, &symbol); if (!symbol) - { - g_set_error (error, - hd_plugin_loader_error_quark (), - HD_PLUGIN_LOADER_ERROR_SYMBOL, - g_module_error ()); - return NULL; - } + { + g_set_error (error, + hd_plugin_loader_error_quark (), + HD_PLUGIN_LOADER_ERROR_SYMBOL, + g_module_error ()); + return NULL; + } ((NavigatorInitializeFn)symbol) (priv->module_data); Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-legacy.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -55,4 +55,4 @@ G_END_DECLS -#endif +#endif /* __HD_PLUGIN_LOADER_LEGACY_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-python.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-python.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-python.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,9 +23,14 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <Python.h> #include <pygobject.h> #include <pygtk/pygtk.h> + #include <libhildondesktop/hildon-desktop-plugin.h> #include "hd-plugin-loader-python.h" Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <glib.h> #include "hd-plugin-loader.h" @@ -32,7 +36,8 @@ G_DEFINE_ABSTRACT_TYPE (HDPluginLoader, hd_plugin_loader, G_TYPE_OBJECT) -enum { +enum +{ PROP_0, PROP_KEYFILE }; Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -43,7 +43,8 @@ #define HD_IS_PLUGIN_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HD_TYPE_PLUGIN_LOADER)) #define HD_PLUGIN_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), HD_TYPE_PLUGIN_LOADER, HDPluginLoaderClass)) -typedef enum { +typedef enum +{ HD_PLUGIN_LOADER_ERROR_UNKNOWN = 0, HD_PLUGIN_LOADER_ERROR_OPEN, HD_PLUGIN_LOADER_ERROR_SYMBOL, @@ -81,4 +82,4 @@ G_END_DECLS -#endif +#endif /* __HD_PLUGIN_LOADER_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -22,7 +22,9 @@ * */ -#include <osso-log.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <gtk/gtk.h> #include <glib.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-manager.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -22,8 +22,8 @@ * */ -#ifndef HD_PLUGIN_MANAGER_H -#define HD_PLUGIN_MANAGER_H +#ifndef __HD_PLUGIN_MANAGER_H__ +#define __HD_PLUGIN_MANAGER_H__ #include <gtk/gtk.h> #include <glib.h> @@ -68,4 +68,4 @@ G_END_DECLS -#endif +#endif /* __HD_PLUGIN_MANAGER_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -23,12 +23,17 @@ * */ -#include <osso-helplib.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> #include <glib.h> #include <glib/gi18n.h> +#include <gdk/gdkkeysyms.h> +#include <osso-helplib.h> + #include "hd-select-plugins-dialog.h" #include "hd-config.h" @@ -218,12 +223,12 @@ const gchar *plugin_dir, GList **selected_plugins) { - GtkWidget *dialog; - GtkWidget *scrollwindow; - GtkWidget *treeview; - GtkCellRenderer *cell_renderer; - GtkListStore *plugin_list; - gint response; + GtkWidget *dialog; + GtkWidget *scrollwindow; + GtkWidget *treeview; + GtkCellRenderer *cell_renderer; + GtkListStore *plugin_list; + gint response; plugin_list = hd_select_plugins_dialog_get_store (loaded_plugins, plugin_dir); @@ -310,5 +315,3 @@ return response; } - - Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.h 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-select-plugins-dialog.h 2007-01-03 09:53:48 UTC (rev 8918) @@ -32,4 +32,4 @@ const gchar *plugin_dir, GList **selected_plugins); -#endif +#endif /* __HD_SELECT_PLUGINS_DIALOG_H__ */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/main.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/main.c 2007-01-03 09:21:40 UTC (rev 8917) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/main.c 2007-01-03 09:53:48 UTC (rev 8918) @@ -3,6 +3,7 @@ * * Copyright (C) 2006 Nokia Corporation. * + * Author: Lucas Rocha <lucas.rocha at nokia.com> * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> * * This library is free software; you can redistribute it and/or @@ -27,6 +28,7 @@ #endif #include <locale.h> + #include <glib/gi18n.h> #include <gtk/gtk.h>
- Previous message: [maemo-commits] r8917 - projects/haf/trunk/glib/glib
- Next message: [maemo-commits] r8919 - projects/haf/branches/maemo-af-desktop/hildon-desktop/src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]