fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 07:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* src/nm-manager.c
	  src/nm-manager.h
		- (nm_manager_get_connection_secrets): make static, unused outside
			the file
		- Provide NM_MANAGER_CONNECTION_PROXY_TAG for other users



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2891 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-09-27 02:18:49 +00:00
parent 571812b40c
commit 1451b90417
3 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-09-26 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c
src/nm-manager.h
- (nm_manager_get_connection_secrets): make static, unused outside
the file
- Provide NM_MANAGER_CONNECTION_PROXY_TAG for other users
2007-09-26 Tambet Ingo <tambet@gmail.com>
* libnm-glib/nm-vpn-plugin.c (nm_vpn_plugin_connect): Update the plugin activation

44
src/nm-manager.c
View file

@ -22,6 +22,11 @@ static gboolean impl_manager_legacy_state (NMManager *manager, guint32 *state, G
static void nm_manager_connections_destroy (NMManager *manager, NMConnectionType type);
static void manager_set_wireless_enabled (NMManager *manager, gboolean enabled);
static gboolean get_connection_secrets (NMManager *manager,
NMDeviceInterface *device,
NMConnection *connection,
const char *setting_name,
gboolean request_new);
typedef struct {
GSList *devices;
@ -61,7 +66,6 @@ enum {
LAST_PROP
};
#define CONNECTION_PROXY_TAG "dbus-proxy"
#define CONNECTION_GET_SECRETS_CALL_TAG "get-secrets-call"
static void
@ -320,8 +324,10 @@ connection_get_settings_cb (DBusGProxy *proxy,
if (connection == NULL)
goto out;
g_object_set_data_full (G_OBJECT (connection), CONNECTION_PROXY_TAG, proxy,
(GDestroyNotify) g_object_unref);
g_object_set_data_full (G_OBJECT (connection),
NM_MANAGER_CONNECTION_PROXY_TAG,
proxy,
(GDestroyNotify) g_object_unref);
priv = NM_MANAGER_GET_PRIVATE (manager);
if (strcmp (bus_name, NM_DBUS_SERVICE_USER_SETTINGS) == 0) {
@ -673,10 +679,10 @@ manager_device_state_changed (NMDeviceInterface *device, NMDeviceState state, gp
g_assert (req);
connection = nm_act_request_get_connection (req);
nm_manager_get_connection_secrets (manager, device,
connection,
nm_connection_need_secrets (connection),
TRUE);
get_connection_secrets (manager, device,
connection,
nm_connection_need_secrets (connection),
TRUE);
}
}
@ -974,7 +980,7 @@ nm_manager_get_connection_service_name (NMManager *manager,
g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
proxy = g_object_get_data (G_OBJECT (connection), CONNECTION_PROXY_TAG);
proxy = g_object_get_data (G_OBJECT (connection), NM_MANAGER_CONNECTION_PROXY_TAG);
if (!DBUS_IS_G_PROXY (proxy)) {
nm_warning ("Couldn't get dbus proxy for connection.");
return NULL;
@ -992,7 +998,7 @@ nm_manager_get_connection_dbus_path (NMManager *manager,
g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
proxy = g_object_get_data (G_OBJECT (connection), CONNECTION_PROXY_TAG);
proxy = g_object_get_data (G_OBJECT (connection), NM_MANAGER_CONNECTION_PROXY_TAG);
if (!DBUS_IS_G_PROXY (proxy)) {
nm_warning ("Couldn't get dbus proxy for connection.");
return NULL;
@ -1028,7 +1034,8 @@ free_get_secrets_info (gpointer data)
g_free (info->setting_name);
if (info->connection)
g_object_unref (info->connection);
g_object_unref (info->device);
if (info->device)
g_object_unref (info->device);
g_slice_free (GetSecretsInfo, info);
}
@ -1066,21 +1073,22 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
g_hash_table_destroy (secrets);
}
gboolean
nm_manager_get_connection_secrets (NMManager *manager,
NMDeviceInterface *device,
NMConnection *connection,
const char *setting_name,
gboolean request_new)
static gboolean
get_connection_secrets (NMManager *manager,
NMDeviceInterface *device,
NMConnection *connection,
const char *setting_name,
gboolean request_new)
{
DBusGProxy *proxy;
GetSecretsInfo *info = NULL;
DBusGProxyCall *call;
g_return_val_if_fail (NM_IS_MANAGER (manager), FALSE);
g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
proxy = g_object_get_data (G_OBJECT (connection), CONNECTION_PROXY_TAG);
proxy = g_object_get_data (G_OBJECT (connection), NM_MANAGER_CONNECTION_PROXY_TAG);
if (!DBUS_IS_G_PROXY (proxy)) {
nm_warning ("Couldn't get dbus proxy for connection.");
goto error;
@ -1134,7 +1142,7 @@ nm_manager_cancel_get_connection_secrets (NMManager *manager,
g_return_if_fail (NM_IS_MANAGER (manager));
g_return_if_fail (NM_IS_CONNECTION (connection));
proxy = g_object_get_data (G_OBJECT (connection), CONNECTION_PROXY_TAG);
proxy = g_object_get_data (G_OBJECT (connection), NM_MANAGER_CONNECTION_PROXY_TAG);
if (!DBUS_IS_G_PROXY (proxy))
return;

8
src/nm-manager.h
View file

@ -17,6 +17,8 @@
#define NM_MANAGER_STATE "state"
#define NM_MANAGER_WIRELESS_ENABLED "wireless-enabled"
#define NM_MANAGER_CONNECTION_PROXY_TAG "dbus-proxy"
typedef struct {
GObject parent;
} NMManager;
@ -77,12 +79,6 @@ const char * nm_manager_get_connection_service_name (NMManager *manager,
const char * nm_manager_get_connection_dbus_path (NMManager *manager,
NMConnection *connection);
gboolean nm_manager_get_connection_secrets (NMManager *manager,
NMDeviceInterface *device,
NMConnection *connection,
const char * setting_name,
gboolean request_new);
void nm_manager_cancel_get_connection_secrets (NMManager *manager,
NMConnection *connection);