rev 9265 - in branches/kde4/packages/kdelibs/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-02-04 09:56:14 +0000 (Mon, 04 Feb 2008)
New Revision: 9265

Added:
   branches/kde4/packages/kdelibs/debian/patches/02_re-register_global_shortcuts_r769363.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
+ 02_re-register_global_shortcuts_r769363:
  Re-register global shortcuts if kded4 is restarted.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-02-04 09:45:20 UTC (rev 9264)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-02-04 09:56:14 UTC (rev 9265)
@@ -1,4 +1,4 @@
-kde4libs (4:4.0.1-1) UNRELEASED; urgency=low
+kde4libs (4:4.0.1-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -22,21 +22,25 @@
     (Closes: #462338)
   * Add dbus-x11 dependency to kdelibs5. Thanks to Chris Desjardins.
   * Add Vcs-Browser and Vcs-Svn fields.
+  * Cherry pick from branches/KDE/4.0:
 
+    + 02_re-register_global_shortcuts_r769363:
+      Re-register global shortcuts if kded4 is restarted.
+
   +++ Changes by Adeodato Simó:
 
   * Cherry pick from /branches/KDE/4.0:
 
-    + r769072_make_stackingOrder_work: fix KWindowSystem::stackingOrder() to
+    + 01_make_stackingOrder_work_r769072: fix KWindowSystem::stackingOrder() to
       actually return a non-empty list with the list of windows.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
   * Update to debhelper 6.
-  * Add versioned b-d on cdbs (>=0.4.51) to get debhelper 6 support and fixed
+  * Add versioned b-d on cdbs (>= 0.4.51) to get debhelper 6 support and fixed
     cmake.mk class.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Feb 2008 03:37:48 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 04 Feb 2008 09:59:44 +0100
 
 kde4libs (4:4.0.0-2) unstable; urgency=low
 

Added: branches/kde4/packages/kdelibs/debian/patches/02_re-register_global_shortcuts_r769363.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/02_re-register_global_shortcuts_r769363.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/02_re-register_global_shortcuts_r769363.diff	2008-02-04 09:56:14 UTC (rev 9265)
@@ -0,0 +1,81 @@
+Re-register global shortcuts if kded4 is restarted.
+KDE BUG: 156578
+
+--- a/kdeui/shortcuts/kglobalaccel.cpp
++++ b/kdeui/shortcuts/kglobalaccel.cpp
+@@ -61,19 +61,22 @@
+ 
+ //TODO what was the problem that got fixed recently in the old version? - forward port if necessary
+ 
+-KGlobalAccelPrivate::KGlobalAccelPrivate()
++KGlobalAccelPrivate::KGlobalAccelPrivate(KGlobalAccel* q)
+      : isUsingForeignComponentName(false),
+        enabled(true),
+        iface("org.kde.kded", "/modules/kdedglobalaccel", QDBusConnection::sessionBus())
+ {
+     // Make sure kded is running
+-    if (!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kded")) {
++    QDBusConnectionInterface* bus = QDBusConnection::sessionBus().interface();
++    if (!bus->isServiceRegistered("org.kde.kded")) {
+         KToolInvocation::klauncher(); // this calls startKdeinit
+     }
++    QObject::connect(bus, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
++            q, SLOT(_k_serviceOwnerChanged(QString,QString,QString)));
+ }
+ 
+ KGlobalAccel::KGlobalAccel()
+-    : d(new KGlobalAccelPrivate)
++    : d(new KGlobalAccelPrivate(this))
+ {
+     qDBusRegisterMetaType<QList<int> >();
+ 
+@@ -274,8 +277,16 @@
+     action->d->setActiveGlobalShortcutNoEnable(shortcutFromIntList(keys));
+ }
+ 
++void KGlobalAccelPrivate::_k_serviceOwnerChanged(const QString& name, const QString& oldOwner, const QString& newOwner)
++{
++    Q_UNUSED(oldOwner);
++    if (name == QLatin1String("org.kde.kded") && !newOwner.isEmpty()) {
++        // kded was restarted (what? you mean it crashes sometimes?)
++        reRegisterAll();
++    }
++}
+ 
+-void KGlobalAccelPrivate::_k_reRegisterAll()
++void KGlobalAccelPrivate::reRegisterAll()
+ {
+     //### Special case for isUsingForeignComponentName?
+ 
+--- a/kdeui/shortcuts/kglobalaccel.h
++++ b/kdeui/shortcuts/kglobalaccel.h
+@@ -119,7 +119,7 @@
+ 
+     Q_PRIVATE_SLOT(d, void _k_invokeAction(const QStringList&))
+     Q_PRIVATE_SLOT(d, void _k_shortcutGotChanged(const QStringList&, const QList<int>&))
+-    Q_PRIVATE_SLOT(d, void _k_reRegisterAll())
++    Q_PRIVATE_SLOT(d, void _k_serviceOwnerChanged(const QString&, const QString&, const QString&))
+ };
+ 
+ #endif // _KGLOBALACCEL_H_
+--- a/kdeui/shortcuts/kglobalaccel_p.h
++++ b/kdeui/shortcuts/kglobalaccel_p.h
+@@ -33,7 +33,7 @@
+ class KGlobalAccelPrivate
+ {
+ public:
+-    KGlobalAccelPrivate();
++    KGlobalAccelPrivate(KGlobalAccel*);
+ 
+     ///Propagate any shortcut changes to the KDED module that does the bookkeeping
+     ///and the key grabbing.
+@@ -49,7 +49,8 @@
+ 
+     void _k_invokeAction(const QStringList&);
+     void _k_shortcutGotChanged(const QStringList&, const QList<int>&);
+-    void _k_reRegisterAll();
++    void _k_serviceOwnerChanged(const QString& name, const QString& oldOwner, const QString& newOwner);
++    void reRegisterAll();
+ 
+     //for all actions with (isEnabled() && globalShortcutAllowed())
+     QHash<QString, KAction *> nameToAction;

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-02-04 09:45:20 UTC (rev 9264)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-02-04 09:56:14 UTC (rev 9265)
@@ -1,4 +1,5 @@
 01_make_stackingOrder_work_r769072.diff
+02_re-register_global_shortcuts_r769363.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 10_kdehome_kde4.diff
@@ -7,3 +8,4 @@
 13_qt4_designer_plugins_path.diff
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff
+