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

cli: let libnm-glib create our bus connection

Browse Source 
libnm-glib handles connecting to the bus automatically if NULL
is passed for the bus object.  Do that; plus this lets us use
the private bus connection if present.
This commit is contained in:
Dan Williams
2012-12-03 15:23:02 -06:00
parent a87b5a15df
commit 94ae8449c9
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cli/src/connections.c
View File

@@ -1869,8 +1869,6 @@ get_connections_cb (NMRemoteSettings *settings, gpointer user_data)
NMCResultCode NMCResultCode
do_connections (NmCli *nmc, int argc, char **argv) do_connections (NmCli *nmc, int argc, char **argv)
{ {
DBusGConnection *bus;
GError *error = NULL;
int i = 0; int i = 0;
gboolean real_cmd = FALSE; gboolean real_cmd = FALSE;
@@ -1899,17 +1897,8 @@ do_connections (NmCli *nmc, int argc, char **argv)
args_info.argc = argc; args_info.argc = argc;
args_info.argv = argv; args_info.argv = argv;
/* connect to DBus' system bus */
bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (error || !bus) {
g_string_printf (nmc->return_text, _("Error: could not connect to D-Bus."));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
nmc->should_wait = FALSE;
return nmc->return_value;
}
/* get system settings */ /* get system settings */
if (!(nmc->system_settings = nm_remote_settings_new (bus))) { if (!(nmc->system_settings = nm_remote_settings_new (NULL))) {
g_string_printf (nmc->return_text, _("Error: Could not get system settings.")); g_string_printf (nmc->return_text, _("Error: Could not get system settings."));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
nmc->should_wait = FALSE; nmc->should_wait = FALSE;
@@ -1930,9 +1919,6 @@ do_connections (NmCli *nmc, int argc, char **argv)
g_signal_connect (nmc->system_settings, NM_REMOTE_SETTINGS_CONNECTIONS_READ, g_signal_connect (nmc->system_settings, NM_REMOTE_SETTINGS_CONNECTIONS_READ,
G_CALLBACK (get_connections_cb), &args_info); G_CALLBACK (get_connections_cb), &args_info);
dbus_g_connection_unref (bus);
/* The rest will be done in get_connection_cb() callback. /* The rest will be done in get_connection_cb() callback.
* We need to wait for signals that connections are read. * We need to wait for signals that connections are read.
*/ */