From 5aba504db7aa4a087fc4fef3f3bb3bf3530ada75 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Sun, 5 Feb 2006 15:55:44 +0000 Subject: [PATCH] 2006-02-05 Robert Love Patch by Christoph Brill * src/dhcp-manager/nm-dhcp-manager.c: Replace two open coded defines with DHCP_SERVICE_NAME. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1447 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/dhcp-manager/nm-dhcp-manager.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a3ed7f8a9..54bfed2dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-05 Robert Love + + Patch by Christoph Brill + * src/dhcp-manager/nm-dhcp-manager.c: Replace two open coded defines + with DHCP_SERVICE_NAME. + 2006-02-05 Dan Williams Remove anything having to do with device_setup_func from the diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 96e3e15028..f359e6c93b 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -639,7 +639,7 @@ gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *me if (!(interface = dbus_message_get_interface (message))) return FALSE; /* Ignore non-DHCP related messages */ - if (strncmp (interface, "com.redhat.dhcp", 15)) + if (strncmp (interface, DHCP_SERVICE_NAME, 15)) return FALSE; #if 0 @@ -652,7 +652,7 @@ gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *me dev = nm_get_device_by_iface (manager->data, member); if (dev && (req = nm_device_get_act_request (dev))) { - if (dbus_message_is_signal (message, "com.redhat.dhcp.state", nm_device_get_iface (dev))) + if (dbus_message_is_signal (message, DHCP_SERVICE_NAME".state", nm_device_get_iface (dev))) { guint8 state;