rev 9726 - in branches: kde4/packages/kdebase-workspace/debian/patches kde4.1/packages/kdebase-workspace/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2008-03-12 12:57:10 +0000 (Wed, 12 Mar 2008)
New Revision: 9726

Modified:
   branches/kde4.1/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff
Log:
It make sense to apply same fix for kdm consolekit support patch to KDE4
branches. See KDE BTS #147790


Modified: branches/kde4/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff	2008-03-12 10:56:25 UTC (rev 9725)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff	2008-03-12 12:57:10 UTC (rev 9726)
@@ -567,7 +567,7 @@
 +	add_param_string (&iter_struct, "x11-display", d->name);
 +	add_param_boolean (&iter_struct, "is-local", ((d->displayType & d_location) == dLocal));
 +#ifdef XDMCP
-+	if ((d->displayType & d_location) != dLocal) {
++	if ((d->displayType & d_location) != dLocal && d->remoteHost) {
 +		add_param_string (&iter_struct, "remote-host-name", d->remoteHost);
 +	}
 +#endif

Modified: branches/kde4.1/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff
===================================================================
--- branches/kde4.1/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff	2008-03-12 10:56:25 UTC (rev 9725)
+++ branches/kde4.1/packages/kdebase-workspace/debian/patches/16_kdm_consolekit.diff	2008-03-12 12:57:10 UTC (rev 9726)
@@ -567,7 +567,7 @@
 +	add_param_string (&iter_struct, "x11-display", d->name);
 +	add_param_boolean (&iter_struct, "is-local", ((d->displayType & d_location) == dLocal));
 +#ifdef XDMCP
-+	if ((d->displayType & d_location) != dLocal) {
++	if ((d->displayType & d_location) != dLocal && d->remoteHost) {
 +		add_param_string (&iter_struct, "remote-host-name", d->remoteHost);
 +	}
 +#endif