evolution r37265 - in trunk: e-util plugins/email-custom-header

[mbarnes svn gnome org]

Author: mbarnes
Date: Sat Feb 14 04:25:11 2009
New Revision: 37265
URL: http://svn.gnome.org/viewvc/evolution?rev=37265&view=rev

Log:
2009-02-13  Matthew Barnes  <mbarnes redhat com>

	** Fixes part of bug #564229

	* e-util/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.

	* plugins/email-custom-header/email-custom-header.c:
	(e_plugin_lib_get_configure_widget):
	Do not use uninitialized variable.



Modified:
   trunk/e-util/ChangeLog
   trunk/e-util/e-plugin-ui.c
   trunk/plugins/email-custom-header/ChangeLog
   trunk/plugins/email-custom-header/email-custom-header.c

Modified: trunk/e-util/e-plugin-ui.c
==============================================================================
--- trunk/e-util/e-plugin-ui.c	(original)
+++ trunk/e-util/e-plugin-ui.c	Sat Feb 14 04:25:11 2009
@@ -83,12 +83,6 @@
 {
 	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_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

Modified: trunk/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- trunk/plugins/email-custom-header/email-custom-header.c	(original)
+++ trunk/plugins/email-custom-header/email-custom-header.c	Sat Feb 14 04:25:11 2009
@@ -903,7 +903,7 @@
 	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);