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/nm-exported-object.c
View File

@@ -24,7 +24,7 @@
#include "nm-exported-object.h"
#include "nm-dbus-glib-types.h"
#include "nm-dbus-manager.h"
#include "nm-bus-manager.h"
#include "nm-logging.h"
static GHashTable *prefix_counters;
@@ -160,7 +160,7 @@ nm_exported_object_export (NMExportedObject *self)
} else
priv->path = g_strdup (class_export_path);
nm_dbus_manager_register_object (nm_dbus_manager_get (), priv->path, self);
nm_bus_manager_register_object (nm_bus_manager_get (), priv->path, self);
return priv->path;
}
@@ -215,7 +215,7 @@ nm_exported_object_unexport (NMExportedObject *self)
g_return_if_fail (priv->path != NULL);
g_clear_pointer (&priv->path, g_free);
nm_dbus_manager_unregister_object (nm_dbus_manager_get (), self);
nm_bus_manager_unregister_object (nm_bus_manager_get (), self);
}
static void