[network-manager-applet] shared: remove header file "nm-dbus-compat.h"
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] shared: remove header file "nm-dbus-compat.h"
- Date: Fri, 17 Jun 2016 07:04:35 +0000 (UTC)
commit 9ed8ba0f01e516514242653e9060f8127ba7b308
Author: Thomas Haller <thaller redhat com>
Date: Fri Jun 17 08:53:59 2016 +0200
shared: remove header file "nm-dbus-compat.h"
This header was only used to have defines for well-known D-Bus paths.
These paths are an essential part of D-Bus, there is no need for a
define of those.
Often, we prefer defines over plain strings so that we can easier grep
for the users. E.g. instead of grepping for '"mac-address"', searching
for 'NM_SETTING_BRIDGE_MAC_ADDRESS' yields more precisely what we
search. That is not the case for these defines, as we probably won't
search for 'DBUS_SERVICE_DBUS'.
shared/Makefile.am | 1 -
shared/nm-dbus-compat.h | 74 ------------------------------------------
src/connection-editor/main.c | 7 ++--
3 files changed, 3 insertions(+), 79 deletions(-)
---
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 28b0bf2..c38fcea 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -1,6 +1,5 @@
EXTRA_DIST = \
gsystem-local-alloc.h \
- nm-dbus-compat.h \
nm-default.h \
nm-glib.h \
nm-macros-internal.h \
diff --git a/src/connection-editor/main.c b/src/connection-editor/main.c
index a6cec81..0735ae3 100644
--- a/src/connection-editor/main.c
+++ b/src/connection-editor/main.c
@@ -31,7 +31,6 @@
#include "gsystem-local-alloc.h"
#include "nm-connection-list.h"
#include "nm-connection-editor.h"
-#include "nm-dbus-compat.h"
gboolean nm_ce_keep_above;
@@ -213,9 +212,9 @@ try_existing_instance (GDBusConnection *bus,
g_assert (bus);
reply = g_dbus_connection_call_sync (bus,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS,
+ "org.freedesktop.DBus",
+ "/org/freedesktop/DBus",
+ "org.freedesktop.DBus",
"GetNameOwner",
g_variant_new ("(s)", NM_CE_DBUS_SERVICE),
G_VARIANT_TYPE ("(s)"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]