2007-10-10 Tambet Ingo <tambet@gmail.com>
Move ppp-manager over to dbus-glib. The big deal is that it was the last piece of code that used NM's own version of dbus signal handling and custom dictionary marshalling/unmarshalling. With this change, all that obsolete code can disappear and we get to maintain over 2000 lines less code. * libnm-util/dbus-dict-helpers.c: * libnm-util/dbus-dict-helpers.h: Remove. * src/ppp-manager/nm-pppd-plugin.c: Convert it to use dbus-glib. * src/ppp-manager/nm-pppd-plugin.xml: Implement. * src/ppp-manager/nm-ppp-manager.c: Use dbus-glib instead of * home-brewed dbus signal handlers. * src/nm-dbus-manager.c: Remove all the manual dbus signal * handling. * configure.in: Remove test/libnm-util/Makefile creation. * test/Makefile.am: Remove libnm-util from SUBDIRS. * test/libnm-util/: Remove the whole directory. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2965 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -221,7 +221,6 @@ main (int argc, char *argv[])
|
||||
NMVPNManager *vpn_manager = NULL;
|
||||
NMNamedManager *named_mgr = NULL;
|
||||
NMDBusManager * dbus_mgr = NULL;
|
||||
DBusConnection *dbus_connection;
|
||||
NMSupplicantManager * sup_mgr = NULL;
|
||||
|
||||
GOptionEntry options[] = {
|
||||
@@ -302,14 +301,6 @@ main (int argc, char *argv[])
|
||||
|
||||
/* Initialize our DBus service & connection */
|
||||
dbus_mgr = nm_dbus_manager_get ();
|
||||
dbus_connection = nm_dbus_manager_get_dbus_connection (dbus_mgr);
|
||||
if (!dbus_connection) {
|
||||
nm_error ("Failed to initialize. "
|
||||
"Either dbus is not running, or the "
|
||||
"NetworkManager dbus security policy "
|
||||
"was not loaded.");
|
||||
goto done;
|
||||
}
|
||||
|
||||
manager = nm_manager_new ();
|
||||
if (manager == NULL) {
|
||||
|
Reference in New Issue
Block a user