2006-02-05 Robert Love <rml@novell.com>

Patch by Christoph Brill <chrisbrill@gmx.net>
	* 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
This commit is contained in:
Robert Love 2006-02-05 15:55:44 +00:00 committed by Robert Love
parent a0d0719dfb
commit 5aba504db7
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2006-02-05 Robert Love <rml@novell.com>
Patch by Christoph Brill <chrisbrill@gmx.net>
* src/dhcp-manager/nm-dhcp-manager.c: Replace two open coded defines
with DHCP_SERVICE_NAME.
2006-02-05 Dan Williams <dcbw@redhat.com>
Remove anything having to do with device_setup_func from the

View file

@ -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;