diff options
| -rw-r--r-- | e-util/ChangeLog | 8 | ||||
| -rw-r--r-- | e-util/e-plugin-ui.c | 11 | ||||
| -rw-r--r-- | plugins/email-custom-header/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 2 |
4 files changed, 21 insertions, 7 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 5fc6526a85..a817d0d033 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2009-02-13 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #564229 + + * e-plugin-ui.c (plugin_ui_hook_class_init): + Initialize the EPluginUI registry during class initialization, + so that it's sure to be there when we need it. + 2009-01-15 Milan Crha <mcrha@redhat.com> * e-plugin.c: (epl_construct): Compiler warning fix. diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index 0b28adda5d..c192ece939 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -83,12 +83,6 @@ plugin_ui_registry_insert (EPluginUIHook *hook, { GHashTable *hash_table; - if (registry == NULL) - registry = g_hash_table_new_full ( - g_direct_hash, g_direct_equal, - (GDestroyNotify) NULL, - (GDestroyNotify) g_hash_table_destroy); - hash_table = g_hash_table_lookup (registry, hook); if (hash_table == NULL) { hash_table = g_hash_table_new (g_direct_hash, g_direct_equal); @@ -325,6 +319,11 @@ plugin_ui_hook_class_init (EPluginUIHookClass *class) plugin_hook_class->id = E_PLUGIN_UI_HOOK_CLASS_ID; plugin_hook_class->construct = plugin_ui_hook_construct; plugin_hook_class->enable = plugin_ui_hook_enable; + + registry = g_hash_table_new_full ( + g_direct_hash, g_direct_equal, + (GDestroyNotify) NULL, + (GDestroyNotify) g_hash_table_destroy); } static void diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index e03816e2cd..b10181369b 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,3 +1,10 @@ +2009-02-13 Milan Crha <mcrha@redhat.com> + + ** Fixes part of bug #564229 + + * email-custom-header.c: (e_plugin_lib_get_configure_widget): + Do not use uninitialized variable. + 2009-02-02 Takao Fujiwara <takao.fujiwara@sun.com> Reviewed by Srinivasa Ragavan <sragavan@novell.com> diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 69bae1143f..233804cd13 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -903,7 +903,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gtk_tree_view_set_model (GTK_TREE_VIEW (cd->treeview), GTK_TREE_MODEL (cd->store)); renderer = gtk_cell_renderer_text_new (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cd->treeview), -1, _("Key"), + col_pos = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cd->treeview), -1, _("Key"), renderer, "text", HEADER_KEY_COLUMN, NULL); col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1); gtk_tree_view_column_set_resizable (col, TRUE); |