diff options
| author | Sjoerd Simons <sjoerd@debian.org> | 2008-10-09 22:34:20 +0000 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@debian.org> | 2008-10-09 22:34:20 +0000 |
| commit | ee96c6179353d7d61385f91a74dd2cc325bc5872 (patch) | |
| tree | d36d11f93fe472e208eaa05628c5a0c68449ed29 /debian/patches | |
| parent | fa26f37318b19204dda98daf4206479ca2f9a962 (diff) | |
remove 03-nm_get_debian_hostname.patch, a more complete implementation is merged upstream
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2457 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03-nm_get_debian_hostname.patch | 49 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 50 deletions
diff --git a/debian/patches/03-nm_get_debian_hostname.patch b/debian/patches/03-nm_get_debian_hostname.patch deleted file mode 100644 index 32bc595c..00000000 --- a/debian/patches/03-nm_get_debian_hostname.patch +++ /dev/null @@ -1,49 +0,0 @@ -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; - } - } - diff --git a/debian/patches/series b/debian/patches/series index 6320ab60..5bb8c3f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 02-dbus_access_network_manager.patch -03-nm_get_debian_hostname.patch -p0 |