brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell/window-tracker: Simplify updating focus-app

Browse Source 
It's a text-book use case for `g_set_object()` …

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3615>
This commit is contained in:
Florian Müllner 2025-01-23 06:40:58 +01:00 committed by Marge Bot
parent e2f4a9b512
commit eae1e8b170
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/shell-window-tracker.c
View File

@ -69,8 +69,6 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = { 0 };
static void shell_window_tracker_finalize (GObject *object); static void shell_window_tracker_finalize (GObject *object);
static void set_focus_app (ShellWindowTracker *tracker,
ShellApp *new_focus_app);
static void on_focus_window_changed (MetaDisplay *display, GParamSpec *spec, ShellWindowTracker *tracker); static void on_focus_window_changed (MetaDisplay *display, GParamSpec *spec, ShellWindowTracker *tracker);
static void track_window (ShellWindowTracker *tracker, MetaWindow *window); static void track_window (ShellWindowTracker *tracker, MetaWindow *window);
@ -501,7 +499,8 @@ update_focus_app (ShellWindowTracker *self)
shell_app_update_app_actions (new_focus_app, new_focus_win); shell_app_update_app_actions (new_focus_app, new_focus_win);
} }
set_focus_app (self, new_focus_app); if (g_set_object (&self->focus_app, new_focus_app))
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_FOCUS_APP]);
g_clear_object (&new_focus_app); g_clear_object (&new_focus_app);
} }
@ -758,24 +757,6 @@ shell_window_tracker_get_app_from_pid (ShellWindowTracker *tracker,
return result; return result;
} }
static void
set_focus_app (ShellWindowTracker *tracker,
ShellApp *new_focus_app)
{
if (new_focus_app == tracker->focus_app)
return;
if (tracker->focus_app != NULL)
g_object_unref (tracker->focus_app);
tracker->focus_app = new_focus_app;
if (tracker->focus_app != NULL)
g_object_ref (tracker->focus_app);
g_object_notify_by_pspec (G_OBJECT (tracker), props[PROP_FOCUS_APP]);
}
static void static void
on_focus_window_changed (MetaDisplay *display, on_focus_window_changed (MetaDisplay *display,
GParamSpec *spec, GParamSpec *spec,