[gnome-control-center] network: Connect signals with g_signal_connect_object in swapped form
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Connect signals with g_signal_connect_object in swapped form
- Date: Mon, 30 Mar 2020 03:26:04 +0000 (UTC)
commit 5b14e16e9ca667228b8a3b14d0e79562a84d2368
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Nov 22 16:21:43 2019 +1300
network: Connect signals with g_signal_connect_object in swapped form
panels/network/cc-wifi-connection-list.c | 8 ++--
panels/network/cc-wifi-connection-row.c | 2 +-
.../connection-editor/ce-page-8021x-security.c | 2 +-
panels/network/connection-editor/ce-page-details.c | 13 +++--
.../network/connection-editor/ce-page-ethernet.c | 12 ++---
panels/network/connection-editor/ce-page-ip4.c | 53 ++++++++++-----------
panels/network/connection-editor/ce-page-ip6.c | 55 +++++++++++-----------
.../network/connection-editor/ce-page-security.c | 4 +-
panels/network/connection-editor/ce-page-vpn.c | 4 +-
panels/network/connection-editor/ce-page-wifi.c | 8 ++--
.../connection-editor/net-connection-editor.c | 22 ++++-----
panels/network/net-device-ethernet.c | 7 ++-
panels/network/net-device-mobile.c | 26 ++++------
panels/network/net-device-wifi.c | 49 ++++++++++---------
panels/network/net-proxy.c | 33 +++++++------
panels/network/net-vpn.c | 14 +++---
16 files changed, 152 insertions(+), 160 deletions(-)
---
diff --git a/panels/network/cc-wifi-connection-list.c b/panels/network/cc-wifi-connection-list.c
index 02e9bb9fd..bb125eda2 100644
--- a/panels/network/cc-wifi-connection-list.c
+++ b/panels/network/cc-wifi-connection-list.c
@@ -56,8 +56,8 @@ static void on_device_ap_added_cb (CcWifiConnectionList *self,
static void on_device_ap_removed_cb (CcWifiConnectionList *self,
NMAccessPoint *ap,
NMDeviceWifi *device);
-static void on_row_configured_cb (CcWifiConnectionRow *row,
- CcWifiConnectionList *list);
+static void on_row_configured_cb (CcWifiConnectionList *self,
+ CcWifiConnectionRow *row);
G_DEFINE_TYPE (CcWifiConnectionList, cc_wifi_connection_list, GTK_TYPE_LIST_BOX)
@@ -130,7 +130,7 @@ cc_wifi_connection_list_row_add (CcWifiConnectionList *self,
gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (res));
gtk_widget_show (GTK_WIDGET (res));
- g_signal_connect (res, "configure", G_CALLBACK (on_row_configured_cb), self);
+ g_signal_connect_object (res, "configure", G_CALLBACK (on_row_configured_cb), self, G_CONNECT_SWAPPED);
return res;
}
@@ -240,7 +240,7 @@ update_connections (CcWifiConnectionList *self)
}
static void
-on_row_configured_cb (CcWifiConnectionRow *row, CcWifiConnectionList *self)
+on_row_configured_cb (CcWifiConnectionList *self, CcWifiConnectionRow *row)
{
g_signal_emit_by_name (self, "configure", row);
}
diff --git a/panels/network/cc-wifi-connection-row.c b/panels/network/cc-wifi-connection-row.c
index d0a1ba497..d119e6ed5 100644
--- a/panels/network/cc-wifi-connection-row.c
+++ b/panels/network/cc-wifi-connection-row.c
@@ -505,7 +505,7 @@ cc_wifi_connection_row_init (CcWifiConnectionRow *self)
{
gtk_widget_init_template (GTK_WIDGET (self));
- g_signal_connect_swapped (self->configure_button, "clicked", G_CALLBACK (configure_clicked_cb), self);
+ g_signal_connect_object (self->configure_button, "clicked", G_CALLBACK (configure_clicked_cb), self,
G_CONNECT_SWAPPED);
self->aps = g_ptr_array_new_with_free_func (g_object_unref);
diff --git a/panels/network/connection-editor/ce-page-8021x-security.c
b/panels/network/connection-editor/ce-page-8021x-security.c
index 5861ec26d..1e4f1464a 100644
--- a/panels/network/connection-editor/ce-page-8021x-security.c
+++ b/panels/network/connection-editor/ce-page-8021x-security.c
@@ -85,7 +85,7 @@ finish_setup (CEPage8021xSecurity *self, gpointer unused, GError *error, gpointe
gtk_container_remove (GTK_CONTAINER (parent), GTK_WIDGET (self->security));
gtk_switch_set_active (self->enable_8021x_switch, self->initial_have_8021x);
- g_signal_connect_swapped (self->enable_8021x_switch, "notify::active", G_CALLBACK (enable_toggled),
self);
+ g_signal_connect_object (self->enable_8021x_switch, "notify::active", G_CALLBACK (enable_toggled),
self, G_CONNECT_SWAPPED);
gtk_widget_set_sensitive (GTK_WIDGET (self->security), self->initial_have_8021x);
gtk_size_group_add_widget (self->group, GTK_WIDGET (self->security_label));
diff --git a/panels/network/connection-editor/ce-page-details.c
b/panels/network/connection-editor/ce-page-details.c
index dbed2a307..6a7ca250d 100644
--- a/panels/network/connection-editor/ce-page-details.c
+++ b/panels/network/connection-editor/ce-page-details.c
@@ -214,8 +214,8 @@ update_restrict_data (CEPageDetails *self)
metered == NM_METERED_YES || metered == NM_METERED_GUESS_YES);
gtk_widget_show (GTK_WIDGET (self->restrict_data_check));
- g_signal_connect_swapped (self->restrict_data_check, "notify::active", G_CALLBACK
(restrict_data_changed), self);
- g_signal_connect_swapped (self->restrict_data_check, "notify::active", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->restrict_data_check, "notify::active", G_CALLBACK
(restrict_data_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->restrict_data_check, "notify::active", G_CALLBACK (ce_page_changed),
self, G_CONNECT_SWAPPED);
}
static void
@@ -409,21 +409,20 @@ connect_details_page (CEPageDetails *self)
g_object_bind_property (sc, "autoconnect",
self->auto_connect_check, "active",
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
- g_signal_connect_swapped (self->auto_connect_check, "toggled", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->auto_connect_check, "toggled", G_CALLBACK (ce_page_changed),
self, G_CONNECT_SWAPPED);
}
/* All users check */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->all_user_check),
nm_setting_connection_get_num_permissions (sc) == 0);
- g_signal_connect_swapped (self->all_user_check, "toggled",
- G_CALLBACK (all_user_changed), self);
- g_signal_connect_swapped (self->all_user_check, "toggled", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->all_user_check, "toggled", G_CALLBACK (all_user_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->all_user_check, "toggled", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
/* Restrict Data check */
update_restrict_data (self);
/* Forget button */
- g_signal_connect_swapped (self->forget_button, "clicked", G_CALLBACK (forget_cb), self);
+ g_signal_connect_object (self->forget_button, "clicked", G_CALLBACK (forget_cb), self,
G_CONNECT_SWAPPED);
if (g_str_equal (type, NM_SETTING_WIRELESS_SETTING_NAME))
gtk_button_set_label (self->forget_button, _("Forget Connection"));
diff --git a/panels/network/connection-editor/ce-page-ethernet.c
b/panels/network/connection-editor/ce-page-ethernet.c
index 68cce0163..98fe46079 100644
--- a/panels/network/connection-editor/ce-page-ethernet.c
+++ b/panels/network/connection-editor/ce-page-ethernet.c
@@ -94,21 +94,21 @@ connect_ethernet_page (CEPageEthernet *self)
s_mac_str = nm_setting_wired_get_mac_address (setting);
ce_page_setup_mac_combo (self->mac_combo, s_mac_str, mac_list);
g_strfreev (mac_list);
- g_signal_connect_swapped (self->mac_combo, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->mac_combo, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
/* Cloned MAC address */
cloned_mac = nm_setting_wired_get_cloned_mac_address (setting);
ce_page_setup_cloned_mac_combo (self->cloned_mac_combo, cloned_mac);
- g_signal_connect_swapped (self->cloned_mac_combo, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->cloned_mac_combo, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
/* MTU */
- g_signal_connect_swapped (self->mtu_spin, "output", G_CALLBACK (mtu_output_cb), self);
+ g_signal_connect_object (self->mtu_spin, "output", G_CALLBACK (mtu_output_cb), self,
G_CONNECT_SWAPPED);
gtk_spin_button_set_value (self->mtu_spin, (gdouble) nm_setting_wired_get_mtu (setting));
- g_signal_connect_swapped (self->mtu_spin, "value-changed", G_CALLBACK (mtu_changed), self);
+ g_signal_connect_object (self->mtu_spin, "value-changed", G_CALLBACK (mtu_changed), self,
G_CONNECT_SWAPPED);
mtu_changed (self);
- g_signal_connect_swapped (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (self->mtu_spin, "value-changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->mtu_spin, "value-changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
}
static void
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 609bea3bd..a5e363023 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -234,8 +234,8 @@ add_address_row (CEPageIP4 *self,
gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "address", widget);
gtk_entry_set_text (GTK_ENTRY (widget), address);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -243,8 +243,8 @@ add_address_row (CEPageIP4 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "network", widget);
gtk_entry_set_text (GTK_ENTRY (widget), network);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -252,8 +252,8 @@ add_address_row (CEPageIP4 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "gateway", widget);
gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : "");
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -263,7 +263,7 @@ add_address_row (CEPageIP4 *self,
delete_button = gtk_button_new ();
gtk_widget_set_sensitive (delete_button, FALSE);
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
- g_signal_connect_swapped (delete_button, "clicked", G_CALLBACK (remove_row), self);
+ g_signal_connect_object (delete_button, "clicked", G_CALLBACK (remove_row), self, G_CONNECT_SWAPPED);
image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Address"));
gtk_button_set_image (GTK_BUTTON (delete_button), image);
@@ -340,7 +340,7 @@ add_dns_section (CEPageIP4 *self)
gint i;
gtk_switch_set_active (self->auto_dns_switch, !nm_setting_ip_config_get_ignore_auto_dns
(self->setting));
- g_signal_connect_swapped (self->auto_dns_switch, "notify::active", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->auto_dns_switch, "notify::active", G_CALLBACK (ce_page_changed),
self, G_CONNECT_SWAPPED);
string = g_string_new ("");
@@ -357,7 +357,7 @@ add_dns_section (CEPageIP4 *self)
gtk_entry_set_text (self->dns_entry, string->str);
- g_signal_connect_swapped (self->dns_entry, "notify::text", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->dns_entry, "notify::text", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
g_string_free (string, TRUE);
}
@@ -381,8 +381,8 @@ add_route_row (CEPageIP4 *self,
gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "address", widget);
gtk_entry_set_text (GTK_ENTRY (widget), address);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -390,8 +390,8 @@ add_route_row (CEPageIP4 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "netmask", widget);
gtk_entry_set_text (GTK_ENTRY (widget), netmask);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -399,8 +399,8 @@ add_route_row (CEPageIP4 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "gateway", widget);
gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : "");
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -408,8 +408,8 @@ add_route_row (CEPageIP4 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "metric", widget);
if (metric >= 0) {
g_autofree gchar *s = g_strdup_printf ("%d", metric);
@@ -423,7 +423,7 @@ add_route_row (CEPageIP4 *self,
delete_button = gtk_button_new ();
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
- g_signal_connect_swapped (delete_button, "clicked", G_CALLBACK (remove_row), self);
+ g_signal_connect_object (delete_button, "clicked", G_CALLBACK (remove_row), self, G_CONNECT_SWAPPED);
image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Route"));
gtk_button_set_image (GTK_BUTTON (delete_button), image);
@@ -471,8 +471,7 @@ add_routes_box (CEPageIP4 *self)
gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
gtk_container_add (GTK_CONTAINER (self->routes_box), list);
gtk_switch_set_active (self->auto_routes_switch, !nm_setting_ip_config_get_ignore_auto_routes
(self->setting));
- g_signal_connect_swapped (self->auto_routes_switch, "notify::active", G_CALLBACK (ce_page_changed),
self);
-
+ g_signal_connect_object (self->auto_routes_switch, "notify::active", G_CALLBACK (ce_page_changed),
self, G_CONNECT_SWAPPED);
for (i = 0; i < nm_setting_ip_config_get_num_routes (self->setting); i++) {
NMIPRoute *route;
@@ -509,12 +508,12 @@ connect_ip4_page (CEPageIP4 *self)
add_routes_box (self);
str_method = nm_setting_ip_config_get_method (self->setting);
- g_signal_connect_swapped (self->disabled_radio, "notify::active", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->disabled_radio, "notify::active", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
g_object_bind_property (self->disabled_radio, "active",
self->content_box, "sensitive",
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
- g_signal_connect_swapped (self->shared_radio, "notify::active", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->shared_radio, "notify::active", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
g_object_bind_property (self->shared_radio, "active",
self->content_box, "sensitive",
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
@@ -532,12 +531,12 @@ connect_ip4_page (CEPageIP4 *self)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->never_default_check),
nm_setting_ip_config_get_never_default (self->setting));
- g_signal_connect_swapped (self->never_default_check, "toggled", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->never_default_check, "toggled", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
- g_signal_connect_swapped (self->automatic_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->local_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->manual_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->disabled_radio, "toggled", G_CALLBACK (method_changed), self);
+ g_signal_connect_object (self->automatic_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->local_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->manual_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->disabled_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
switch (method) {
case IP4_METHOD_AUTO:
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index 6a27200c8..fb39faaa5 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -215,8 +215,8 @@ add_address_row (CEPageIP6 *self,
gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "address", widget);
gtk_entry_set_text (GTK_ENTRY (widget), address);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -224,8 +224,8 @@ add_address_row (CEPageIP6 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "prefix", widget);
gtk_entry_set_text (GTK_ENTRY (widget), network);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -233,8 +233,8 @@ add_address_row (CEPageIP6 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_address_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_address_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "gateway", widget);
gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : "");
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -244,7 +244,7 @@ add_address_row (CEPageIP6 *self,
delete_button = gtk_button_new ();
gtk_widget_set_sensitive (delete_button, FALSE);
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
- g_signal_connect_swapped (delete_button, "clicked", G_CALLBACK (remove_row), self);
+ g_signal_connect_object (delete_button, "clicked", G_CALLBACK (remove_row), self, G_CONNECT_SWAPPED);
image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Address"));
gtk_button_set_image (GTK_BUTTON (delete_button), image);
@@ -312,7 +312,7 @@ add_dns_section (CEPageIP6 *self)
gint i;
gtk_switch_set_active (self->auto_dns_switch, !nm_setting_ip_config_get_ignore_auto_dns
(self->setting));
- g_signal_connect_swapped (self->auto_dns_switch, "notify::active", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->auto_dns_switch, "notify::active", G_CALLBACK (ce_page_changed),
self, G_CONNECT_SWAPPED);
string = g_string_new ("");
@@ -330,7 +330,7 @@ add_dns_section (CEPageIP6 *self)
gtk_entry_set_text (self->dns_entry, string->str);
- g_signal_connect_swapped (self->dns_entry, "notify::text", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->dns_entry, "notify::text", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
g_string_free (string, TRUE);
}
@@ -354,8 +354,8 @@ add_route_row (CEPageIP6 *self,
gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "address", widget);
gtk_entry_set_text (GTK_ENTRY (widget), address);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -363,8 +363,8 @@ add_route_row (CEPageIP6 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "prefix", widget);
gtk_entry_set_text (GTK_ENTRY (widget), prefix ? prefix : "");
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -372,8 +372,8 @@ add_route_row (CEPageIP6 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "gateway", widget);
gtk_entry_set_text (GTK_ENTRY (widget), gateway);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
@@ -381,8 +381,8 @@ add_route_row (CEPageIP6 *self,
gtk_container_add (GTK_CONTAINER (row_box), widget);
widget = gtk_entry_new ();
- g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), self);
- g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self);
+ g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "metric", widget);
gtk_entry_set_text (GTK_ENTRY (widget), metric ? metric : "");
gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
@@ -393,7 +393,7 @@ add_route_row (CEPageIP6 *self,
delete_button = gtk_button_new ();
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
- g_signal_connect_swapped (delete_button, "clicked", G_CALLBACK (remove_row), self);
+ g_signal_connect_object (delete_button, "clicked", G_CALLBACK (remove_row), self, G_CONNECT_SWAPPED);
image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Route"));
gtk_button_set_image (GTK_BUTTON (delete_button), image);
@@ -447,7 +447,7 @@ add_routes_box (CEPageIP6 *self)
gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
gtk_container_add (GTK_CONTAINER (self->routes_box), list);
gtk_switch_set_active (self->auto_routes_switch, !nm_setting_ip_config_get_ignore_auto_routes
(self->setting));
- g_signal_connect_swapped (self->auto_routes_switch, "notify::active", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->auto_routes_switch, "notify::active", G_CALLBACK (ce_page_changed),
self, G_CONNECT_SWAPPED);
for (i = 0; i < nm_setting_ip_config_get_num_routes (self->setting); i++) {
NMIPRoute *route;
@@ -479,12 +479,12 @@ connect_ip6_page (CEPageIP6 *self)
add_routes_box (self);
str_method = nm_setting_ip_config_get_method (self->setting);
- g_signal_connect_swapped (self->disabled_radio, "notify::active", G_CALLBACK (ce_page_changed),
self);
+ g_signal_connect_object (self->disabled_radio, "notify::active", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
g_object_bind_property (self->disabled_radio, "active",
self->content_box, "sensitive",
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
- g_signal_connect_swapped (self->shared_radio, "notify::active", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->shared_radio, "notify::active", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
g_object_bind_property (self->shared_radio, "active",
self->content_box, "sensitive",
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
@@ -504,14 +504,13 @@ connect_ip6_page (CEPageIP6 *self)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->never_default_check),
nm_setting_ip_config_get_never_default (self->setting));
- g_signal_connect_swapped (self->never_default_check, "toggled", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->never_default_check, "toggled", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
-
- g_signal_connect_swapped (self->automatic_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->dhcp_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->local_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->manual_radio, "toggled", G_CALLBACK (method_changed), self);
- g_signal_connect_swapped (self->disabled_radio, "toggled", G_CALLBACK (method_changed), self);
+ g_signal_connect_object (self->automatic_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->dhcp_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->local_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->manual_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->disabled_radio, "toggled", G_CALLBACK (method_changed), self,
G_CONNECT_SWAPPED);
switch (method) {
case IP6_METHOD_AUTO:
diff --git a/panels/network/connection-editor/ce-page-security.c
b/panels/network/connection-editor/ce-page-security.c
index b33e16470..717796b77 100644
--- a/panels/network/connection-editor/ce-page-security.c
+++ b/panels/network/connection-editor/ce-page-security.c
@@ -377,8 +377,8 @@ finish_setup (CEPageSecurity *self)
gtk_combo_box_set_active (self->security_combo, active < 0 ? 0 : (guint32) active);
security_combo_changed (self);
- g_signal_connect_swapped (self->security_combo, "changed",
- G_CALLBACK (security_combo_changed), self);
+ g_signal_connect_object (self->security_combo, "changed",
+ G_CALLBACK (security_combo_changed), self, G_CONNECT_SWAPPED);
}
static void
diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c
index c1acce503..9ad0a26f2 100644
--- a/panels/network/connection-editor/ce-page-vpn.c
+++ b/panels/network/connection-editor/ce-page-vpn.c
@@ -114,7 +114,7 @@ load_vpn_plugin (CEPageVpn *self)
gtk_box_pack_start (GTK_BOX (self), ui_widget, TRUE, TRUE, 0);
gtk_widget_show_all (ui_widget);
- g_signal_connect_swapped (self->editor, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->editor, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
}
static void
@@ -124,7 +124,7 @@ connect_vpn_page (CEPageVpn *self)
name = nm_setting_connection_get_id (self->setting_connection);
gtk_entry_set_text (self->name_entry, name);
- g_signal_connect_swapped (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
}
static void
diff --git a/panels/network/connection-editor/ce-page-wifi.c b/panels/network/connection-editor/ce-page-wifi.c
index 784c7b8d3..7246170b7 100644
--- a/panels/network/connection-editor/ce-page-wifi.c
+++ b/panels/network/connection-editor/ce-page-wifi.c
@@ -67,7 +67,7 @@ connect_wifi_page (CEPageWifi *self)
utf8_ssid = g_strdup ("");
gtk_entry_set_text (self->ssid_entry, utf8_ssid);
- g_signal_connect_swapped (self->ssid_entry, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->ssid_entry, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
bssid_array = g_ptr_array_new ();
for (i = 0; i < nm_setting_wireless_get_num_seen_bssids (self->setting); i++) {
@@ -78,18 +78,18 @@ connect_wifi_page (CEPageWifi *self)
s_bssid_str = nm_setting_wireless_get_bssid (self->setting);
ce_page_setup_mac_combo (self->bssid_combo, s_bssid_str, bssid_list);
g_strfreev (bssid_list);
- g_signal_connect_swapped (self->bssid_combo, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->bssid_combo, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
mac_list = ce_page_get_mac_list (self->client, NM_TYPE_DEVICE_WIFI,
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS);
s_mac_str = nm_setting_wireless_get_mac_address (self->setting);
ce_page_setup_mac_combo (self->mac_combo, s_mac_str, mac_list);
g_strfreev (mac_list);
- g_signal_connect_swapped (self->mac_combo, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->mac_combo, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
cloned_mac = nm_setting_wireless_get_cloned_mac_address (self->setting);
ce_page_setup_cloned_mac_combo (self->cloned_mac_combo, cloned_mac);
- g_signal_connect_swapped (self->cloned_mac_combo, "changed", G_CALLBACK (ce_page_changed), self);
+ g_signal_connect_object (self->cloned_mac_combo, "changed", G_CALLBACK (ce_page_changed), self,
G_CONNECT_SWAPPED);
}
static void
diff --git a/panels/network/connection-editor/net-connection-editor.c
b/panels/network/connection-editor/net-connection-editor.c
index 619e6c8e5..b231caf53 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -72,7 +72,6 @@ struct _NetConnectionEditor
GSList *initializing_pages;
GSList *pages;
- guint permission_id;
NMClientPermissionResult can_modify;
gboolean title_set;
@@ -198,8 +197,6 @@ net_connection_editor_finalize (GObject *object)
for (l = self->pages; l != NULL; l = l->next)
g_signal_handlers_disconnect_by_func (l->data, page_changed, self);
- if (self->permission_id > 0 && self->client)
- g_signal_handler_disconnect (self->client, self->permission_id);
g_clear_object (&self->connection);
g_clear_object (&self->orig_connection);
g_clear_object (&self->parent_window);
@@ -491,8 +488,8 @@ add_page (NetConnectionEditor *self, CEPage *page)
self->initializing_pages = g_slist_append (self->initializing_pages, page);
- g_signal_connect_swapped (page, "changed", G_CALLBACK (page_changed), self);
- g_signal_connect_swapped (page, "initialized", G_CALLBACK (page_initialized), self);
+ g_signal_connect_object (page, "changed", G_CALLBACK (page_changed), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (page, "initialized", G_CALLBACK (page_initialized), self,
G_CONNECT_SWAPPED);
}
static void
@@ -645,7 +642,7 @@ vpn_import_complete (NMConnection *connection, gpointer user_data)
}
static void
-vpn_type_activated (GtkListBox *list, GtkWidget *row, NetConnectionEditor *self)
+vpn_type_activated (NetConnectionEditor *self, GtkWidget *row)
{
const char *service_name = g_object_get_data (G_OBJECT (row), "service_name");
NMConnection *connection;
@@ -746,8 +743,8 @@ select_vpn_type (NetConnectionEditor *self, GtkListBox *list)
g_object_set_data (G_OBJECT (row), "service_name", "import");
gtk_container_add (GTK_CONTAINER (list), row);
- g_signal_connect (list, "row-activated",
- G_CALLBACK (vpn_type_activated), self);
+ g_signal_connect_object (list, "row-activated",
+ G_CALLBACK (vpn_type_activated), self, G_CONNECT_SWAPPED);
}
static void
@@ -773,10 +770,9 @@ net_connection_editor_add_connection (NetConnectionEditor *self)
}
static void
-permission_changed (NMClient *client,
+permission_changed (NetConnectionEditor *self,
NMClientPermission permission,
- NMClientPermissionResult result,
- NetConnectionEditor *self)
+ NMClientPermissionResult result)
{
if (permission != NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM)
return;
@@ -815,8 +811,8 @@ net_connection_editor_new (GtkWindow *parent_window,
self->client = g_object_ref (client);
self->can_modify = nm_client_get_permission_result (client,
NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM);
- self->permission_id = g_signal_connect (self->client, "permission-changed",
- G_CALLBACK (permission_changed), self);
+ g_signal_connect_object (self->client, "permission-changed",
+ G_CALLBACK (permission_changed), self, G_CONNECT_SWAPPED);
if (connection)
net_connection_editor_set_connection (self, connection);
diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c
index 704a354da..95b04917f 100644
--- a/panels/network/net-device-ethernet.c
+++ b/panels/network/net-device-ethernet.c
@@ -212,7 +212,6 @@ static void
editor_done (NetDeviceEthernet *self)
{
device_ethernet_refresh_ui (self);
- g_object_unref (self);
}
static void
@@ -231,7 +230,7 @@ show_details (NetDeviceEthernet *self, GtkButton *button, const gchar *title)
editor = net_connection_editor_new (GTK_WINDOW (window), connection, self->device, NULL,
self->client);
if (title)
net_connection_editor_set_title (editor, title);
- g_signal_connect_swapped (editor, "done", G_CALLBACK (editor_done), g_object_ref (self));
+ g_signal_connect_object (editor, "done", G_CALLBACK (editor_done), self, G_CONNECT_SWAPPED);
net_connection_editor_run (editor);
}
@@ -319,7 +318,7 @@ add_row (NetDeviceEthernet *self, NMConnection *connection)
gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
g_object_set_data (G_OBJECT (widget), "edit", widget);
g_object_set_data (G_OBJECT (widget), "row", row);
- g_signal_connect_swapped (widget, "clicked", G_CALLBACK (show_details_for_row), self);
+ g_signal_connect_object (widget, "clicked", G_CALLBACK (show_details_for_row), self,
G_CONNECT_SWAPPED);
gtk_widget_show_all (row);
@@ -418,7 +417,7 @@ add_profile_button_clicked_cb (NetDeviceEthernet *self)
window = gtk_widget_get_toplevel (GTK_WIDGET (self));
editor = net_connection_editor_new (GTK_WINDOW (window), connection, self->device, NULL,
self->client);
- g_signal_connect_swapped (editor, "done", G_CALLBACK (editor_done), g_object_ref (self));
+ g_signal_connect_object (editor, "done", G_CALLBACK (editor_done), self, G_CONNECT_SWAPPED);
net_connection_editor_run (editor);
}
diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
index 1d9eba2f1..0dd2ee305 100644
--- a/panels/network/net-device-mobile.c
+++ b/panels/network/net-device-mobile.c
@@ -72,7 +72,6 @@ struct _NetDeviceMobile
/* New MM >= 0.7 support */
MMObject *mm_object;
- guint operator_name_updated;
NMAMobileProvidersDatabase *mpd;
};
@@ -624,10 +623,11 @@ device_mobile_device_got_modem_manager_gsm_cb (GObject *source_object,
}
/* Setup value updates */
- g_signal_connect_swapped (self->gsm_proxy,
- "g-signal",
- G_CALLBACK (device_mobile_gsm_signal_cb),
- self);
+ g_signal_connect_object (self->gsm_proxy,
+ "g-signal",
+ G_CALLBACK (device_mobile_gsm_signal_cb),
+ self,
+ G_CONNECT_SWAPPED);
/* Load initial value */
g_dbus_proxy_call (self->gsm_proxy,
@@ -720,12 +720,6 @@ net_device_mobile_dispose (GObject *object)
g_clear_object (&self->cancellable);
g_clear_object (&self->gsm_proxy);
g_clear_object (&self->cdma_proxy);
-
- if (self->operator_name_updated) {
- g_assert (self->mm_object != NULL);
- g_signal_handler_disconnect (mm_object_peek_modem_3gpp (self->mm_object),
self->operator_name_updated);
- self->operator_name_updated = 0;
- }
g_clear_object (&self->mm_object);
g_clear_object (&self->mpd);
@@ -803,11 +797,11 @@ net_device_mobile_new (NMClient *client, NMDevice *device, GDBusObject *modem)
/* Follow changes in operator name and load initial values */
modem_3gpp = mm_object_peek_modem_3gpp (self->mm_object);
if (modem_3gpp != NULL) {
- g_assert (self->operator_name_updated == 0);
- self->operator_name_updated = g_signal_connect_swapped (modem_3gpp,
- "notify::operator-name",
- G_CALLBACK
(operator_name_updated),
- self);
+ g_signal_connect_object (modem_3gpp,
+ "notify::operator-name",
+ G_CALLBACK (operator_name_updated),
+ self,
+ G_CONNECT_SWAPPED);
device_mobile_refresh_operator_name (self);
}
}
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 8bcc83c95..860c15caa 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -800,8 +800,8 @@ hotspot_off_switch_changed_cb (NetDeviceWifi *self)
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Stop Hotspot"), GTK_RESPONSE_OK,
NULL);
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (stop_hotspot_response_cb), self);
+ g_signal_connect_object (dialog, "response",
+ G_CALLBACK (stop_hotspot_response_cb), self, G_CONNECT_SWAPPED);
gtk_window_present (GTK_WINDOW (dialog));
}
@@ -1073,11 +1073,11 @@ history_button_clicked_cb (NetDeviceWifi *self)
gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
gtk_window_set_titlebar (GTK_WINDOW (dialog), header);
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy), dialog);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
- g_signal_connect_swapped (dialog, "delete-event",
- G_CALLBACK (gtk_widget_destroy), dialog);
+ g_signal_connect (dialog, "delete-event",
+ G_CALLBACK (gtk_widget_destroy), NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
@@ -1120,18 +1120,22 @@ history_button_clicked_cb (NetDeviceWifi *self)
g_object_set_data (G_OBJECT (list), "forget", forget);
g_object_set_data (G_OBJECT (list), "net", self);
- g_signal_connect_swapped (list, "add",
- G_CALLBACK (on_connection_list_row_added_cb),
- self);
- g_signal_connect_swapped (list, "remove",
- G_CALLBACK (on_connection_list_row_removed_cb),
- self);
- g_signal_connect_swapped (list, "row-activated",
- G_CALLBACK (on_connection_list_row_activated_cb),
- self);
- g_signal_connect_swapped (list, "configure",
- G_CALLBACK (show_details_for_row),
- self);
+ g_signal_connect_object (list, "add",
+ G_CALLBACK (on_connection_list_row_added_cb),
+ self,
+ G_CONNECT_SWAPPED);
+ g_signal_connect_object (list, "remove",
+ G_CALLBACK (on_connection_list_row_removed_cb),
+ self,
+ G_CONNECT_SWAPPED);
+ g_signal_connect_object (list, "row-activated",
+ G_CALLBACK (on_connection_list_row_activated_cb),
+ self,
+ G_CONNECT_SWAPPED);
+ g_signal_connect_object (list, "configure",
+ G_CALLBACK (show_details_for_row),
+ self,
+ G_CONNECT_SWAPPED);
list_rows = gtk_container_get_children (GTK_CONTAINER (list));
while (list_rows)
@@ -1254,11 +1258,10 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device)
gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL);
gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)ap_sort, NULL, NULL);
- g_signal_connect_swapped (list, "row-activated",
- G_CALLBACK (ap_activated), self);
- g_signal_connect_swapped (list, "configure",
- G_CALLBACK (show_details_for_row),
- self);
+ g_signal_connect_object (list, "row-activated",
+ G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (list, "configure",
+ G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED);
/* only enable the button if the user can create a hotspot */
perm = nm_client_get_permission_result (client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
diff --git a/panels/network/net-proxy.c b/panels/network/net-proxy.c
index 9d044d69d..9e3c3de15 100644
--- a/panels/network/net-proxy.c
+++ b/panels/network/net-proxy.c
@@ -290,10 +290,11 @@ net_proxy_init (NetProxy *self)
gtk_widget_init_template (GTK_WIDGET (self));
self->settings = g_settings_new ("org.gnome.system.proxy");
- g_signal_connect_swapped (self->settings,
- "changed",
- G_CALLBACK (settings_changed_cb),
- self);
+ g_signal_connect_object (self->settings,
+ "changed",
+ G_CALLBACK (settings_changed_cb),
+ self,
+ G_CONNECT_SWAPPED);
/* actions */
value = g_settings_get_enum (self->settings, "mode");
@@ -362,21 +363,23 @@ net_proxy_init (NetProxy *self)
panel_proxy_mode_setup_widgets (self, value);
panel_update_status_label (self, value);
- g_signal_connect_swapped (self->none_radio, "toggled", G_CALLBACK
(panel_proxy_mode_radio_changed_cb), self);
- g_signal_connect_swapped (self->manual_radio, "toggled", G_CALLBACK
(panel_proxy_mode_radio_changed_cb), self);
- g_signal_connect_swapped (self->automatic_radio, "toggled", G_CALLBACK
(panel_proxy_mode_radio_changed_cb), self);
+ g_signal_connect_object (self->none_radio, "toggled", G_CALLBACK
(panel_proxy_mode_radio_changed_cb), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->manual_radio, "toggled", G_CALLBACK
(panel_proxy_mode_radio_changed_cb), self, G_CONNECT_SWAPPED);
+ g_signal_connect_object (self->automatic_radio, "toggled", G_CALLBACK
(panel_proxy_mode_radio_changed_cb), self, G_CONNECT_SWAPPED);
/* show dialog button */
- g_signal_connect_swapped (self->dialog_button,
- "clicked",
- G_CALLBACK (show_dialog_cb),
- self);
+ g_signal_connect_object (self->dialog_button,
+ "clicked",
+ G_CALLBACK (show_dialog_cb),
+ self,
+ G_CONNECT_SWAPPED);
/* prevent the dialog from being destroyed */
- g_signal_connect (self->dialog,
- "delete-event",
- G_CALLBACK (gtk_widget_hide_on_delete),
- self->dialog);
+ g_signal_connect_object (self->dialog,
+ "delete-event",
+ G_CALLBACK (gtk_widget_hide_on_delete),
+ self->dialog,
+ G_CONNECT_SWAPPED);
}
NetProxy *
diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c
index 97925b80f..b0cebdedb 100644
--- a/panels/network/net-vpn.c
+++ b/panels/network/net-vpn.c
@@ -89,9 +89,9 @@ nm_device_refresh_vpn_ui (NetVpn *self)
auuid = nm_active_connection_get_uuid (a);
if (NM_IS_VPN_CONNECTION (a) && strcmp (auuid, uuid) == 0) {
self->active_connection = g_object_ref (a);
- g_signal_connect_swapped (a, "notify::vpn-state",
- G_CALLBACK (nm_device_refresh_vpn_ui),
- self);
+ g_signal_connect_object (a, "notify::vpn-state",
+ G_CALLBACK (nm_device_refresh_vpn_ui),
+ self, G_CONNECT_SWAPPED);
state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (a));
break;
}
@@ -205,11 +205,11 @@ net_vpn_init (NetVpn *self)
{
gtk_widget_init_template (GTK_WIDGET (self));
- g_signal_connect_swapped (self->device_off_switch, "notify::active",
- G_CALLBACK (device_off_toggled), self);
+ g_signal_connect_object (self->device_off_switch, "notify::active",
+ G_CALLBACK (device_off_toggled), self, G_CONNECT_SWAPPED);
- g_signal_connect_swapped (self->options_button, "clicked",
- G_CALLBACK (edit_connection), self);
+ g_signal_connect_object (self->options_button, "clicked",
+ G_CALLBACK (edit_connection), self, G_CONNECT_SWAPPED);
}
NetVpn *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
