diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-09-17 09:26:22 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-09-17 09:26:22 +0800 |
| commit | 9cffd8815b2aceefd93cb1aea51c72cf110c14f0 (patch) | |
| tree | 43e4df7dde233c02df085a255e3e77041d881b93 | |
| parent | c24cdefbd35636e831f9f814ee2ea169bfa0288e (diff) | |
| download | gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.tar gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.tar.gz gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.tar.bz2 gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.tar.lz gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.tar.xz gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.tar.zst gsoc2013-evolution-9cffd8815b2aceefd93cb1aea51c72cf110c14f0.zip | |
Fix for a build break.
svn path=/branches/gnome-2-20/; revision=34275
| -rw-r--r-- | shell/ChangeLog | 4 | ||||
| -rw-r--r-- | shell/main.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 3d34bf6213..7be9ba3424 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2007-09-17 Srinivasa Ragavan <sragavan@novell.com> + + * main.c: (main): Fix for a build break. + 2007-09-03 Srinivasa Ragavan <sragavan@novell.com> * e-shell-window-commands.c: Add contributors to the credits section. diff --git a/shell/main.c b/shell/main.c index 9fb14522a9..223339ccc0 100644 --- a/shell/main.c +++ b/shell/main.c @@ -486,9 +486,9 @@ main (int argc, char **argv) #endif #if DEVELOPMENT - GConfClient *client; gboolean skip_warning_dialog; #endif + GConfClient *client; GnomeProgram *program; GOptionContext *context; char *filename; @@ -530,10 +530,10 @@ main (int argc, char **argv) #ifdef G_OS_WIN32 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); } @@ -594,11 +594,11 @@ 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 (); e_icon_factory_shutdown (); |