From 28da872b36ac166c3cef1decb94a3774197fc714 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 27 Sep 2010 03:58:34 +0000 Subject: Second attempt to fix FTBFS git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1180128 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker/kicker/Makefile.am | 5 ++++- kicker/kicker/buttons/Makefile.am | 5 ----- kicker/kicker/buttons/kshowdesktop.cpp | 41 ---------------------------------- kicker/kicker/kshowdesktop.cpp | 33 +++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 47 deletions(-) delete mode 100644 kicker/kicker/buttons/kshowdesktop.cpp create mode 100644 kicker/kicker/kshowdesktop.cpp diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index 9a89a0ac0..4c6b1a981 100644 --- a/kicker/kicker/Makefile.am +++ b/kicker/kicker/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) # SUBDIRS = core interfaces ui buttons plugins . SUBDIRS = core interfaces ui buttons . -bin_PROGRAMS = +bin_PROGRAMS = kshowdesktop lib_LTLIBRARIES = kdeinit_LTLIBRARIES = kicker.la @@ -15,6 +15,9 @@ kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ kicker_la_SOURCES = dummy.cpp kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +kshowdesktop_SOURCES = kshowdesktop.cpp +kshowdesktop_LDFLAGS = $(all_libraries) $(kicker_la_LIBADD) + autostart_DATA = panel.desktop autostartdir = $(datadir)/autostart diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am index 49d5693a4..1ec3d42d6 100644 --- a/kicker/kicker/buttons/Makefile.am +++ b/kicker/kicker/buttons/Makefile.am @@ -1,7 +1,6 @@ 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 \ @@ -14,10 +13,6 @@ 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) -L../core/.libs -lkicker_core -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 deleted file mode 100644 index 4f9dcd2e2..000000000 --- a/kicker/kicker/buttons/kshowdesktop.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/***************************************************************** - -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 -#include - -#include -#include -#include -#include - -#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/kicker/kicker/kshowdesktop.cpp b/kicker/kicker/kshowdesktop.cpp new file mode 100644 index 000000000..af5958de4 --- /dev/null +++ b/kicker/kicker/kshowdesktop.cpp @@ -0,0 +1,33 @@ +/***************************************************************** + +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 + +#include "core/showdesktop.h" + +int main() +{ + bool isDesktopShown; + isDesktopShown = ShowDesktop::the()->desktopShowing(); + ShowDesktop::the()->showDesktop(!isDesktopShown); +} \ No newline at end of file -- cgit v1.2.1