Fix broken show desktop shortcut

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1180115 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 47 insertions, 1 deletions

diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am
index 1ec3d42d6..e100025e6 100644
--- a/kicker/kicker/buttons/Makefile.am
+++ b/kicker/kicker/buttons/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(srcdir)/../core -I$(srcdir)/../../libkicker -I../../libkicker \
 	-I../ui -I$(srcdir)/../ui -I$(top_srcdir)/libkonq $(all_includes) $(LIBBEAGLE_CFLAGS) $(GLIB_CFLAGS)
 
+bin_PROGRAMS = kshowdesktop
 noinst_LTLIBRARIES = libkicker_buttons.la
 
 libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \
@@ -13,6 +14,10 @@ libkicker_buttons_la_LDFLAGS = $(all_libraries)
 libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB)
 libkicker_buttons_la_METASOURCES = AUTO
 
+kshowdesktop_SOURCES = kshowdesktop.cpp
+kshowdesktop_LDFLAGS = $(all_libraries)
+kshowdesktop_LDADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB)
+
 desktopmenu_DATA = bookmarks.desktop browser.desktop desktop.desktop \
                    exec.desktop kmenu.desktop windowlist.desktop
 desktopmenudir = $(kde_datadir)/kicker/builtins
diff --git a/kicker/kicker/buttons/kshowdesktop.cpp b/kicker/kicker/buttons/kshowdesktop.cpp
new file mode 100644
index 000000000..4f9dcd2e2
--- /dev/null
+++ b/kicker/kicker/buttons/kshowdesktop.cpp
@@ -0,0 +1,41 @@
+/*****************************************************************
+
+Copyright (c) 2010 Timothy Pearson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************/
+
+#include <tqtooltip.h>
+#include <tqdragobject.h>
+
+#include <klocale.h>
+#include <kglobalsettings.h>
+#include <konq_operations.h>
+#include <kfileitem.h>
+
+#include "showdesktop.h"
+#include "kicker.h"
+#include "kickerSettings.h"
+
+int main()
+{
+    bool isDesktopShown;
+    isDesktopShown = ShowDesktop::the()->desktopShowing();
+    ShowDesktop::the()->showDesktop(!isDesktopShown);
+}
\ No newline at end of file
diff --git a/kwin/kcmkwin/showdesktop.desktop b/kwin/kcmkwin/showdesktop.desktop
index 16c5566bc..459bc035b 100644
--- a/kwin/kcmkwin/showdesktop.desktop
+++ b/kwin/kcmkwin/showdesktop.desktop
@@ -126,7 +126,7 @@ Comment[vi]=Một nút cho phép bạn truy cập ngay đến màn hình nền m
 Comment[wa]=On boton ki dene raddimint accès å scribanne cwand il est tchôkî
 Comment[zh_CN]=按下可快速访问桌面的按钮
 Comment[zh_TW]=按下去能快速顯示桌面的按鈕
-Exec=dcop kicker $(dcop kicker qt objects | grep ShowDesktop | head -n 1 | tr '(' ' ' | awk '{ print $1; }') toggle
+Exec=kshowdesktop
 Icon=desktop
 Type=Application
 Categories=Qt;KDE;X-KDE-settings-desktop;
\ No newline at end of file