brasero r1676 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Thu Jan  1 13:44:43 2009
New Revision: 1676
URL: http://svn.gnome.org/viewvc/brasero?rev=1676&view=rev

Log:
2009-01-01  Philippe Rouquier  <ykw localhost localdomain>

	Silenced a warning related to GConf initialization

	* src/brasero-search-entry.c (brasero_search_entry_init):
	* src/main.c (main):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-search-entry.c
   trunk/src/main.c

Modified: trunk/src/brasero-search-entry.c
==============================================================================
--- trunk/src/brasero-search-entry.c	(original)
+++ trunk/src/brasero-search-entry.c	Thu Jan  1 13:44:43 2009
@@ -77,7 +77,6 @@
 
 static GObjectClass *parent_class = NULL;
 
-#define BRASERO_CONF_DIR "/apps/brasero"
 #define BRASERO_SEARCH_ENTRY_HISTORY_KEY "/apps/brasero/search_history"
 #define BRASERO_SEARCH_ENTRY_MAX_HISTORY_ITEMS	10
 
@@ -347,8 +346,6 @@
 	/* Set up GConf Client */
 	obj->priv->client = gconf_client_get_default ();
 	if (obj->priv->client) {
-		gconf_client_add_dir (obj->priv->client, BRASERO_CONF_DIR,
-				      GCONF_CLIENT_PRELOAD_NONE, &error);
 		if (error) {
 			g_warning ("ERROR : %s\n", error->message);
 			g_error_free (error);

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Thu Jan  1 13:44:43 2009
@@ -38,6 +38,8 @@
 
 #include <gtk/gtk.h>
 
+#include <gconf/gconf-client.h>
+
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
@@ -72,6 +74,8 @@
 gint parent_window;
 gint debug;
 
+#define BRASERO_CONF_DIR "/apps/brasero"
+
 static const GOptionEntry options [] = {
 	{ "project", 'p', 0, G_OPTION_ARG_STRING, &project_uri,
 	  N_("Open the specified project"),
@@ -440,6 +444,7 @@
 int
 main (int argc, char **argv)
 {
+	GConfClient *client;
 
 #ifdef BUILD_GNOME2
 	GnomeProgram *program;
@@ -487,6 +492,12 @@
 	/* This is for missing codec automatic install */
 	gst_pb_utils_init ();
 
+	client = gconf_client_get_default ();
+	gconf_client_add_dir (client,
+			      BRASERO_CONF_DIR,
+			      GCONF_CLIENT_PRELOAD_NONE,
+			      NULL);
+
 	brasero_burn_set_debug (debug);
 	brasero_burn_library_init ();
 
@@ -502,6 +513,9 @@
 
 	brasero_burn_library_shutdown ();
 
+	gconf_client_remove_dir (client, BRASERO_CONF_DIR, NULL);
+	g_object_unref (client);
+
 #ifdef BUILD_GNOME2
 
 	g_object_unref (program);