summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-08-23 11:45:51 +0200
committerThomas Haller <thaller@redhat.com>2016-08-23 11:46:28 +0200
commit633344bf2753777acf6c372c5cf2c716f178c8e4 (patch)
treeb66f729c4f4d3a0b722d500a0cbb8e55d820d94b
parent772a9cb05d5a3fac80f3c38c20b67f89cc074293 (diff)
downloadNetworkManager-633344bf2753777acf6c372c5cf2c716f178c8e4.tar.gz
core: use #define for "rfkill-changed" signal name
(cherry picked from commit 640fbec855907b19952c8f0411f8500f1008fd7d)
-rw-r--r--src/nm-manager.c2
-rw-r--r--src/nm-rfkill-manager.c4
-rw-r--r--src/nm-rfkill-manager.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 667c08c2c2..5794bb9ab9 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -5545,7 +5545,7 @@ constructed (GObject *object)
priv->rfkill_mgr = nm_rfkill_manager_new ();
g_signal_connect (priv->rfkill_mgr,
- "rfkill-changed",
+ NM_RFKILL_MANAGER_SIGNAL_RFKILL_CHANGED,
G_CALLBACK (rfkill_manager_rfkill_changed_cb),
self);
diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c
index 1674265631..453a3b9bbb 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/nm-rfkill-manager.c
@@ -395,7 +395,7 @@ dispose (GObject *object)
priv->killswitches = NULL;
}
- G_OBJECT_CLASS (nm_rfkill_manager_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nm_rfkill_manager_parent_class)->dispose (object);
}
static void
@@ -410,7 +410,7 @@ nm_rfkill_manager_class_init (NMRfkillManagerClass *klass)
/* Signals */
signals[RFKILL_CHANGED] =
- g_signal_new ("rfkill-changed",
+ g_signal_new (NM_RFKILL_MANAGER_SIGNAL_RFKILL_CHANGED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMRfkillManagerClass, rfkill_changed),
diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h
index d9937dafc3..3aca8f50b9 100644
--- a/src/nm-rfkill-manager.h
+++ b/src/nm-rfkill-manager.h
@@ -22,6 +22,8 @@
#ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__
#define __NETWORKMANAGER_RFKILL_MANAGER_H__
+#define NM_RFKILL_MANAGER_SIGNAL_RFKILL_CHANGED "rfkill-changed"
+
typedef enum { /*< skip >*/
RFKILL_UNBLOCKED = 0,
RFKILL_SOFT_BLOCKED = 1,