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 /examples/C | |
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 'examples/C')
-rw-r--r-- | examples/C/glib/add-connection-dbus-glib.c | 2 | ||||
-rw-r--r-- | examples/C/glib/get-active-connections-dbus-glib.c | 2 | ||||
-rw-r--r-- | examples/C/glib/list-connections-dbus-glib.c | 2 | ||||
-rw-r--r-- | examples/C/qt/add-connection-wired.cpp | 2 | ||||
-rw-r--r-- | examples/C/qt/change-ipv4-addresses.cpp | 6 | ||||
-rw-r--r-- | examples/C/qt/list-connections.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/examples/C/glib/add-connection-dbus-glib.c b/examples/C/glib/add-connection-dbus-glib.c index edf8e7996f..10468e7064 100644 --- a/examples/C/glib/add-connection-dbus-glib.c +++ b/examples/C/glib/add-connection-dbus-glib.c @@ -114,7 +114,7 @@ int main (int argc, char *argv[]) proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS); + NM_DBUS_INTERFACE_SETTINGS); /* Add a connection */ add_connection (proxy, "__Test connection__"); diff --git a/examples/C/glib/get-active-connections-dbus-glib.c b/examples/C/glib/get-active-connections-dbus-glib.c index ebc5d494c0..e0faea7393 100644 --- a/examples/C/glib/get-active-connections-dbus-glib.c +++ b/examples/C/glib/get-active-connections-dbus-glib.c @@ -55,7 +55,7 @@ print_connection (DBusGConnection *bus, const char *path) 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); /* Request the all the configuration of the Connection */ diff --git a/examples/C/glib/list-connections-dbus-glib.c b/examples/C/glib/list-connections-dbus-glib.c index 0b48ae40b3..266cf19fd2 100644 --- a/examples/C/glib/list-connections-dbus-glib.c +++ b/examples/C/glib/list-connections-dbus-glib.c @@ -78,7 +78,7 @@ int main (int argc, char *argv[]) proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS); + NM_DBUS_INTERFACE_SETTINGS); /* List connections of system settings service */ list_connections (proxy); diff --git a/examples/C/qt/add-connection-wired.cpp b/examples/C/qt/add-connection-wired.cpp index 475eaffffb..efcb107904 100644 --- a/examples/C/qt/add-connection-wired.cpp +++ b/examples/C/qt/add-connection-wired.cpp @@ -68,7 +68,7 @@ int main() { QDBusInterface interface(
NM_DBUS_SERVICE,
NM_DBUS_PATH_SETTINGS,
- NM_DBUS_IFACE_SETTINGS,
+ NM_DBUS_INTERFACE_SETTINGS,
QDBusConnection::systemBus());
addConnection(interface, "__Test connection__");
diff --git a/examples/C/qt/change-ipv4-addresses.cpp b/examples/C/qt/change-ipv4-addresses.cpp index 2fdf5e071e..60f7159cf6 100644 --- a/examples/C/qt/change-ipv4-addresses.cpp +++ b/examples/C/qt/change-ipv4-addresses.cpp @@ -61,7 +61,7 @@ const QString getConnection(const QString& connectionUuid, Connection *found_con QDBusInterface interface( NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS, + NM_DBUS_INTERFACE_SETTINGS, QDBusConnection::systemBus()); // Get connection list and find the connection with 'connectionUuid' @@ -71,7 +71,7 @@ const QString getConnection(const QString& connectionUuid, Connection *found_con ifaceForSettings = new QDBusInterface( NM_DBUS_SERVICE, connection.path(), - NM_DBUS_IFACE_SETTINGS_CONNECTION, + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, QDBusConnection::systemBus()); QDBusReply<Connection> result2 = ifaceForSettings->call("GetSettings"); delete ifaceForSettings; @@ -120,7 +120,7 @@ void changeConnection(const QString& uuid) QDBusInterface interface( NM_DBUS_SERVICE, conPath, - NM_DBUS_IFACE_SETTINGS_CONNECTION, + NM_DBUS_INTERFACE_SETTINGS_CONNECTION, QDBusConnection::systemBus()); // Call Update() D-Bus method to update connection diff --git a/examples/C/qt/list-connections.cpp b/examples/C/qt/list-connections.cpp index fb98166474..a10754cafb 100644 --- a/examples/C/qt/list-connections.cpp +++ b/examples/C/qt/list-connections.cpp @@ -44,7 +44,7 @@ int main() { QDBusInterface interface( NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS, + NM_DBUS_INTERFACE_SETTINGS, QDBusConnection::systemBus()); listConnections(interface); |