diff options
| author | Dan Winship <danw@gnome.org> | 2014-07-25 17:10:22 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:06 -0400 |
| commit | f441cf2b904ce0fee68860602254f590d516a7c7 (patch) | |
| tree | d9d81b889e62710f8de29c93ee7fcd8ab1a9aec4 /libnm | |
| parent | 3ac0f528780895c474a437bd75ab7e4baeaa83aa (diff) | |
| download | NetworkManager-f441cf2b904ce0fee68860602254f590d516a7c7.tar.gz | |
libnm: consistently use "INTERFACE" rather than "IFACE" in macros
Most D-Bus interface name macros used "INTERFACE" in their name (eg,
NM_DBUS_INTERFACE), but a few used "IFACE" instead (eg,
NM_DBUS_IFACE_SETTINGS). Make them consistent.
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-remote-connection.c | 6 | ||||
| -rw-r--r-- | libnm/nm-remote-settings.c | 8 | ||||
| -rw-r--r-- | libnm/tests/test-remote-settings-client.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 8d5c9534e2..f5ee0de1ea 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -576,7 +576,7 @@ constructed (GObject *object) priv->proxy = _nm_dbus_new_proxy_for_connection (priv->bus, nm_connection_get_path (NM_CONNECTION (object)), - NM_DBUS_IFACE_SETTINGS_CONNECTION); + NM_DBUS_INTERFACE_SETTINGS_CONNECTION); g_assert (priv->proxy); dbus_g_proxy_set_default_timeout (priv->proxy, G_MAXINT); @@ -625,7 +625,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) /* Get properties */ hash = NULL; if (!dbus_g_proxy_call (priv->props_proxy, "GetAll", error, - G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS_CONNECTION, + G_TYPE_STRING, NM_DBUS_INTERFACE_SETTINGS_CONNECTION, G_TYPE_INVALID, DBUS_TYPE_G_MAP_OF_VARIANT, &hash, G_TYPE_INVALID)) @@ -698,7 +698,7 @@ init_get_settings_cb (DBusGProxy *proxy, /* Grab properties */ dbus_g_proxy_begin_call (priv->props_proxy, "GetAll", init_async_got_properties, init_data, NULL, - G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS_CONNECTION, + G_TYPE_STRING, NM_DBUS_INTERFACE_SETTINGS_CONNECTION, G_TYPE_INVALID); } diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index f0d7ba8e08..8c03693324 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -1014,7 +1014,7 @@ name_owner_changed (DBusGProxy *proxy, dbus_g_proxy_begin_call (priv->props_proxy, "GetAll", nm_appeared_got_properties, self, NULL, - G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS, + G_TYPE_STRING, NM_DBUS_INTERFACE_SETTINGS, G_TYPE_INVALID); } else { priv->service_running = FALSE; @@ -1179,7 +1179,7 @@ constructed (GObject *object) priv->proxy = _nm_dbus_new_proxy_for_connection (priv->bus, NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS); + NM_DBUS_INTERFACE_SETTINGS); g_assert (priv->proxy); dbus_g_proxy_set_default_timeout (priv->proxy, G_MAXINT); @@ -1242,7 +1242,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) /* Get properties */ if (!dbus_g_proxy_call (priv->props_proxy, "GetAll", error, - G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS, + G_TYPE_STRING, NM_DBUS_INTERFACE_SETTINGS, G_TYPE_INVALID, DBUS_TYPE_G_MAP_OF_VARIANT, &props, G_TYPE_INVALID)) @@ -1313,7 +1313,7 @@ init_get_properties (NMRemoteSettingsInitData *init_data) dbus_g_proxy_begin_call (priv->props_proxy, "GetAll", init_async_got_properties, init_data, NULL, - G_TYPE_STRING, NM_DBUS_IFACE_SETTINGS, + G_TYPE_STRING, NM_DBUS_INTERFACE_SETTINGS, G_TYPE_INVALID); } diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 987845c1bb..424aaa4f59 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -153,7 +153,7 @@ test_make_invisible (void) proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, path, - NM_DBUS_IFACE_SETTINGS_CONNECTION); + NM_DBUS_INTERFACE_SETTINGS_CONNECTION); g_assert (proxy != NULL); /* Bypass the NMRemoteSettings object so we can test it independently */ @@ -221,7 +221,7 @@ test_make_visible (void) proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, path, - NM_DBUS_IFACE_SETTINGS_CONNECTION); + NM_DBUS_INTERFACE_SETTINGS_CONNECTION); g_assert (proxy != NULL); /* Bypass the NMRemoteSettings object so we can test it independently */ @@ -304,7 +304,7 @@ test_remove_connection (void) proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, path, - NM_DBUS_IFACE_SETTINGS_CONNECTION); + NM_DBUS_INTERFACE_SETTINGS_CONNECTION); g_assert (proxy != NULL); /* Bypass the NMRemoteSettings object so we can test it independently */ |