summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2002-08-01 01:49:08 +0000
committerMark McLoughlin <mmclouglin@src.gnome.org>2002-08-01 01:49:08 +0000
commit43dd20887400b86706cd28c72468c87cfa992432 (patch)
tree79cfdeb513599d7515d5dbb7af362cab2d5d28c5 /src
parente8a9a6063b29c70ea0582872e9b4b875f71c8fd5 (diff)
downloadmetacity-43dd20887400b86706cd28c72468c87cfa992432.tar.gz
metacity-43dd20887400b86706cd28c72468c87cfa992432.tar.bz2
send a SaveYourselfDone if we're skipping this global save.
2002-08-01 Mark McLoughlin <mark@skynet.ie> * src/session.c: (save_yourself_possibly_done): send a SaveYourselfDone if we're skipping this global save. (save_yourself_callback): don't not save session state if the save style is Global. Fixes #89390. * theme-format.txt: update.
Diffstat (limited to 'src')
-rw-r--r--src/session.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/session.c b/src/session.c
index 62f912b..fd9191d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -190,6 +190,7 @@ typedef enum
STATE_SAVING_PHASE_2,
STATE_WAITING_FOR_INTERACT,
STATE_DONE_WITH_INTERACT,
+ STATE_SKIPPING_GLOBAL_SAVE,
STATE_FROZEN,
STATE_REGISTERING
} ClientState;
@@ -432,7 +433,8 @@ save_yourself_possibly_done (gboolean shutdown,
if (current_state == STATE_SAVING_PHASE_1 ||
current_state == STATE_SAVING_PHASE_2 ||
- current_state == STATE_DONE_WITH_INTERACT)
+ current_state == STATE_DONE_WITH_INTERACT ||
+ current_state == STATE_SKIPPING_GLOBAL_SAVE)
{
meta_topic (META_DEBUG_SM, "Sending SaveYourselfDone\n");
@@ -497,6 +499,20 @@ save_yourself_callback (SmcConn smc_conn,
}
#endif
+ /* ignore Global style saves
+ *
+ * This interpretaion of the Local/Global/Both styles
+ * was discussed extensively on the xdg-list. See:
+ *
+ * https://listman.redhat.com/pipermail/xdg-list/2002-July/000615.html
+ */
+ if (save_style == SmSaveGlobal)
+ {
+ current_state = STATE_SKIPPING_GLOBAL_SAVE;
+ save_yourself_possibly_done (shutdown, successful);
+ return;
+ }
+
interaction_allowed = interact_style != SmInteractStyleNone;
current_state = STATE_SAVING_PHASE_1;