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

shell: Make singletons owned by ShellGlobal

Browse Source 
This means also means they will be cleaned up when disposing
ShellGlobal, which will then mean signals tied to the GObject lifetime
will be disconnected.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6536
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2722>
This commit is contained in:
Jonas Ådahl
2023-03-24 10:16:07 +01:00
parent 517482b562
commit ff705fa902
7 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/shell-global.c
View File

@ -39,6 +39,8 @@
#include "shell-global-private.h"
#include "shell-perf-log.h"
#include "shell-window-tracker.h"
#include "shell-app-usage.h"
#include "shell-app-cache-private.h"
#include "shell-wm.h"
#include "shell-util.h"
#include "st.h"
@ -72,6 +74,11 @@ struct _ShellGlobal {
GFile *userdatadir_path;
GFile *runtime_state_path;
ShellWindowTracker *window_tracker;
ShellAppSystem *app_system;
ShellAppCache *app_cache;
ShellAppUsage *app_usage;
StFocusManager *focus_manager;
guint work_count;
@ -479,6 +486,11 @@ shell_global_finalize (GObject *object)
g_clear_object (&global->js_context);
g_object_unref (global->settings);
g_clear_object (&global->window_tracker);
g_clear_object (&global->app_system);
g_clear_object (&global->app_cache);
g_clear_object (&global->app_usage);
the_object = NULL;
g_cancellable_cancel (global->switcheroo_cancellable);
@ -720,6 +732,7 @@ _shell_global_init (const char *first_property_name,
ShellGlobal *
shell_global_get (void)
{
g_return_val_if_fail (the_object, NULL);
return the_object;
}
@ -1915,3 +1928,63 @@ _shell_global_notify_shutdown (ShellGlobal *global)
{
g_signal_emit (global, shell_global_signals[SHUTDOWN], 0);
}
/**
* shell_global_get_window_tracker:
*
* Gets window tracker.
*
* Return value: (transfer none): the window tracker
*/
ShellWindowTracker *
shell_global_get_window_tracker (ShellGlobal *global)
{
if (!global->window_tracker)
global->window_tracker = g_object_new (SHELL_TYPE_WINDOW_TRACKER, NULL);
return global->window_tracker;
}
/**
* shell_global_get_app_system:
*
* Gets app system.
*
* Return value: (transfer none): the app system
*/
ShellAppSystem *
shell_global_get_app_system (ShellGlobal *global)
{
if (!global->app_system)
global->app_system = g_object_new (SHELL_TYPE_APP_SYSTEM, NULL);
return global->app_system;
}
/**
* shell_global_get_app_cache:
*
* Gets app cache.
*
* Return value: (transfer none): the app cache
*/
ShellAppCache *
shell_global_get_app_cache (ShellGlobal *global)
{
if (!global->app_cache)
global->app_cache = g_object_new (SHELL_TYPE_APP_CACHE, NULL);
return global->app_cache;
}
/**
* shell_global_get_app_usage:
*
* Gets app usage.
*
* Return value: (transfer none): the app usage
*/
ShellAppUsage *
shell_global_get_app_usage (ShellGlobal *global)
{
if (!global->app_usage)
global->app_usage = g_object_new (SHELL_TYPE_APP_USAGE, NULL);
return global->app_usage;
}