fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-24 05:40:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: use #defines for NMDBusManager signal names

Browse source 
Helps catch typos at compile time instead of runtime.
This commit is contained in:
Dan Williams 2010-12-10 11:36:55 -06:00
parent ffb808f4c4
commit 0a8f7aeb56
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bluez-manager/nm-bluez-manager.c
View file

@ -317,12 +317,12 @@ nm_bluez_manager_init (NMBluezManager *self)
g_assert (priv->dbus_mgr);
g_signal_connect (priv->dbus_mgr,
"name-owner-changed",
NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_CALLBACK (name_owner_changed_cb),
self);
g_signal_connect (priv->dbus_mgr,
"dbus-connection-changed",
NM_DBUS_MANAGER_DBUS_CONNECTION_CHANGED,
G_CALLBACK (dbus_connection_changed_cb),
self);

2
src/modem-manager/nm-modem-manager.c
View file

@ -371,7 +371,7 @@ nm_modem_manager_init (NMModemManager *self)
priv->modems = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
priv->dbus_mgr = nm_dbus_manager_get ();
g_signal_connect (priv->dbus_mgr, "name-owner-changed",
g_signal_connect (priv->dbus_mgr, NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_CALLBACK (nm_modem_manager_name_owner_changed),
self);

4
src/nm-dbus-manager.c
View file

@ -105,7 +105,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass)
object_class->dispose = nm_dbus_manager_dispose;
signals[DBUS_CONNECTION_CHANGED] =
g_signal_new ("dbus-connection-changed",
g_signal_new (NM_DBUS_MANAGER_DBUS_CONNECTION_CHANGED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMDBusManagerClass, dbus_connection_changed),
@ -113,7 +113,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass)
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[NAME_OWNER_CHANGED] =
g_signal_new ("name-owner-changed",
g_signal_new (NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMDBusManagerClass, name_owner_changed),

3
src/nm-dbus-manager.h
View file

@ -40,6 +40,9 @@ typedef gboolean (* NMDBusSignalHandlerFunc) (DBusConnection * connection,
#define NM_IS_DBUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_DBUS_MANAGER))
#define NM_DBUS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_DBUS_MANAGER, NMDBusManagerClass))
#define NM_DBUS_MANAGER_DBUS_CONNECTION_CHANGED "dbus-connection-changed"
#define NM_DBUS_MANAGER_NAME_OWNER_CHANGED "name-owner-changed"
typedef struct {
GObject parent;
} NMDBusManager;

2
src/supplicant-manager/nm-supplicant-manager.c
View file

@ -234,7 +234,7 @@ nm_supplicant_manager_init (NMSupplicantManager * self)
priv->dbus_mgr = nm_dbus_manager_get ();
priv->name_owner_id = g_signal_connect (priv->dbus_mgr,
"name-owner-changed",
NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_CALLBACK (name_owner_changed),
self);
priv->running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, WPAS_DBUS_SERVICE);

3
src/vpn-manager/nm-vpn-service.c
View file

@ -415,7 +415,8 @@ nm_vpn_service_init (NMVPNService *self)
NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self);
priv->dbus_mgr = nm_dbus_manager_get ();
priv->name_owner_id = g_signal_connect (priv->dbus_mgr, "name-owner-changed",
priv->name_owner_id = g_signal_connect (priv->dbus_mgr,
NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_CALLBACK (nm_vpn_service_name_owner_changed),
self);
}