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

background: Connect signals with g_signal_connect_object in swapped form

Browse source
This commit is contained in:
Robert Ancell 2019-11-22 10:09:54 +13:00
parent 1862ec50e4
commit 3eb0aaec28
4 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
panels/background/bg-pictures-source.c
View file

@ -751,13 +751,11 @@ file_added (GFile *file,
} }
static void static void
files_changed_cb (GFileMonitor *monitor, files_changed_cb (BgPicturesSource *self,
GFile *file, GFile *file,
GFile *other_file, GFile *other_file,
GFileMonitorEvent event_type, GFileMonitorEvent event_type)
gpointer user_data)
{ {
BgPicturesSource *self = BG_PICTURES_SOURCE (user_data);
g_autofree gchar *uri = NULL; g_autofree gchar *uri = NULL;
switch (event_type) switch (event_type)
@ -798,10 +796,10 @@ monitor_path (BgPicturesSource *self,
NULL); NULL);
if (monitor) if (monitor)
g_signal_connect (monitor, g_signal_connect_object (monitor,
"changed", "changed",
G_CALLBACK (files_changed_cb), G_CALLBACK (files_changed_cb),
self); self, G_CONNECT_SWAPPED);
return monitor; return monitor;
} }
@ -840,7 +838,7 @@ bg_pictures_source_init (BgPicturesSource *self)
self->cache_dir_monitor = monitor_path (self, cache_path); self->cache_dir_monitor = monitor_path (self, cache_path);
self->grl_miner = cc_background_grilo_miner_new (); self->grl_miner = cc_background_grilo_miner_new ();
g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); g_signal_connect_object (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self, G_CONNECT_SWAPPED);
cc_background_grilo_miner_start (self->grl_miner); cc_background_grilo_miner_start (self->grl_miner);
} }

7
panels/background/bg-recent-source.c
View file

@ -171,11 +171,10 @@ query_info_finished_cb (GObject *source,
} }
static void static void
on_file_changed_cb (GFileMonitor *monitor, on_file_changed_cb (BgRecentSource *self,
GFile *file, GFile *file,
GFile *other_file, GFile *other_file,
GFileMonitorEvent event_type, GFileMonitorEvent event_type)
BgRecentSource *self)
{ {
g_autofree gchar *uri = NULL; g_autofree gchar *uri = NULL;
@ -322,7 +321,7 @@ load_backgrounds (BgRecentSource *self)
return; return;
} }
g_signal_connect (self->monitor, "changed", G_CALLBACK (on_file_changed_cb), self); g_signal_connect_object (self->monitor, "changed", G_CALLBACK (on_file_changed_cb), self, G_CONNECT_SWAPPED);
} }
/* Callbacks */ /* Callbacks */

9
panels/background/bg-wallpapers-source.c
View file

@ -62,9 +62,8 @@ list_load_cb (GObject *source_object,
} }
static void static void
item_added (CcBackgroundXml *xml, item_added (BgWallpapersSource *self,
CcBackgroundItem *item, CcBackgroundItem *item)
BgWallpapersSource *self)
{ {
load_wallpapers (NULL, item, self); load_wallpapers (NULL, item, self);
} }
@ -97,8 +96,8 @@ bg_wallpapers_source_constructed (GObject *object)
G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->constructed (object); G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->constructed (object);
g_signal_connect (G_OBJECT (self->xml), "added", g_signal_connect_object (G_OBJECT (self->xml), "added",
G_CALLBACK (item_added), self); G_CALLBACK (item_added), self, G_CONNECT_SWAPPED);
/* Try adding the default background first */ /* Try adding the default background first */
load_default_bg (self); load_default_bg (self);

6
panels/background/cc-background-panel.c
View file

@ -282,9 +282,7 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
} }
static void static void
on_settings_changed (GSettings *settings, on_settings_changed (CcBackgroundPanel *panel)
gchar *key,
CcBackgroundPanel *panel)
{ {
reload_current_bg (panel); reload_current_bg (panel);
update_preview (panel); update_preview (panel);
@ -312,5 +310,5 @@ cc_background_panel_init (CcBackgroundPanel *panel)
update_preview (panel); update_preview (panel);
/* Background settings */ /* Background settings */
g_signal_connect (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel); g_signal_connect_object (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel, G_CONNECT_SWAPPED);
} }