Remove run dialog and main menu action support from decorators.

7 files changed, 1 insertions, 91 deletions

diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index b48266d5..b0e95a99 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -312,15 +312,9 @@ static Atom select_window_atom;
 static Atom mwm_hints_atom;
 
 static Atom toolkit_action_atom;
-static Atom toolkit_action_main_menu_atom;
-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 }
@@ -4975,27 +4969,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)
 {
@@ -5284,19 +5257,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;
 
@@ -7083,23 +7044,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);
diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
index 0bf4718f..17f71ae1 100644
--- a/kde/window-decorator-kde4/decorator.cpp
+++ b/kde/window-decorator-kde4/decorator.cpp
@@ -644,16 +644,6 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
 		    client->showWindowMenu (pos);
 		}
 	    }
-	    else if (action == Atoms::toolkitActionMainMenuAtom)
-	    {
-	    }
-	    else if (action == Atoms::toolkitActionRunDialogAtom)
-	    {
-		QDBusInterface krunner ("org.kde.krunner", "/App",
-					"org.kde.krunner.App");
-		if (krunner.isValid ())
-		    krunner.call ("display");
-	    }
 	    else if (action == Atoms::toolkitActionForceQuitDialogAtom)
 	    {
 		if (mClients.contains (xevent->xclient.window))
diff --git a/kde/window-decorator-kde4/utils.cpp b/kde/window-decorator-kde4/utils.cpp
index f6bdac6d..6448e9f7 100644
--- a/kde/window-decorator-kde4/utils.cpp
+++ b/kde/window-decorator-kde4/utils.cpp
@@ -49,8 +49,6 @@ namespace KWD
 	Atom wmProtocols;
 	Atom toolkitActionAtom;
 	Atom toolkitActionWindowMenuAtom;
-	Atom toolkitActionMainMenuAtom;
-	Atom toolkitActionRunDialogAtom;
 	Atom toolkitActionForceQuitDialogAtom;
         Atom compizWindowBlurDecor;
     }
@@ -201,10 +199,6 @@ KWD::Atoms::init (void)
     toolkitActionAtom = XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION", false);
     toolkitActionWindowMenuAtom =
 	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", false);
-    toolkitActionMainMenuAtom =
-	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_MAIN_MENU", false);
-    toolkitActionRunDialogAtom =
-	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_RUN_DIALOG", false);
     toolkitActionForceQuitDialogAtom =
 	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_FORCE_QUIT_DIALOG",
 		     false);
diff --git a/kde/window-decorator-kde4/utils.h b/kde/window-decorator-kde4/utils.h
index 1ae40dd3..121f2766 100644
--- a/kde/window-decorator-kde4/utils.h
+++ b/kde/window-decorator-kde4/utils.h
@@ -45,8 +45,6 @@ namespace KWD
 	extern Atom wmProtocols;
 	extern Atom toolkitActionAtom;
 	extern Atom toolkitActionWindowMenuAtom;
-	extern Atom toolkitActionMainMenuAtom;
-	extern Atom toolkitActionRunDialogAtom;
 	extern Atom toolkitActionForceQuitDialogAtom;
 	extern Atom compizWindowBlurDecor;
 
diff --git a/kde/window-decorator/decorator.cpp b/kde/window-decorator/decorator.cpp
index 2d5ada04..ef087527 100644
--- a/kde/window-decorator/decorator.cpp
+++ b/kde/window-decorator/decorator.cpp
@@ -765,20 +765,6 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
 		    client->showWindowMenu (pos);
 		}
 	    }
-	    else if (action == Atoms::toolkitActionMainMenuAtom)
-	    {
-		dcopClient ()->send ("kicker",
-				     "kicker",
-				     "showKMenu()",
-				     QByteArray ());
-	    }
-	    else if (action == Atoms::toolkitActionRunDialogAtom)
-	    {
-		dcopClient ()->send ("kdesktop",
-				     "KDesktopIface",
-				     "popupExecuteCommand()",
-				     QByteArray ());
-	    }
 	    else if (action == Atoms::toolkitActionForceQuitDialogAtom)
 	    {
 		if (mClients.contains (xevent->xclient.window))
diff --git a/kde/window-decorator/utils.cpp b/kde/window-decorator/utils.cpp
index 75dbbc69..83d7a125 100644
--- a/kde/window-decorator/utils.cpp
+++ b/kde/window-decorator/utils.cpp
@@ -49,8 +49,6 @@ namespace KWD
 	Atom wmProtocols;
 	Atom toolkitActionAtom;
 	Atom toolkitActionWindowMenuAtom;
-	Atom toolkitActionMainMenuAtom;
-	Atom toolkitActionRunDialogAtom;
 	Atom toolkitActionForceQuitDialogAtom;
         Atom compizWindowBlurDecor;
     }
@@ -199,10 +197,6 @@ KWD::Atoms::init (void)
     toolkitActionAtom = XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION", false);
     toolkitActionWindowMenuAtom =
 	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_WINDOW_MENU", false);
-    toolkitActionMainMenuAtom =
-	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_MAIN_MENU", false);
-    toolkitActionRunDialogAtom =
-	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_RUN_DIALOG", false);
     toolkitActionForceQuitDialogAtom =
 	XInternAtom (xdisplay, "_COMPIZ_TOOLKIT_ACTION_FORCE_QUIT_DIALOG",
 		     false);
diff --git a/kde/window-decorator/utils.h b/kde/window-decorator/utils.h
index 49786742..30364ff8 100644
--- a/kde/window-decorator/utils.h
+++ b/kde/window-decorator/utils.h
@@ -44,8 +44,6 @@ namespace KWD
 	extern Atom wmProtocols;
 	extern Atom toolkitActionAtom;
 	extern Atom toolkitActionWindowMenuAtom;
-	extern Atom toolkitActionMainMenuAtom;
-	extern Atom toolkitActionRunDialogAtom;
 	extern Atom toolkitActionForceQuitDialogAtom;
 	extern Atom compizWindowBlurDecor;