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

2005-12-22 Dan Williams <dcbw@redhat.com>

Browse source 
* gnome/applet/applet-dbus-info.c
		- Remove nmi_dbus_create_error_message() in favor of
			nmu_create_dbus_error_message()
		- (nmi_dbus_get_network_properties): Error message cleanups
		- (nmi_dbus_get_network_properties): BSSIDs are now in the 'bssids'
			gconf key rather than 'addresses', since they really are BSSIDs
		- (nmi_dbus_get_network_properties): Dispose of the security
			object when we're done with it


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1226 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-12-22 19:58:26 +00:00
parent 7e5951b4fb
commit eedb5aeaee
2 changed files with 36 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2005-12-22 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-dbus-info.c
- Remove nmi_dbus_create_error_message() in favor of
nmu_create_dbus_error_message()
- (nmi_dbus_get_network_properties): Error message cleanups
- (nmi_dbus_get_network_properties): BSSIDs are now in the 'bssids'
gconf key rather than 'addresses', since they really are BSSIDs
- (nmi_dbus_get_network_properties): Dispose of the security
object when we're done with it
2005-12-21 Dan Williams <dcbw@redhat.com> 2005-12-21 Dan Williams <dcbw@redhat.com>
* Consolidate the info-daemon's "updateNetworkInfo" and * Consolidate the info-daemon's "updateNetworkInfo" and

71
gnome/applet/applet-dbus-info.c
View file

