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

usage: Connect signals with g_signal_connect_object in swapped form

Browse source
This commit is contained in:
Robert Ancell 2019-11-22 11:22:20 +13:00
parent 3e4c1d3822
commit 74eb5d9855
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
panels/usage/cc-usage-panel.c
View file

@ -47,8 +47,7 @@ struct _CcUsagePanel
CC_PANEL_REGISTER (CcUsagePanel, cc_usage_panel) CC_PANEL_REGISTER (CcUsagePanel, cc_usage_panel)
static void static void
purge_after_combo_changed_cb (GtkWidget *widget, purge_after_combo_changed_cb (CcUsagePanel *self)
CcUsagePanel *self)
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model; GtkTreeModel *model;
@ -56,12 +55,12 @@ purge_after_combo_changed_cb (GtkWidget *widget,
gboolean ret; gboolean ret;
/* no selection */ /* no selection */
ret = gtk_combo_box_get_active_iter (GTK_COMBO_BOX(widget), &iter); ret = gtk_combo_box_get_active_iter (self->purge_after_combo, &iter);
if (!ret) if (!ret)
return; return;
/* get entry */ /* get entry */
model = gtk_combo_box_get_model (GTK_COMBO_BOX(widget)); model = gtk_combo_box_get_model (self->purge_after_combo);
gtk_tree_model_get (model, &iter, gtk_tree_model_get (model, &iter,
1, &value, 1, &value,
-1); -1);
@ -202,19 +201,18 @@ cc_usage_panel_finalize (GObject *object)
} }
static void static void
retain_history_combo_changed_cb (GtkWidget *widget, retain_history_combo_changed_cb (CcUsagePanel *self)
CcUsagePanel *self)
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model; GtkTreeModel *model;
gint value; gint value;
gboolean ret; gboolean ret;
ret = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); ret = gtk_combo_box_get_active_iter (self->retain_history_combo, &iter);
if (!ret) if (!ret)
return; return;
model = gtk_combo_box_get_model (GTK_COMBO_BOX(widget)); model = gtk_combo_box_get_model (self->retain_history_combo);
gtk_tree_model_get (model, &iter, gtk_tree_model_get (model, &iter,
1, &value, 1, &value,
-1); -1);
@ -283,10 +281,11 @@ cc_usage_panel_init (CcUsagePanel *self)
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
set_retain_history_value_for_combo (self->retain_history_combo, self); set_retain_history_value_for_combo (self->retain_history_combo, self);
g_signal_connect (self->retain_history_combo, g_signal_connect_object (self->retain_history_combo,
"changed", "changed",
G_CALLBACK (retain_history_combo_changed_cb), G_CALLBACK (retain_history_combo_changed_cb),
self); self,
G_CONNECT_SWAPPED);
g_settings_bind (self->privacy_settings, g_settings_bind (self->privacy_settings,
"remember-recent-files", "remember-recent-files",
@ -303,13 +302,14 @@ cc_usage_panel_init (CcUsagePanel *self)
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
set_purge_after_value_for_combo (self->purge_after_combo, self); set_purge_after_value_for_combo (self->purge_after_combo, self);
g_signal_connect (self->purge_after_combo, g_signal_connect_object (self->purge_after_combo,
"changed", "changed",
G_CALLBACK (purge_after_combo_changed_cb), G_CALLBACK (purge_after_combo_changed_cb),
self); self,
G_CONNECT_SWAPPED);
g_signal_connect_swapped (self->purge_trash_button, "clicked", G_CALLBACK (empty_trash), self); g_signal_connect_object (self->purge_trash_button, "clicked", G_CALLBACK (empty_trash), self, G_CONNECT_SWAPPED);
g_signal_connect_swapped (self->purge_temp_button, "clicked", G_CALLBACK (purge_temp), self); g_signal_connect_object (self->purge_temp_button, "clicked", G_CALLBACK (purge_temp), self, G_CONNECT_SWAPPED);
} }
static void static void