[kdebase-workspace] * Thu Jul 28 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.0-2 - fix GDM getting misdetected as Lig

[Kevin Kofler]

commit 749a4d1d7927c8ba78023d98dadbed9c7b1a7b8d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Jul 28 23:40:44 2011 +0200

    * Thu Jul 28 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.0-2
    - fix GDM getting misdetected as LightDM (kde#278206, patch by Alex Fiestas)

 kdebase-workspace-4.7.0-kde#278206.patch |   14 ++++++++++++++
 kdebase-workspace.spec                   |   10 +++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.7.0-kde#278206.patch b/kdebase-workspace-4.7.0-kde#278206.patch
new file mode 100644
index 0000000..8817e96
--- /dev/null
+++ b/kdebase-workspace-4.7.0-kde#278206.patch
@@ -0,0 +1,14 @@
+diff --git a/libs/kworkspace/kdisplaymanager.cpp b/libs/kworkspace/kdisplaymanager.cpp
+index 57f7765..bd5c974 100644
+--- a/libs/kworkspace/kdisplaymanager.cpp
++++ b/libs/kworkspace/kdisplaymanager.cpp
+@@ -124,8 +124,7 @@ KDisplayManager::KDisplayManager() : d(new Private)
+             DMType = OldKDM;
+         else if (::getenv("GDMSESSION")) {
+             //lightDM identifies itself as GDM at the moment.
+-            QDBusReply<bool> reply = QDBusConnection::systemBus().interface()->isServiceRegistered("org.lightdm.LightDisplayManager");
+-            if (reply.isValid()) {
++            if (LightDMDBus().isValid()) {
+                 DMType = LightDM;
+             } else {
+                 DMType = GDMFactory().isValid() ? NewGDM : OldGDM;
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index f7bce41..ddc1049 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -4,7 +4,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -65,6 +65,10 @@ Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.6.80-kde#171685.patch
 
+# fix for "lightdm integration breaks gdm integration" (4.7 regression)
+# https://bugs.kde.org/show_bug.cgi?id=278206 (patch by Alex Fiestas)
+Patch51: kdebase-workspace-4.7.0-kde#278206.patch
+
 ## upstream patches
 
 ## Fedora specific patches
@@ -315,6 +319,7 @@ pushd %{name}-%{version}
 
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
+%patch51 -p1 -b .kde#278206
 
 # upstream patches
 
@@ -751,6 +756,9 @@ fi
 
 
 %changelog
+* Thu Jul 28 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.0-2
+- fix GDM getting misdetected as LightDM (kde#278206, patch by Alex Fiestas)
+
 * Tue Jul 26 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.0-1
 - 4.7.0
 - kde4workspace_version is not needed anymore