@ -72,35 +72,6 @@ static inline gboolean nmi_network_type_valid (NMNetworkType type)
} }
/*
* nmi_dbus_create_error_message
*
* Make a DBus error message
*
*/
static DBusMessage *nmi_dbus_create_error_message (DBusMessage *message,
const char *exception_namespace,
const char *exception,
const char *format,
...)
{
char * exception_text;
DBusMessage * reply_message;
va_list args;
char error_text[512];
va_start (args, format);
vsnprintf (error_text, 512, format, args);
va_end (args);
exception_text = g_strdup_printf ("%s.%s", exception_namespace, exception);
reply_message = dbus_message_new_error (message, exception_text, error_text);
g_free (exception_text);
return (reply_message);
}
typedef struct NMGetNetworkKeyCBData typedef struct NMGetNetworkKeyCBData
{ {
NMWirelessApplet *applet; NMWirelessApplet *applet;
@ -240,7 +211,7 @@ nmi_dbus_get_key_for_network (DBusConnection *connection,
gboolean success; gboolean success;
if (!(success = nmi_passphrase_dialog_schedule_show (dev, net, message, applet))) if (!(success = nmi_passphrase_dialog_schedule_show (dev, net, message, applet)))
{ {
return nmi_dbus_create_error_message (message, return nmu_create_dbus_error_message (message,
NMI_DBUS_INTERFACE, NMI_DBUS_INTERFACE,
"GetKeyError", "GetKeyError",
"Could not get user key for network '%s'.", "Could not get user key for network '%s'.",
@ -403,7 +374,7 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
DBusMessage * reply = NULL; DBusMessage * reply = NULL;
gchar * gconf_key = NULL; gchar * gconf_key = NULL;
char * network = NULL; char * network = NULL;
GConfValue * ap_addrs_value = NULL; GConfValue * bssids_value = NULL;
NMNetworkType type; NMNetworkType type;
char * escaped_network = NULL; char * escaped_network = NULL;
char * essid = NULL; char * essid = NULL;
@ -440,14 +411,16 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
/* ESSID */ /* ESSID */
if (!nm_gconf_get_string_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "essid", escaped_network, &essid) || !essid) if (!nm_gconf_get_string_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "essid", escaped_network, &essid) || !essid)
{ {
nm_warning ("%s:%d (%s): couldn't get 'essid' item from GConf.", __FILE__, __LINE__, __func__); nm_warning ("%s:%d (%s): couldn't get 'essid' item from GConf for '%s'.",
__FILE__, __LINE__, __func__, network);
goto out; goto out;
} }
/* Timestamp */ /* Timestamp */
if (!nm_gconf_get_int_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "timestamp", escaped_network, &timestamp) || (timestamp < 0)) if (!nm_gconf_get_int_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "timestamp", escaped_network, &timestamp) || (timestamp < 0))
{ {
nm_warning ("%s:%d (%s): couldn't get 'timestamp' item from GConf.", __FILE__, __LINE__, __func__); nm_warning ("%s:%d (%s): couldn't get 'timestamp' item from GConf for '%s'.",
__FILE__, __LINE__, __func__, essid);
goto out; goto out;
} }
@ -455,13 +428,14 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "trusted", escaped_network, &trusted)) if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "trusted", escaped_network, &trusted))
trusted = FALSE; trusted = FALSE;
/* Grab the list of stored AP MAC addresses */ /* Grab the list of stored access point BSSIDs */
gconf_key = g_strdup_printf ("%s/%s/addresses", GCONF_PATH_WIRELESS_NETWORKS, escaped_network); gconf_key = g_strdup_printf ("%s/%s/bssids", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
ap_addrs_value = gconf_client_get (client, gconf_key, NULL); bssids_value = gconf_client_get (client, gconf_key, NULL);
g_free (gconf_key); g_free (gconf_key);
if (ap_addrs_value && ((ap_addrs_value->type != GCONF_VALUE_LIST) || (gconf_value_get_list_type (ap_addrs_value) != GCONF_VALUE_STRING))) if (bssids_value && ((bssids_value->type != GCONF_VALUE_LIST) || (gconf_value_get_list_type (bssids_value) != GCONF_VALUE_STRING)))
{ {
nm_warning ("%s:%d (%s): addresses value existed in GConf, but was not a string list.", __FILE__, __LINE__, __func__); nm_warning ("%s:%d (%s): addresses value existed in GConf, but was not a string list for '%s'.",
__FILE__, __LINE__, __func__, essid);
goto out; goto out;
} }
@ -469,7 +443,7 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
if (!(gconf_wso = nm_gconf_wso_new_deserialize_gconf (client, escaped_network))) if (!(gconf_wso = nm_gconf_wso_new_deserialize_gconf (client, escaped_network)))
{ {
nm_warning ("%s:%d (%s): couldn't retrieve security information from " nm_warning ("%s:%d (%s): couldn't retrieve security information from "
"GConf.", __FILE__, __LINE__, __func__); "GConf for '%s'.", __FILE__, __LINE__, __func__, essid);
goto out; goto out;
} }
@ -481,28 +455,33 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &essid); dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &essid);
/* Second arg: Timestamp (INT32) */ /* Second arg: Timestamp (INT32) */
dbus_int = (gint32) timestamp; dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &timestamp);
dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &dbus_int);
/* Third arg: Trusted (BOOLEAN) */ /* Third arg: Trusted (BOOLEAN) */
dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &trusted); dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &trusted);
/* Fourth arg: List of AP BSSIDs (ARRAY, STRING) */ /* Fourth arg: List of AP BSSIDs (ARRAY, STRING) */
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array_iter); dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array_iter);
if (ap_addrs_value) if (bssids_value)
{ {
g_slist_foreach (gconf_value_get_list (ap_addrs_value), g_slist_foreach (gconf_value_get_list (bssids_value),
(GFunc) addr_list_append_helper, (GFunc) addr_list_append_helper,
&array_iter); &array_iter);
} }
else
{
const char *fake = " ";
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &fake);
}
dbus_message_iter_close_container (&iter, &array_iter); dbus_message_iter_close_container (&iter, &array_iter);
/* Serialize the security info into the message */ /* Serialize the security info into the message */
nm_gconf_wso_serialize_dbus (gconf_wso, &iter); nm_gconf_wso_serialize_dbus (gconf_wso, &iter);
g_object_unref (G_OBJECT (gconf_wso));
out: out:
if (ap_addrs_value) if (bssids_value)
gconf_value_free (ap_addrs_value); gconf_value_free (bssids_value);
g_free (essid); g_free (essid);
g_free (escaped_network); g_free (escaped_network);