Merge lp:~ivenvd/compiz/compiz.fix_1082152 into lp:compiz/0.9.9

[Iven Hsu]

The new added APIs are related to Appmenu
(https://gitorious.org/kde-workspace-appmenu), since KDE 4.10 it's merged to
mainline. I'm not familiar with the code and cannot get it usable but only
compilable now. (LP: #1082152)

The new added APIs are related to Appmenu(https://gitorious.org/kde-workspace-appmenu), since KDE 4.10 it's merged to mainline. I'm not familiar with the code and cannot get it usable but only compilable now.

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'kde/window-decorator-kde4/window.cpp'
--- kde/window-decorator-kde4/window.cpp	2012-11-14 10:17:09 +0000
+++ kde/window-decorator-kde4/window.cpp	2012-11-23 06:43:18 +0000
@@ -554,6 +554,17 @@
     showWindowMenu (pos.bottomLeft ());
 }
 
+void
+KWD::Window::showApplicationMenu (const QPoint &p)
+{
+}
+
+bool
+KWD::Window::menuAvailable () const
+{
+    return false;
+}
+
 KWD::Options::MouseCommand
 KWD::Window::buttonToCommand (Qt::MouseButtons button)
 {
 
=== modified file 'kde/window-decorator-kde4/window.h'
--- kde/window-decorator-kde4/window.h	2012-09-03 07:19:30 +0000
+++ kde/window-decorator-kde4/window.h	2012-11-23 06:43:18 +0000
@@ -92,6 +92,8 @@
 	virtual void showWindowMenu (const QRect &);
 	virtual void showWindowMenu (const QPoint &);
 	virtual void showWindowMenu (const QPoint &, long int id);
+	virtual void showApplicationMenu (const QPoint &);
+	virtual bool menuAvailable () const;
 	virtual void performWindowOperation (WindowOperation);
 	virtual void setMask (const QRegion &, int);
 	virtual bool isPreview (void) const;