From f5991437c3e620708f1701310bd1e67b40ca3b42 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Aug 2009 12:53:52 -0400 Subject: Get EConfig and EEvent hooks working again. There were a number of problems: - Walk the GType tree to find EPluginHook subclasses, instead of just registering the immediate children. - Some EConfig and EEvent subclasses were not being configured properly (particularly the mail and calendar subclasses). - Add preference window pages after the main loop starts to make sure all plugins and plugin hooks are installed first. --- modules/addressbook/autocompletion-config.c | 18 ++++------------- modules/addressbook/autocompletion-config.h | 2 +- modules/addressbook/e-book-shell-backend.c | 30 +++++++++++++++++++++++++---- modules/calendar/e-cal-config-hook.c | 8 ++++++-- modules/calendar/e-cal-event-hook.c | 10 +++++----- modules/calendar/e-cal-shell-backend.c | 13 +++++++++---- modules/mail/e-mail-config-hook.c | 8 ++++++-- modules/mail/e-mail-event-hook.c | 8 ++++++-- modules/mail/e-mail-shell-backend.c | 13 +++++++++---- 9 files changed, 72 insertions(+), 38 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index ac6a7d1860..eb0c802196 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -32,7 +32,6 @@ #include "e-util/e-binding.h" #include "e-util/e-datetime-format.h" -#include "widgets/misc/e-preferences-window.h" static void source_selection_changed_cb (ESourceSelector *source_selector) @@ -129,19 +128,18 @@ add_section (GtkWidget *container, return widget; } -void -autocompletion_config_init (EShell *shell) +GtkWidget * +autocompletion_config_new (EShell *shell) { EShellSettings *shell_settings; ESourceList *source_list; GtkWidget *scrolled_window; GtkWidget *source_selector; - GtkWidget *preferences_window; GtkWidget *itembox; GtkWidget *widget; GtkWidget *vbox; - g_return_if_fail (E_IS_SHELL (shell)); + g_return_val_if_fail (E_IS_SHELL (shell), NULL); shell_settings = e_shell_get_shell_settings (shell); @@ -190,13 +188,5 @@ autocompletion_config_init (EShell *shell) initialize_selection (E_SOURCE_SELECTOR (source_selector)); - preferences_window = e_shell_get_preferences_window (shell); - - e_preferences_window_add_page ( - E_PREFERENCES_WINDOW (preferences_window), - "contacts", - "preferences-autocompletion", - _("Contacts"), - vbox, - 200); + return vbox; } diff --git a/modules/addressbook/autocompletion-config.h b/modules/addressbook/autocompletion-config.h index 5769bdce9d..7f94a07ab9 100644 --- a/modules/addressbook/autocompletion-config.h +++ b/modules/addressbook/autocompletion-config.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS -void autocompletion_config_init (EShell *shell); +GtkWidget * autocompletion_config_new (EShell *shell); G_END_DECLS diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index f96cb0dd22..1005a6b521 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -30,10 +30,11 @@ #include #include +#include "e-util/e-import.h" #include "shell/e-shell.h" #include "shell/e-shell-window.h" +#include "widgets/misc/e-preferences-window.h" -#include "e-util/e-import.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "addressbook/gui/contact-editor/e-contact-editor.h" #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h" @@ -358,6 +359,26 @@ static GtkActionEntry source_entries[] = { G_CALLBACK (action_address_book_new_cb) } }; +static gboolean +book_shell_backend_init_preferences (EShell *shell) +{ + GtkWidget *preferences_window; + + /* This is a main loop idle callback. */ + + preferences_window = e_shell_get_preferences_window (shell); + + e_preferences_window_add_page ( + E_PREFERENCES_WINDOW (preferences_window), + "contacts", + "preferences-autocompletion", + _("Contacts"), + autocompletion_config_new (shell), + 200); + + return FALSE; +} + static gboolean book_shell_backend_handle_uri_cb (EShellBackend *shell_backend, const gchar *uri) @@ -507,10 +528,11 @@ book_shell_backend_constructed (GObject *object) G_CALLBACK (book_shell_backend_window_created_cb), shell_backend); - /* Initialize settings before initializing preferences, - * since the preferences bind to the shell settings. */ e_book_shell_backend_init_settings (shell); - autocompletion_config_init (shell); + + /* Initialize preferences after the main loop starts so + * that all EPlugins and EPluginHooks are loaded first. */ + g_idle_add ((GSourceFunc) book_shell_backend_init_preferences, shell); } static void diff --git a/modules/calendar/e-cal-config-hook.c b/modules/calendar/e-cal-config-hook.c index 4a0522460c..e3d9678168 100644 --- a/modules/calendar/e-cal-config-hook.c +++ b/modules/calendar/e-cal-config-hook.c @@ -35,11 +35,15 @@ static const EConfigHookTargetMap targets[] = { }; static void -cal_config_hook_class_init (EPluginHookClass *class) +cal_config_hook_class_init (EConfigHookClass *class) { + EPluginHookClass *plugin_hook_class; gint ii; - class->id = "org.gnome.evolution.calendar.config:1.0"; + plugin_hook_class = E_PLUGIN_HOOK_CLASS (class); + plugin_hook_class->id = "org.gnome.evolution.calendar.config:1.0"; + + class->config_class = g_type_class_ref (e_cal_config_get_type ()); for (ii = 0; targets[ii].type != NULL; ii++) e_config_hook_class_add_target_map ( diff --git a/modules/calendar/e-cal-event-hook.c b/modules/calendar/e-cal-event-hook.c index b263727107..d90162ded7 100644 --- a/modules/calendar/e-cal-event-hook.c +++ b/modules/calendar/e-cal-event-hook.c @@ -35,15 +35,15 @@ static const EEventHookTargetMap targets[] = { }; static void -cal_event_hook_class_init (EPluginHookClass *class) +cal_event_hook_class_init (EEventHookClass *class) { - EEventHookClass *event_hook_class; + EPluginHookClass *plugin_hook_class; gint ii; - event_hook_class = (EEventHookClass *) class; - event_hook_class->event = (EEvent *) e_cal_event_peek (); + plugin_hook_class = E_PLUGIN_HOOK_CLASS (class); + plugin_hook_class->id = "org.gnome.evolution.calendar.events:1.0"; - class->id = "org.gnome.evolution.calendar.events:1.0"; + class->event = (EEvent *) e_cal_event_peek (); for (ii = 0; targets[ii].type != NULL; ii++) e_event_hook_class_add_target_map ( diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 5149574323..6511d0e453 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -523,11 +523,13 @@ cal_shell_backend_init_importers (void) e_import_class_add_importer (import_class, importer, NULL, NULL); } -static void +static gboolean cal_shell_backend_init_preferences (EShell *shell) { GtkWidget *preferences_window; + /* This is a main loop idle callback. */ + preferences_window = e_shell_get_preferences_window (shell); e_preferences_window_add_page ( @@ -537,6 +539,8 @@ cal_shell_backend_init_preferences (EShell *shell) _("Calendar and Tasks"), calendar_prefs_dialog_new (shell), 600); + + return FALSE; } static gboolean @@ -770,10 +774,11 @@ cal_shell_backend_constructed (GObject *object) cal_shell_backend_init_importers (); - /* Initialize settings before initializing preferences, - * since the preferences bind to the shell settings. */ e_cal_shell_backend_init_settings (shell); - cal_shell_backend_init_preferences (shell); + + /* Initialize preferences after the main loop starts so + * that all EPlugins and EPluginHooks are loaded first. */ + g_idle_add ((GSourceFunc) cal_shell_backend_init_preferences, shell); } static void diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c index 4b37a6b171..def986f1c2 100644 --- a/modules/mail/e-mail-config-hook.c +++ b/modules/mail/e-mail-config-hook.c @@ -36,11 +36,15 @@ static const EConfigHookTargetMap targets[] = { }; static void -mail_config_hook_class_init (EPluginHookClass *class) +mail_config_hook_class_init (EConfigHookClass *class) { + EPluginHookClass *plugin_hook_class; gint ii; - class->id = "org.gnome.evolution.mail.config:1.0"; + plugin_hook_class = E_PLUGIN_HOOK_CLASS (class); + plugin_hook_class->id = "org.gnome.evolution.mail.config:1.0"; + + class->config_class = g_type_class_ref (em_config_get_type ()); for (ii = 0; targets[ii].type != NULL; ii++) e_config_hook_class_add_target_map ( diff --git a/modules/mail/e-mail-event-hook.c b/modules/mail/e-mail-event-hook.c index a6be6d294f..becc80624e 100644 --- a/modules/mail/e-mail-event-hook.c +++ b/modules/mail/e-mail-event-hook.c @@ -60,11 +60,15 @@ static const EEventHookTargetMap targets[] = { }; static void -mail_event_hook_class_init (EPluginHookClass *class) +mail_event_hook_class_init (EEventHookClass *class) { + EPluginHookClass *plugin_hook_class; gint ii; - class->id = "org.gnome.evolution.mail.events:1.0"; + plugin_hook_class = E_PLUGIN_HOOK_CLASS (class); + plugin_hook_class->id = "org.gnome.evolution.mail.events:1.0"; + + class->event = (EEvent *) em_event_peek (); for (ii = 0; targets[ii].type != NULL; ii++) e_event_hook_class_add_target_map ( diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index fd1e7263c4..fd99edcfa0 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -187,12 +187,14 @@ static GtkActionEntry source_entries[] = { G_CALLBACK (action_mail_folder_new_cb) } }; -static void +static gboolean mail_shell_backend_init_preferences (EShell *shell) { EAccountList *account_list; GtkWidget *preferences_window; + /* This is a main loop idle callback. */ + account_list = e_get_account_list (); preferences_window = e_shell_get_preferences_window (shell); @@ -227,6 +229,8 @@ mail_shell_backend_init_preferences (EShell *shell) _("Network Preferences"), em_network_prefs_new (), 500); + + return FALSE; } static void @@ -848,10 +852,11 @@ mail_shell_backend_constructed (GObject *object) data_dir = e_shell_backend_get_data_dir (shell_backend); e_mail_store_init (data_dir); - /* Initialize settings before initializing preferences, - * since the preferences bind to the shell settings. */ e_mail_shell_settings_init (shell); - mail_shell_backend_init_preferences (shell); + + /* Initialize preferences after the main loop starts so + * that all EPlugins and EPluginHooks are loaded first. */ + g_idle_add ((GSourceFunc) mail_shell_backend_init_preferences, shell); } static void -- cgit v1.2.3