applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Don't leak a couple of dialogs

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=708286
This commit is contained in:
Rui Matos 2013-09-17 16:31:10 +02:00 • committed by Bastien Nocera
parent c5b70a7876
commit db62c4f8e6
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
panels/network/net-device-wifi.c
View file

@ -58,6 +58,8 @@ static void populate_ap_list (NetDeviceWifi *device_wifi);
struct _NetDeviceWifiPrivate struct _NetDeviceWifiPrivate
{ {
GtkBuilder *builder; GtkBuilder *builder;
GtkWidget *details_dialog;
GtkWidget *hotspot_dialog;
gboolean updating_device; gboolean updating_device;
gchar *selected_ssid_title; gchar *selected_ssid_title;
gchar *selected_connection_id; gchar *selected_connection_id;
@ -503,8 +505,7 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi)
nm_device = net_device_get_nm_device (NET_DEVICE (device_wifi)); nm_device = net_device_get_nm_device (NET_DEVICE (device_wifi));
dialog = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, dialog = device_wifi->priv->details_dialog;
"details_dialog"));
ap = g_object_get_data (G_OBJECT (dialog), "ap"); ap = g_object_get_data (G_OBJECT (dialog), "ap");
connection = g_object_get_data (G_OBJECT (dialog), "connection"); connection = g_object_get_data (G_OBJECT (dialog), "connection");
@ -1104,7 +1105,7 @@ start_hotspot (GtkButton *button, NetDeviceWifi *device_wifi)
window = gtk_widget_get_toplevel (GTK_WIDGET (button)); window = gtk_widget_get_toplevel (GTK_WIDGET (button));
dialog = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, "hotspot-dialog")); dialog = device_wifi->priv->hotspot_dialog;
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window)); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
str = g_string_new (_("If you have a connection to the Internet other than wireless, you can set up a wireless hotspot to share the connection with others.")); str = g_string_new (_("If you have a connection to the Internet other than wireless, you can set up a wireless hotspot to share the connection with others."));
@ -1288,6 +1289,8 @@ net_device_wifi_finalize (GObject *object)
NetDeviceWifi *device_wifi = NET_DEVICE_WIFI (object); NetDeviceWifi *device_wifi = NET_DEVICE_WIFI (object);
NetDeviceWifiPrivate *priv = device_wifi->priv; NetDeviceWifiPrivate *priv = device_wifi->priv;
g_clear_pointer (&priv->details_dialog, gtk_widget_destroy);
g_clear_pointer (&priv->hotspot_dialog, gtk_widget_destroy);
g_object_unref (priv->builder); g_object_unref (priv->builder);
g_free (priv->selected_ssid_title); g_free (priv->selected_ssid_title);
g_free (priv->selected_connection_id); g_free (priv->selected_connection_id);
@ -1924,6 +1927,14 @@ net_device_wifi_init (NetDeviceWifi *device_wifi)
return; return;
} }
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder,
"details_dialog"));
device_wifi->priv->details_dialog = widget;
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder,
"hotspot-dialog"));
device_wifi->priv->hotspot_dialog = widget;
/* setup wifi views */ /* setup wifi views */
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder,
"device_off_switch")); "device_off_switch"));