[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: KDE/kdebase/runtime
From: Michael Jansen <kde () michael-jansen ! biz>
Date: 2009-02-16 0:21:12
Message-ID: 1234743672.422610.21966.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 926711 by mjansen:
Implement kdedglobalaccel as a standalone demon. The decision was made
because beeing a kded module made it subject to the problems of all other
kded modules. If some module froze kded it could happen that the X frooze
completely for some seconds or it seems like the alt-key is stuck.
Rename everything kdedglobal* to kglobal* for convenience.
This commit requires a recompile of at least kdelibs too. You
will loose global shortcut on your next session login or kded/application restart.
If you want kcmshell4 keys to work again please recompile kdebase-workspace too.
This cmake code is supposed to delete the two files remaining from kglobalaccel
beeing a kded moudle from your installation area. If you encounter
problems after recompilation please check if they were successfully
removed.
+# Uninstall the kde 4.0 - 4.2 kdedglobalaccel files
+find_file(
+ KDED_DESKTOP
+ kdedglobalaccel.desktop
+ PATHS ${SERVICES_INSTALL_DIR}/kded
+ NO_DEFAULT_PATH)
+message(${KDED_DESKTOP})
+find_file(
+ KDED_PLUGIN
+ kded_globalaccel.so
+ PATHS ${PLUGIN_INSTALL_DIR}
+ NO_DEFAULT_PATH)
+message(${KDED_PLUGIN})
+
+# Remove old kdedglobalaccel files
+if(NOT KDED_DESKTOP STREQUAL "KDED_DESKTOP-NOTFOUND")
+ install(CODE "MESSAGE(\"Removing kdedglobalaccel leftovers\")")
+ install(CODE "file(REMOVE ${KDED_DESKTOP})")
+endif(NOT KDED_DESKTOP STREQUAL "KDED_DESKTOP-NOTFOUND")
+if(NOT KDED_PLUGIN STREQUAL "KDED_PLUGIN-NOTFOUND")
+ install(CODE "MESSAGE(\"Removing kdedglobalaccel leftovers\")")
+ install(CODE "file(REMOVE ${KDED_PLUGIN})")
+endif(NOT KDED_PLUGIN STREQUAL "KDED_PLUGIN-NOTFOUND")
+
CCMAIL:kde-devel@kde.org
CCMAIL:kde-core-devel@kde.org
M +1 -1 CMakeLists.txt
D kdedglobalaccel/CMakeLists.txt
D kdedglobalaccel/component.cpp
D kdedglobalaccel/component.h
D kdedglobalaccel/globalshortcut.cpp
D kdedglobalaccel/globalshortcut.h
D kdedglobalaccel/globalshortcutcontext.cpp
D kdedglobalaccel/globalshortcutcontext.h
D kdedglobalaccel/globalshortcutsregistry.cpp
D kdedglobalaccel/globalshortcutsregistry.h
D kdedglobalaccel/kconf/kdedglobalaccel_kde42.upd
D kdedglobalaccel/kdedglobalaccel.cpp
D kdedglobalaccel/kdedglobalaccel.desktop [TRAILING SPACE]
D kdedglobalaccel/kdedglobalaccel.h
D kdedglobalaccel/kglobalaccel_mac.cpp
D kdedglobalaccel/kglobalaccel_mac.h
D kdedglobalaccel/kglobalaccel_qws.cpp
D kdedglobalaccel/kglobalaccel_qws.h
D kdedglobalaccel/kglobalaccel_win.cpp
D kdedglobalaccel/kglobalaccel_win.h
D kdedglobalaccel/kglobalaccel_x11.cpp
D kdedglobalaccel/kglobalaccel_x11.h
D kdedglobalaccel/org.kde.KdedGlobalAccel.xml
A kglobalaccel (directory)
A kglobalaccel/CMakeLists.txt
A kglobalaccel/component.cpp kdedglobalaccel/component.cpp#926500 \
[License: LGPL (v2+)] A kglobalaccel/component.h \
kdedglobalaccel/component.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/dbus (directory) A \
kglobalaccel/dbus/org.kde.kglobalaccel.service.in A \
kglobalaccel/globalshortcut.cpp kdedglobalaccel/globalshortcut.cpp#926500 [License: \
LGPL (v2+)] A kglobalaccel/globalshortcut.h \
kdedglobalaccel/globalshortcut.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/globalshortcutcontext.cpp \
kdedglobalaccel/globalshortcutcontext.cpp#926500 [License: LGPL (v2+)] A \
kglobalaccel/globalshortcutcontext.h kdedglobalaccel/globalshortcutcontext.h#926500 \
[License: LGPL (v2+)] A kglobalaccel/globalshortcutsregistry.cpp \
kdedglobalaccel/globalshortcutsregistry.cpp#926500 [License: LGPL (v2+)] A \
kglobalaccel/globalshortcutsregistry.h \
kdedglobalaccel/globalshortcutsregistry.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/kconf (directory) A \
kglobalaccel/kconf/kdedglobalaccel_kde42.upd \
kdedglobalaccel/kconf/kdedglobalaccel_kde42.upd#926500 A \
kglobalaccel/kglobalaccel.cpp kdedglobalaccel/kdedglobalaccel.cpp#926500 [License: \
LGPL (v2+)] A kglobalaccel/kglobalaccel.desktop \
kdedglobalaccel/kdedglobalaccel.desktop#926500 [TRAILING SPACE] A \
kglobalaccel/kglobalaccel_mac.cpp kdedglobalaccel/kglobalaccel_mac.cpp#926500 \
[License: LGPL (v2+)] A kglobalaccel/kglobalaccel_mac.h \
kdedglobalaccel/kglobalaccel_mac.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/kglobalaccel_qws.cpp kdedglobalaccel/kglobalaccel_qws.cpp#926500 \
[License: LGPL (v2+)] A kglobalaccel/kglobalaccel_qws.h \
kdedglobalaccel/kglobalaccel_qws.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/kglobalaccel_win.cpp kdedglobalaccel/kglobalaccel_win.cpp#926500 \
[License: LGPL (v2+)] A kglobalaccel/kglobalaccel_win.h \
kdedglobalaccel/kglobalaccel_win.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/kglobalaccel_x11.cpp kdedglobalaccel/kglobalaccel_x11.cpp#926500 \
[License: LGPL (v2+)] A kglobalaccel/kglobalaccel_x11.h \
kdedglobalaccel/kglobalaccel_x11.h#926500 [License: LGPL (v2+)] A \
kglobalaccel/kglobalacceld.h kdedglobalaccel/kdedglobalaccel.h#926500 [License: \
LGPL (v2+)] A kglobalaccel/main.cpp [License: LGPL (v2)]
M +1 -1 kwalletd/CMakeLists.txt
--- trunk/KDE/kdebase/runtime/CMakeLists.txt #926710:926711
@@ -40,7 +40,7 @@
# Background processes
add_subdirectory(kpasswdserver)
-add_subdirectory(kdedglobalaccel)
+add_subdirectory(kglobalaccel)
add_subdirectory(knotify)
add_subdirectory(ktimezoned)
add_subdirectory(kuiserver)
--- trunk/KDE/kdebase/runtime/kwalletd/CMakeLists.txt #926710:926711
@@ -31,7 +31,7 @@
qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
-kde4_add_kdeinit_executable( kwalletd ${kwalletd_KDEINIT_SRCS} )
+kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
# uses kio for KDirWatch
target_link_libraries(kdeinit_kwalletd ${KDE4_KIO_LIBS} kwalletbackend )
> > Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic