aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-03-02 20:53:38 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-03-02 20:53:38 +0800
commitd5b3018517b36c8ae03d12020d442fc2678738de (patch)
tree441cc509fddd06967f4ffc73bc07fd4820d40a46 /shell
parent5d14846afc069a8d1c465c5af23d891b330419d7 (diff)
downloadgsoc2013-evolution-d5b3018517b36c8ae03d12020d442fc2678738de.tar.gz
gsoc2013-evolution-d5b3018517b36c8ae03d12020d442fc2678738de.tar.zst
gsoc2013-evolution-d5b3018517b36c8ae03d12020d442fc2678738de.zip
Committing the build fix that comes up if DEVELOPMENT is enabled.
2008-03-02 Srinivasa Ragavan <sragavan@novell.com> * main.c: (main): Committing the build fix that comes up if DEVELOPMENT is enabled. svn path=/trunk/; revision=35104
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/main.c7
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 <sragavan@novell.com>
+
+ * main.c: (main): Committing the build fix that comes up if
+ DEVELOPMENT is enabled.
+
2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
** 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 ();