summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-06-08 23:55:27 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-06-08 23:55:27 +0000
commit31b211550f557947f67ef42dbdf2875c1622eafa (patch)
treed3a0e2f2405dfcda146d156fe0a5b2fd3cea08f8 /src/main.c
parent538a06fd55b969f4649c8c6f003c5ac1b56a7d95 (diff)
downloadmetacity-31b211550f557947f67ef42dbdf2875c1622eafa.tar.gz
don't die on bad atom name
2002-06-08 Havoc Pennington <hp@pobox.com> * src/xprops.c (meta_prop_get_utf8_string): don't die on bad atom name * src/display.c (meta_display_close): don't unmanage windows here, do it in screen_free and then closing the display unmanages windows as a side effect of unmanaging the screen (meta_display_unmanage_screen): new function (process_selection_clear, process_selection_request): handle selection stuff (meta_spew_event): don't crash on client message containing invalid atom (meta_spew_event): don't crash on property notify with invalid atom * src/main.c (main): add --replace option to replace existing window manager. * src/screen.c: implement holding manager selection. * src/display.c (meta_display_open): add new selection-related atoms.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index d5009e2a..c0522059 100644
--- a/src/main.c
+++ b/src/main.c
@@ -127,7 +127,9 @@ main (int argc, char **argv)
strcmp (arg, "-?") == 0)
usage ();
else if (strcmp (arg, "--sm-disable") == 0)
- disable_sm = TRUE;
+ disable_sm = TRUE;
+ else if (strcmp (arg, "--replace") == 0)
+ meta_set_replace_current_wm (TRUE);
else if (strstr (arg, "--display=") == arg)
{
const char *disp;