evolution r35104 - trunk/shell

[sragavan svn gnome org]

Author: sragavan
Date: Sun Mar  2 12:53:38 2008
New Revision: 35104
URL: http://svn.gnome.org/viewvc/evolution?rev=35104&view=rev

Log:
2008-03-02  Srinivasa Ragavan  <sragavan novell com>

	* main.c: (main): Committing the build fix that comes up if
	DEVELOPMENT is enabled.


Modified:
   trunk/shell/ChangeLog
   trunk/shell/main.c

Modified: trunk/shell/main.c
==============================================================================
--- trunk/shell/main.c	(original)
+++ trunk/shell/main.c	Sun Mar  2 12:53:38 2008
@@ -598,8 +598,8 @@
 	extern void link_shutdown (void);
 #endif
 
-#if DEVELOPMENT
 	GConfClient *client;
+#if DEVELOPMENT
 	gboolean skip_warning_dialog;
 #endif
 	GnomeProgram *program;
@@ -645,9 +645,10 @@
 	gtk_rc_parse_string ("gtk-fallback-icon-theme = \"gnome\"");
 #endif
 
-#if DEVELOPMENT
 	client = gconf_client_get_default ();
 
+#if DEVELOPMENT
+	
 	if (force_migrate) {
 		destroy_config (client);
 	}
@@ -713,10 +714,10 @@
 	else
 		g_idle_add ((GSourceFunc) idle_cb, remaining_args);
 
-	g_object_unref (client);
 #else
 	g_idle_add ((GSourceFunc) idle_cb, remaining_args);
 #endif
+	g_object_unref (client);
 
 	bonobo_main ();