[gedit/wip/3.14-osx: 21/34] [osx] Remove loading of overridden accels
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/3.14-osx: 21/34] [osx] Remove loading of overridden accels
- Date: Sat, 23 Aug 2014 11:56:18 +0000 (UTC)
commit 1bd1d37d0b78074d128abbabb6555c8626d611fd
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Fri Aug 22 10:25:00 2014 +0200
[osx] Remove loading of overridden accels
data/Makefile.am | 1 -
data/osx.accels | 44 --------------------------------------------
gedit/gedit-app-osx.c | 20 --------------------
3 files changed, 0 insertions(+), 65 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index bf32686..d0caf57 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -36,7 +36,6 @@ dist_data_convert_DATA = data/gedit.convert
if OS_OSX
data_geditdatadir = $(datadir)/gedit
dist_data_geditdata_DATA = \
- data/osx.accels \
data/osx.css
endif
diff --git a/gedit/gedit-app-osx.c b/gedit/gedit-app-osx.c
index f3c216a..09311da 100644
--- a/gedit/gedit-app-osx.c
+++ b/gedit/gedit-app-osx.c
@@ -133,24 +133,6 @@ gedit_app_osx_set_window_title_impl (GeditApp *app,
}
static void
-load_accels (void)
-{
- gchar *filename;
-
- filename = g_build_filename (gedit_dirs_get_gedit_data_dir (),
- "osx.accels",
- NULL);
-
- if (filename != NULL)
- {
- gedit_debug_message (DEBUG_APP, "Loading accels from %s\n", filename);
-
- gtk_accel_map_load (filename);
- g_free (filename);
- }
-}
-
-static void
load_keybindings (void)
{
gchar *filename;
@@ -195,8 +177,6 @@ gedit_app_osx_startup (GApplication *application)
{
G_APPLICATION_CLASS (gedit_app_osx_parent_class)->startup (application);
- /* Load the osx specific accel overrides */
- load_accels ();
load_keybindings ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]