colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: rename NMDBusManager to NMBusManager

Browse Source 
Our gdbus generated types use the same names as their corresponding
"real" types, but with "NM" changed to "NMDBus".

Unfortunately, that means that introspection/nmdbus-manager.c (the
generated type for src/nm-manager.c) uses the same type name as the
entirely unrelated src/nm-dbus-manager.c.

Fix this by removing the "d" from src/nm-dbus-manager.c. (We could
rename the generated type instead, but then it becomes inconsistent
with all the other generated types, and we're already using it as
"NMDBusManager" in libnm/nm-manager.c.)
This commit is contained in:
Dan Winship
2015-04-16 14:20:51 -04:00
parent 1424f249e3
commit 02370be7f3
17 changed files with 319 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@@ -46,7 +46,7 @@
#include "main-utils.h"
#include "nm-manager.h"
#include "nm-linux-platform.h"
#include "nm-dbus-manager.h"
#include "nm-bus-manager.h"
#include "nm-device.h"
#include "nm-dhcp-manager.h"
#include "nm-logging.h"
@@ -422,7 +422,7 @@ main (int argc, char *argv[])
#endif
);
if (!nm_dbus_manager_get_connection (nm_dbus_manager_get ())) {
if (!nm_bus_manager_get_connection (nm_bus_manager_get ())) {
#if HAVE_DBUS_GLIB_100
nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available");
#else
@@ -431,7 +431,7 @@ main (int argc, char *argv[])
#endif
} else {
/* Start our DBus service */
if (!nm_dbus_manager_start_service (nm_dbus_manager_get ())) {
if (!nm_bus_manager_start_service (nm_bus_manager_get ())) {
nm_log_err (LOGD_CORE, "failed to start the dbus service.");
goto done;
}