HC Freeze break

[Srinivasa Ragavan <sragavan novell com>]

Hello Guys,

I was just preparing my build machine for the final release and disabled
DEVELOPMENT warning in the configure.in that pops up for Evolution
during the unstable releases, I figured out that when I disable it there
is a build break in Evolution/shell/main.c

The GConfClient variable 'client' defined for showing the development
warning is now used outside the #ifdefs also and so it gives a undefined
variable 'client' error. This break didn't popup till today, since the
DEVELOPMENT was enabled and it was working fine. I disabled it for the
final release to see it.

The attached patch would fix that break and I have tested it well (I
couldn't have build Evolution otherwise) as well as it doesn't introduce
any new issues and works fine.

The release planning wiki for Hard code freeze says: Simple build fixes
are, of course, allowed without asking.

I wasn't sure if this is that category or not, felt better to ask it
anyways. 

-Srini.

Index: main.c
===================================================================
--- main.c	(revision 34271)
+++ main.c	(working copy)
@@ -486,9 +486,9 @@
 #endif
 
 #if DEVELOPMENT
-	GConfClient *client;
 	gboolean skip_warning_dialog;
 #endif
+	GConfClient *client;
 	GnomeProgram *program;
 	GOptionContext *context;
 	char *filename;
@@ -530,10 +530,10 @@
 #ifdef G_OS_WIN32
 	gtk_rc_parse_string ("gtk-fallback-icon-theme = \"gnome\"");
 #endif
+	client = gconf_client_get_default ();
 
 #if DEVELOPMENT
-	client = gconf_client_get_default ();
-
+	
 	if (force_migrate) {
 		destroy_config (client);
 	}
@@ -594,11 +594,11 @@
 	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 ();
 	
 	e_icon_factory_shutdown ();