From 89ba6b4b3d94f3856e397ab6ff8324376fd104d9 Mon Sep 17 00:00:00 2001 From: Scott Reeves Date: Fri, 26 Jan 2007 21:25:46 +0000 Subject: [PATCH] respect the exit_on_close flag svn path=/trunk/; revision=7186 --- shell/ChangeLog | 4 ++++ shell/control-center.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index e217dc30d..b0d6b94b9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2007-01-26 Scott Reeves + + * control-center.c: respect the exit_on_close flag + 2007-01-26 Rodrigo Moya * control-center.schemas.in: added 'Change theme' and 'Set preferred diff --git a/shell/control-center.c b/shell/control-center.c index 0dddba253..325e508e7 100644 --- a/shell/control-center.c +++ b/shell/control-center.c @@ -102,7 +102,12 @@ handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data) temp = g_strdup_printf("%s%s", app_data->gconf_prefix, EXIT_SHELL_ON_STATIC_ACTION); if (get_slab_gconf_bool(temp)) - gtk_main_quit (); + { + if (app_data->exit_on_close) + gtk_main_quit (); + else + hide_shell (app_data); + } g_free (temp); } @@ -136,7 +141,7 @@ main (int argc, char *argv[]) startup_id = g_strdup (g_getenv (DESKTOP_STARTUP_ID)); program = gnome_program_init ("GNOME Control Center", "0.1", LIBGNOMEUI_MODULE, - argc, argv, NULL, NULL); + argc, argv, NULL, NULL); if (apss_already_running (argc, argv, &bonobo_app, "GNOME-NLD-ControlCenter", startup_id)) {