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

libnm-glib: merge nm-remote-settings{,-system}

Browse Source 
Originally, nm-remote-settings was used by the daemon to monitor the
user settings service, and its subclass nm-remote-settings-system was
used by NM clients to monitor the system settings service. With user
settings services gone, this distinction is no longer needed. Simplify
things a bit and merge the classes.
This commit is contained in:
Daniel Gnoutcheff
2010-07-29 21:28:49 -04:00
parent 215640c590
commit 4d1681ef09
9 changed files with 248 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/nmcli.h
View File

@@ -24,7 +24,6 @@
#include <nm-client.h>
#include <nm-remote-settings.h>
#include <nm-remote-settings-system.h>
/* nmcli exit codes */
typedef enum {
@@ -92,7 +91,7 @@ typedef struct _NmCli {
int timeout; /* Operation timeout */
NMRemoteSettingsSystem *system_settings; /* System settings */
NMRemoteSettings *system_settings; /* System settings */
gboolean system_settings_running; /* Is system settings service running? */
GSList *system_connections; /* List of system connections */