2006-05-04 Ryan Lortie <desrt@desrt.ca>

* gnome/applet/passphrase-dialog.c (update_button_cb): Get the SSID of
	  the WirelessNetwork structure using the proper function instead of
	  just casting it directly to (const char *) (gnome.org #336991)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1717 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Ryan Lortie 2006-05-04 15:32:45 +00:00 committed by Dan Williams
parent 3b3af29576
commit ad87e09b84
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2006-05-04 Ryan Lortie <desrt@desrt.ca>
* gnome/applet/passphrase-dialog.c (update_button_cb): Get the SSID of
the WirelessNetwork structure using the proper function instead of
just casting it directly to (const char *) (gnome.org #336991)
2006-05-03 Robert Love <rml@novell.com>
* src/backends/NetworkManagerSuSE.c: Respect the variable

View file

@ -53,6 +53,7 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
GladeXML * xml;
WirelessSecurityManager * wsm;
GtkComboBox * security_combo;
WirelessNetwork *net;
g_return_if_fail (dialog != NULL);
xml = get_dialog_xml (GTK_WIDGET (dialog));
@ -60,7 +61,8 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
wsm = (WirelessSecurityManager *) g_object_get_data (G_OBJECT (dialog), "wireless-security-manager");
g_return_if_fail (wsm != NULL);
if ((ssid = (const char *) g_object_get_data (G_OBJECT (dialog), "network")))
if ((net = g_object_get_data (G_OBJECT (dialog), "network")) &&
(ssid = wireless_network_get_essid (net)))
{
/* Validate the wireless security choices */
security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));