From 6e6b573383bca54d9492ad2f87e62ec8f5aeb3d8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 27 Jul 2013 12:43:53 +0200 Subject: [PATCH] core: minor code cleanup to use preprocessor constants Use preprocessor constants for signal names NM_PLATFORM_LINK_* instead of hard coded values. Signed-off-by: Thomas Haller --- src/devices/nm-device-adsl.c | 2 +- src/nm-manager.c | 4 ++-- src/platform/nm-fake-platform.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/nm-device-adsl.c b/src/devices/nm-device-adsl.c index 0a7b98f5a5..02acd66977 100644 --- a/src/devices/nm-device-adsl.c +++ b/src/devices/nm-device-adsl.c @@ -370,7 +370,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason) } /* Watch for the 'nas' interface going away */ - priv->lost_link_id = g_signal_connect (nm_platform_get (), "link-removed", + priv->lost_link_id = g_signal_connect (nm_platform_get (), NM_PLATFORM_LINK_REMOVED, G_CALLBACK (lost_link), self); diff --git a/src/nm-manager.c b/src/nm-manager.c index f38398d960..bc7cdbf555 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4119,11 +4119,11 @@ nm_manager_new (NMSettings *settings, nm_dbus_manager_register_object (priv->dbus_mgr, NM_DBUS_PATH, singleton); g_signal_connect (nm_platform_get (), - "link-added", + NM_PLATFORM_LINK_ADDED, G_CALLBACK (platform_link_added_cb), singleton); g_signal_connect (nm_platform_get (), - "link-removed", + NM_PLATFORM_LINK_REMOVED, G_CALLBACK (platform_link_removed_cb), singleton); diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index dd421c7a21..6d7843f2fb 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -298,7 +298,7 @@ link_changed (NMPlatform *platform, NMFakePlatformLink *device) NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform); int i; - g_signal_emit_by_name (platform, "link-changed", device->link.ifindex, &device->link, NM_PLATFORM_REASON_INTERNAL); + g_signal_emit_by_name (platform, NM_PLATFORM_LINK_CHANGED, device->link.ifindex, &device->link, NM_PLATFORM_REASON_INTERNAL); if (device->link.master) { NMFakePlatformLink *master = link_get (platform, device->link.master);