From d5b3018517b36c8ae03d12020d442fc2678738de Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 2 Mar 2008 12:53:38 +0000 Subject: Committing the build fix that comes up if DEVELOPMENT is enabled. 2008-03-02 Srinivasa Ragavan * main.c: (main): Committing the build fix that comes up if DEVELOPMENT is enabled. svn path=/trunk/; revision=35104 --- shell/ChangeLog | 5 +++++ shell/main.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index cce1e529fc..4614949a79 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2008-03-02 Srinivasa Ragavan + + * main.c: (main): Committing the build fix that comes up if + DEVELOPMENT is enabled. + 2008-02-18 Srinivasa Ragavan ** Fix for bnc #173186 diff --git a/shell/main.c b/shell/main.c index 8d3b14de60..5a81cdd905 100644 --- a/shell/main.c +++ b/shell/main.c @@ -598,8 +598,8 @@ main (int argc, char **argv) extern void link_shutdown (void); #endif -#if DEVELOPMENT GConfClient *client; +#if DEVELOPMENT gboolean skip_warning_dialog; #endif GnomeProgram *program; @@ -645,9 +645,10 @@ main (int argc, char **argv) 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 @@ main (int argc, char **argv) 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 (); -- cgit v1.2.3