[Pkg-utopia-commits] r2434 - in /packages/experimental/networkmanager/debian: changelog patches/03-nm_get_debian_hostname.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Fri Oct  3 11:40:53 2008
New Revision: 2434

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2434
Log:
* debian/patches/03-nm_get_debian_hostname.patch:
  - Added. Temporary minimal patch to get hostname from /etc/hostname. There
    is work being done upstream for a more extensive version.

Added:
    packages/experimental/networkmanager/debian/patches/03-nm_get_debian_hostname.patch
Modified:
    packages/experimental/networkmanager/debian/changelog
    packages/experimental/networkmanager/debian/patches/series

Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=2434&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Fri Oct  3 11:40:53 2008
@@ -30,8 +30,11 @@
   [ Sjoerd Simons ]
   * debian/control: Add build-depend on uuid-dev
   * Update the various symbols files
-
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 02 Oct 2008 23:39:59 +0100
+  * debian/patches/03-nm_get_debian_hostname.patch:
+    - Added. Temporary minimal patch to get hostname from /etc/hostname. There
+      is work being done upstream for a more extensive version.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 03 Oct 2008 12:39:14 +0100
 
 network-manager (0.6.6-1) unstable; urgency=low
 

Added: packages/experimental/networkmanager/debian/patches/03-nm_get_debian_hostname.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/03-nm_get_debian_hostname.patch?rev=2434&op=file
==============================================================================
--- packages/experimental/networkmanager/debian/patches/03-nm_get_debian_hostname.patch (added)
+++ packages/experimental/networkmanager/debian/patches/03-nm_get_debian_hostname.patch Fri Oct  3 11:40:53 2008
@@ -1,0 +1,49 @@
+Index: system-settings/plugins/ifupdown/plugin.c
+===================================================================
+--- system-settings/plugins/ifupdown/plugin.c	(revision 4142)
++++ system-settings/plugins/ifupdown/plugin.c	(working copy)
+@@ -293,9 +293,15 @@
+ 	case NM_SYSTEM_CONFIG_INTERFACE_PROP_CAPABILITIES:
+ 		g_value_set_uint (value, NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE);
+ 		break;
+-	case NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME:
+-		g_value_set_string (value, "");
++	case NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME: {
++		char *hostname;
++		if (g_file_get_contents ("/etc/hostname", &hostname, NULL, NULL)) {
++			g_value_take_string (value, hostname);
++		} else {
++			g_value_set_string (value, "");
++		}
+ 		break;
++	}
+ 	default:
+ 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ 		break;
+Index: system-settings/src/dbus-settings.c
+===================================================================
+--- system-settings/src/dbus-settings.c	(revision 4142)
++++ system-settings/src/dbus-settings.c	(working copy)
+@@ -240,17 +240,12 @@
+ 		 * that provides one.
+ 		 */
+ 		for (iter = priv->plugins; iter; iter = iter->next) {
+-			NMSystemConfigInterfaceCapabilities caps = NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE;
++			char *hostname = NULL;
+ 
+-			g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_CAPABILITIES, &caps, NULL);
+-			if (caps & NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME) {
+-				char *hostname = NULL;
+-
+-				g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL);
+-				if (hostname && strlen (hostname)) {
+-					g_value_take_string (value, hostname);
+-					break;
+-				}
++			g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL);
++			if (hostname && strlen (hostname)) {
++				g_value_take_string (value, hostname);
++				break;
+ 			}
+ 		}
+ 

Modified: packages/experimental/networkmanager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/series?rev=2434&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/patches/series (original)
+++ packages/experimental/networkmanager/debian/patches/series Fri Oct  3 11:40:53 2008
@@ -1,1 +1,2 @@
 02-dbus_access_network_manager.patch
+03-nm_get_debian_hostname.patch