summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2009-02-26 07:04:15 +0100
committerDanny Baumann <dannybaumann@web.de>2009-02-26 07:04:15 +0100
commit839873fe09e0f109c530af79ad9470fc63c42bed (patch)
tree58cdffa2a5bfbd92487949f9d45d8d5d6883a977 /gtk
parent10810881d574355422a536fcee9e54d257a3788b (diff)
downloadzcomp-839873fe09e0f109c530af79ad9470fc63c42bed.tar.gz
zcomp-839873fe09e0f109c530af79ad9470fc63c42bed.tar.bz2
Adapt core for gnomecompat plugin addition.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gnome/50-compiz-desktop-key.xml.in10
-rw-r--r--gtk/window-decorator/gtk-window-decorator.c50
2 files changed, 6 insertions, 54 deletions
diff --git a/gtk/gnome/50-compiz-desktop-key.xml.in b/gtk/gnome/50-compiz-desktop-key.xml.in
index 1559d03..083d5e1 100644
--- a/gtk/gnome/50-compiz-desktop-key.xml.in
+++ b/gtk/gnome/50-compiz-desktop-key.xml.in
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/options/run_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/main_menu_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/options/main_menu_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_screenshot_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_screenshot_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_window_screenshot_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
- <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_terminal_key"/>
+ <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_terminal_key"/>
</KeyListEntries>
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index cdcc4d6..b34c06e 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -319,10 +319,6 @@ static Atom toolkit_action_run_dialog_atom;
static Atom toolkit_action_window_menu_atom;
static Atom toolkit_action_force_quit_dialog_atom;
-static Atom panel_action_atom;
-static Atom panel_action_main_menu_atom;
-static Atom panel_action_run_dialog_atom;
-
static Time dm_sn_timestamp;
#define C(name) { 0, XC_ ## name }
@@ -4944,27 +4940,6 @@ bottom_right_event (WnckWindow *win,
}
static void
-panel_action (Display *xdisplay,
- Window root,
- Atom panel_action,
- Time event_time)
-{
- XEvent ev;
-
- ev.type = ClientMessage;
- ev.xclient.window = root;
- ev.xclient.message_type = panel_action_atom;
- ev.xclient.format = 32;
- ev.xclient.data.l[0] = panel_action;
- ev.xclient.data.l[1] = event_time;
- ev.xclient.data.l[2] = 0;
- ev.xclient.data.l[3] = 0;
- ev.xclient.data.l[4] = 0;
-
- XSendEvent (xdisplay, root, FALSE, StructureNotifyMask, &ev);
-}
-
-static void
force_quit_dialog_realize (GtkWidget *dialog,
void *data)
{
@@ -5253,19 +5228,7 @@ event_filter_func (GdkXEvent *gdkxevent,
long action;
action = xevent->xclient.data.l[0];
- if (action == toolkit_action_main_menu_atom)
- {
- panel_action (xdisplay, xevent->xclient.window,
- panel_action_main_menu_atom,
- xevent->xclient.data.l[1]);
- }
- else if (action == toolkit_action_run_dialog_atom)
- {
- panel_action (xdisplay, xevent->xclient.window,
- panel_action_run_dialog_atom,
- xevent->xclient.data.l[1]);
- }
- else if (action == toolkit_action_window_menu_atom)
+ if (action == toolkit_action_window_menu_atom)
{
WnckWindow *win;
@@ -7004,23 +6967,12 @@ main (int argc, char *argv[])
toolkit_action_atom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION", FALSE);
- toolkit_action_main_menu_atom =
- XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_MAIN_MENU", FALSE);
- toolkit_action_run_dialog_atom =
- XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_RUN_DIALOG", FALSE);
toolkit_action_window_menu_atom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", FALSE);
toolkit_action_force_quit_dialog_atom =
XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_FORCE_QUIT_DIALOG",
FALSE);
- panel_action_atom =
- XInternAtom (xdisplay, "_GNOME_PANEL_ACTION", FALSE);
- panel_action_main_menu_atom =
- XInternAtom (xdisplay, "_GNOME_PANEL_ACTION_MAIN_MENU", FALSE);
- panel_action_run_dialog_atom =
- XInternAtom (xdisplay, "_GNOME_PANEL_ACTION_RUN_DIALOG", FALSE);
-
status = decor_acquire_dm_session (xdisplay,
gdk_screen_get_number (gdkscreen),
"gwd", replace, &dm_sn_timestamp);