Skip to content

Fix segfault when loading accels config #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −16
Open

Fix segfault when loading accels config #702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions xed/xed-app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,20 @@ setup_theme_extensions (void)
theme_changed (settings, NULL, NULL);
}

static void
load_accels (void)
{
gchar *filename;

filename = g_build_filename (xed_dirs_get_user_config_dir (), "accels", NULL);
if (filename != NULL)
{
xed_debug_message (DEBUG_APP, "Loading keybindings from %s\n", filename);
gtk_accel_map_load (filename);
g_free (filename);
}
}

static void
xed_app_startup (GApplication *application)
{
Expand All @@ -282,6 +296,7 @@ xed_app_startup (GApplication *application)
GtkCssProvider *provider;

G_APPLICATION_CLASS (xed_app_parent_class)->startup (application);
load_accels ();

/* Setup debugging */
xed_debug_init ();
Expand Down Expand Up @@ -893,20 +908,6 @@ xed_app_class_init (XedAppClass *klass)
app_class->shutdown = xed_app_shutdown;
}

static void
load_accels (void)
{
gchar *filename;

filename = g_build_filename (xed_dirs_get_user_config_dir (), "accels", NULL);
if (filename != NULL)
{
xed_debug_message (DEBUG_APP, "Loading keybindings from %s\n", filename);
gtk_accel_map_load (filename);
g_free (filename);
}
}

static void
load_page_setup (XedApp *app)
{
Expand Down Expand Up @@ -994,8 +995,6 @@ xed_app_init (XedApp *app)
g_application_add_option_group (G_APPLICATION (app), g_irepository_get_option_group ());
#endif

load_accels ();

setup_actions (app);
}

Expand Down