Commit b1872d9a authored by Dan Williams's avatar Dan Williams

2007-09-09 Dan Williams <dcbw@redhat.com>

	Stupid mistake on my part; object path and interface for settings service
	and connection objects can be the same, only the service name must be
	different for the system and user settings services.

	* include/NetworkManager.h
	  src/nm-manager.c
	  introspection/nm-settings-connection.xml
	  introspection/nm-settings.xml
	  libnm-glib/nm-settings.c
		- (nm_connection_settings_init, query_user_connections,
		   new_connection_cb): Unify NetworkManagerSettings and Connection
		   interface name and object path



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2772 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 1e9c50f1
2007-09-09 Dan Williams <dcbw@redhat.com>
Stupid mistake on my part; object path and interface for settings service
and connection objects can be the same, only the service name must be
different for the system and user settings services.
* include/NetworkManager.h
src/nm-manager.c
introspection/nm-settings-connection.xml
introspection/nm-settings.xml
libnm-glib/nm-settings.c
- (nm_connection_settings_init, query_user_connections,
new_connection_cb): Unify NetworkManagerSettings and Connection
interface name and object path
2007-09-06 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-object.c
......
......@@ -37,11 +37,12 @@
#define NM_DBUS_INTERFACE_ACCESS_POINT "org.freedesktop.NetworkManager.AccessPoint"
#define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
#define NM_DBUS_IFACE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
#define NM_DBUS_PATH_USER_SETTINGS "/org/freedesktop/NetworkManagerUserSettings"
#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings"
#define NM_DBUS_IFACE_SETTINGS "org.freedesktop.NetworkManagerSettings"
#define NM_DBUS_PATH_SETTINGS "/org/freedesktop/NetworkManagerSettings"
#define NM_DBUS_IFACE_USER_SETTINGS_CONNECTION "org.freedesktop.NetworkManagerUserSettings.Connection"
#define NM_DBUS_PATH_USER_SETTINGS_CONNECTION "/org/freedesktop/NetworkManagerUserSettings/Connection"
#define NM_DBUS_IFACE_SETTINGS_CONNECTION "org.freedesktop.NetworkManagerSettings.Connection"
#define NM_DBUS_PATH_SETTINGS_CONNECTION "/org/freedesktop/NetworkManagerSettings/Connection"
#define NMI_DBUS_USER_KEY_CANCELED_ERROR "org.freedesktop.NetworkManagerInfo.CanceledError"
......
......@@ -2,7 +2,7 @@
<node name="/">
<interface name="org.freedesktop.NetworkManagerUserSettings.Connection">
<interface name="org.freedesktop.NetworkManagerSettings.Connection">
<method name="GetID">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_connection_settings_get_id"/>
......
......@@ -2,7 +2,7 @@
<node name="/">
<interface name="org.freedesktop.NetworkManagerUserSettings">
<interface name="org.freedesktop.NetworkManagerSettings">
<method name="ListConnections">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_list_connections"/>
......
......@@ -196,7 +196,7 @@ nm_connection_settings_init (NMConnectionSettings *connection)
GError *error = NULL;
connection->dbus_path = g_strdup_printf ("%s/%u",
NM_DBUS_PATH_USER_SETTINGS,
NM_DBUS_PATH_SETTINGS,
cs_counter++);
}
......
......@@ -340,7 +340,7 @@ new_connection_cb (DBusGProxy *proxy, const char *path, gpointer user_data)
con_proxy = dbus_g_proxy_new_for_name (g_connection,
NM_DBUS_SERVICE_USER_SETTINGS,
path,
NM_DBUS_IFACE_USER_SETTINGS_CONNECTION);
NM_DBUS_IFACE_SETTINGS_CONNECTION);
g_object_unref (dbus_mgr);
if (!con_proxy) {
nm_warning ("Error: could not init user connection proxy");
......@@ -416,8 +416,8 @@ query_user_connections (NMManager *manager)
g_connection = nm_dbus_manager_get_connection (dbus_mgr);
priv->user_proxy = dbus_g_proxy_new_for_name (g_connection,
NM_DBUS_SERVICE_USER_SETTINGS,
NM_DBUS_PATH_USER_SETTINGS,
NM_DBUS_IFACE_USER_SETTINGS);
NM_DBUS_PATH_SETTINGS,
NM_DBUS_IFACE_SETTINGS);
g_object_unref (dbus_mgr);
if (!priv->user_proxy) {
nm_warning ("Error: could not init user settings proxy");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment