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

main: Take over setting signal handlers and changing dir

Browse Source 
MetaContext isn't doing this for us anymore, so do it ourself.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1840>
This commit is contained in:
Jonas Ådahl 2021-07-02 17:20:27 +02:00 committed by Marge Bot
parent 5acab6c300
commit d265dabe03
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main.c
View File

@ -11,6 +11,7 @@
#include <cogl-pango/cogl-pango.h> #include <cogl-pango/cogl-pango.h>
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib-unix.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <girepository.h> #include <girepository.h>
#include <meta/meta-context.h> #include <meta/meta-context.h>
@ -439,6 +440,49 @@ GOptionEntry gnome_shell_options[] = {
{ NULL } { NULL }
}; };
static gboolean
on_sigterm (gpointer user_data)
{
MetaContext *context = META_CONTEXT (user_data);
meta_context_terminate (context);
return G_SOURCE_REMOVE;
}
static void
init_signal_handlers (MetaContext *context)
{
struct sigaction act = { 0 };
sigset_t empty_mask;
sigemptyset (&empty_mask);
act.sa_handler = SIG_IGN;
act.sa_mask = empty_mask;
act.sa_flags = 0;
if (sigaction (SIGPIPE, &act, NULL) < 0)
g_warning ("Failed to register SIGPIPE handler: %s", g_strerror (errno));
#ifdef SIGXFSZ
if (sigaction (SIGXFSZ, &act, NULL) < 0)
g_warning ("Failed to register SIGXFSZ handler: %s", g_strerror (errno));
#endif
g_unix_signal_add (SIGTERM, on_sigterm, context);
}
static void
change_to_home_directory (void)
{
const char *home_dir;
home_dir = g_get_home_dir ();
if (!home_dir)
return;
if (chdir (home_dir) < 0)
g_warning ("Could not change to home directory %s", home_dir);
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -466,6 +510,9 @@ main (int argc, char **argv)
meta_context_set_plugin_gtype (context, gnome_shell_plugin_get_type ()); meta_context_set_plugin_gtype (context, gnome_shell_plugin_get_type ());
meta_context_set_gnome_wm_keybindings (context, GNOME_WM_KEYBINDINGS); meta_context_set_gnome_wm_keybindings (context, GNOME_WM_KEYBINDINGS);
init_signal_handlers (context);
change_to_home_directory ();
if (!meta_context_setup (context, &error)) if (!meta_context_setup (context, &error))
{ {
g_printerr ("Failed to setup: %s", error->message); g_printerr ("Failed to setup: %s", error->message);