From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- mail/em-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-config.c') diff --git a/mail/em-config.c b/mail/em-config.c index 94df437519..160cec851e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- mail/em-config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mail/em-config.c') diff --git a/mail/em-config.c b/mail/em-config.c index 160cec851e..985a02d56c 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -124,7 +124,7 @@ emp_target_free(EConfig *ep, EConfigTarget *t) } static void -emp_account_changed(struct _EAccount *ea, int id, EMConfig *emc) +emp_account_changed(struct _EAccount *ea, gint id, EMConfig *emc) { e_config_target_changed((EConfig *)emc, E_CONFIG_TARGET_CHANGED_STATE); } @@ -180,7 +180,7 @@ em_config_get_type(void) return type; } -EMConfig *em_config_new(int type, const char *menuid) +EMConfig *em_config_new(gint type, const gchar *menuid) { EMConfig *emp = g_object_new(em_config_get_type(), NULL); @@ -190,7 +190,7 @@ EMConfig *em_config_new(int type, const char *menuid) } EMConfigTargetFolder * -em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const char *uri) +em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri) { EMConfigTargetFolder *t = e_config_target_new(&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof(*t)); @@ -253,7 +253,7 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EMConfigHook *)eph) static const EConfigHookTargetMask emph_no_masks[] = { @@ -278,7 +278,7 @@ emph_finalise(GObject *o) static void emph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.config:1.0"; -- cgit From c0d998229d5a3d2b65445b9025de7b23112f4063 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- mail/em-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-config.c') diff --git a/mail/em-config.c b/mail/em-config.c index 985a02d56c..a44554b800 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -190,7 +190,7 @@ EMConfig *em_config_new(gint type, const gchar *menuid) } EMConfigTargetFolder * -em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri) +em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri) { EMConfigTargetFolder *t = e_config_target_new(&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof(*t)); -- cgit From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- mail/em-config.c | 1 - 1 file changed, 1 deletion(-) (limited to 'mail/em-config.c') diff --git a/mail/em-config.c b/mail/em-config.c index a44554b800..357e88555b 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -224,7 +224,6 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account) return t; } - /* ********************************************************************** */ /* Popup menu plugin handler */ -- cgit From 32f545cdf031ebe3718791f18e8fb6b6141fd081 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Aug 2009 20:21:54 -0400 Subject: Simplify EPlugin loading at startup. - Require all EPlugin and EPluginHook subtypes be registered before loading plugins. This drastically simplifies the EPlugin/EPluginHook negotiation. - Turn most EPluginHook subtypes into GTypeModules and register their types from an e_module_load() function (does not include shell hooks). - Convert EPluginLib and the Mono and Python bindings to GTypeModules and register their types from an e_module_load() function, and kill EPluginTypeHook. --- mail/em-config.c | 82 -------------------------------------------------------- 1 file changed, 82 deletions(-) (limited to 'mail/em-config.c') diff --git a/mail/em-config.c b/mail/em-config.c index 357e88555b..dcdf9b10ef 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -223,85 +223,3 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account) return t; } - -/* ********************************************************************** */ - -/* Popup menu plugin handler */ - -/* - - - - - - - -*/ - -static gpointer emph_parent_class; -#define emph ((EMConfigHook *)eph) - -static const EConfigHookTargetMask emph_no_masks[] = { - { NULL } -}; - -static const EConfigHookTargetMap emph_targets[] = { - { "folder", EM_CONFIG_TARGET_FOLDER, emph_no_masks }, - { "prefs", EM_CONFIG_TARGET_PREFS, emph_no_masks }, - { "account", EM_CONFIG_TARGET_ACCOUNT, emph_no_masks }, - { NULL } -}; - -static void -emph_finalise(GObject *o) -{ - /*EPluginHook *eph = (EPluginHook *)o;*/ - - ((GObjectClass *)emph_parent_class)->finalize(o); -} - -static void -emph_class_init(EPluginHookClass *klass) -{ - gint i; - - ((GObjectClass *)klass)->finalize = emph_finalise; - ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.config:1.0"; - - for (i=0;emph_targets[i].type;i++) - e_config_hook_class_add_target_map((EConfigHookClass *)klass, &emph_targets[i]); - - ((EConfigHookClass *)klass)->config_class = g_type_class_ref(em_config_get_type()); -} - -GType -em_config_hook_get_type(void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof(EMConfigHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL, - sizeof(EMConfigHook), 0, (GInstanceInitFunc) NULL, - }; - - emph_parent_class = g_type_class_ref(e_config_hook_get_type()); - type = g_type_register_static(e_config_hook_get_type(), "EMConfigHook", &info, 0); - } - - return type; -} -- cgit