[evolution-patches] Evolution 1.4 Importer Patch

[JP Rosevear <jpr ximian com>]

Like Rodrigo's patch it helps eliminate the gconfd daemon that likes to
stick around.

-JP
-- 
JP Rosevear <jpr ximian com>
Ximian, Inc.

? import.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2761.2.41
diff -u -r1.2761.2.41 ChangeLog
--- ChangeLog	18 Feb 2004 13:57:47 -0000	1.2761.2.41
+++ ChangeLog	19 Feb 2004 22:42:30 -0000
@@ -1,3 +1,19 @@
+2004-02-19  JP Rosevear  <jpr ximian com>
+
+	* importers/elm-importer.c (elm_store_settings): unref gconf
+	client
+	(elm_restore_settings): ditto
+	(elm_can_import): ditto
+	(elm_create_structure): ditto
+	
+	* importers/pine-importer.c (pine_store_settings): ditto
+	(pine_restore_settings): ditto
+	(pine_create_structure): ditto
+
+	* importers/netscape-importer.c (netscape_store_settings): ditto
+	(netscape_restore_settings): ditto
+	(netscape_create_structure): ditto
+
 2004-02-16  JP Rosevear <jpr ximian com>
 
 	* Makefile.am: remove disable deprecated flags
Index: importers/elm-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/elm-importer.c,v
retrieving revision 1.7
diff -u -r1.7 elm-importer.c
--- importers/elm-importer.c	2 Apr 2003 16:35:27 -0000	1.7
+++ importers/elm-importer.c	19 Feb 2004 22:42:30 -0000
@@ -121,6 +121,7 @@
 
 	gconf = gconf_client_get_default ();
 	gconf_client_set_bool (gconf, "/apps/evolution/importer/elm/mail", importer->do_mail, NULL);
+	g_object_unref (gconf);
 }
 
 static void
@@ -129,6 +130,7 @@
 	GConfClient *gconf = gconf_client_get_default ();
 
 	importer->do_mail = gconf_client_get_bool (gconf, "/apps/evolution/importer/elm/mail", NULL);
+	g_object_unref (gconf);
 }
 
 static void
@@ -295,6 +297,7 @@
 	GConfClient *gconf = gconf_client_get_default();
 
 	mail = gconf_client_get_bool(gconf, "/apps/evolution/importer/elm/mail-imported", NULL);
+	g_object_unref (gconf);
 	if (mail)
 		return FALSE;
 	
@@ -469,6 +472,7 @@
 		}
 
 		gconf_client_set_bool(gconf, "/apps/evolution/importer/elm/mail-imported", TRUE, NULL);
+		g_object_unref (gconf);
 		
 		maildir = elm_get_rc_value ("maildir");
 		if (maildir == NULL) {
Index: importers/netscape-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/netscape-importer.c,v
retrieving revision 1.12
diff -u -r1.12 netscape-importer.c
--- importers/netscape-importer.c	29 Apr 2003 20:23:56 -0000	1.12
+++ importers/netscape-importer.c	19 Feb 2004 22:42:31 -0000
@@ -1256,6 +1256,7 @@
 	gconf_client_set_bool(gconf, "/apps/evolution/importer/netscape/mail", importer->do_mail, NULL);
 	gconf_client_set_bool(gconf, "/apps/evolution/importer/netscape/settings", importer->do_settings, NULL);
 	gconf_client_set_bool(gconf, "/apps/evolution/importer/netscape/filters", importer->do_filters, NULL);
+	g_object_unref (gconf);
 }
 
 static void
@@ -1266,6 +1267,7 @@
 	importer->do_mail = gconf_client_get_bool(gconf, "/apps/evolution/importer/netscape/mail", NULL);
 	importer->do_settings = gconf_client_get_bool(gconf, "/apps/evolution/importer/netscape/settings", NULL);
 	importer->do_filters = gconf_client_get_bool(gconf, "/apps/evolution/importer/netscape/filters", NULL);
+	g_object_unref (gconf);
 }
 
 static const char *
@@ -2027,6 +2029,7 @@
 	}
 
 	bonobo_object_unref (BONOBO_OBJECT (ii));
+	g_object_unref (gconf);
 }
 
 static void
Index: importers/pine-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/pine-importer.c,v
retrieving revision 1.8
diff -u -r1.8 pine-importer.c
--- importers/pine-importer.c	2 Apr 2003 16:35:27 -0000	1.8
+++ importers/pine-importer.c	19 Feb 2004 22:42:31 -0000
@@ -131,6 +131,7 @@
 
 	gconf_client_set_bool (gconf, "/apps/evolution/importer/pine/mail", importer->do_mail, NULL);
 	gconf_client_set_bool (gconf, "/apps/evolution/importer/pine/address", importer->do_address, NULL);
+	g_object_unref (gconf);
 }
 
 static void
@@ -140,6 +141,7 @@
 
 	importer->do_mail = gconf_client_get_bool (gconf, "/apps/evolution/importer/pine/mail", NULL);
 	importer->do_address = gconf_client_get_bool (gconf, "/apps/evolution/importer/pine/address", NULL);
+	g_object_unref (gconf);
 }
 
 static void
@@ -536,6 +538,7 @@
 		bonobo_object_unref (BONOBO_OBJECT (ii));
 	}
 	bonobo_object_unref (BONOBO_OBJECT (ii));
+	g_object_unref (gconf);
 }
 
 static void