Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-05-12 18:18:16 (GMT)
committer Ross Burton <rburton@src.gnome.org>2007-05-12 18:18:16 (GMT)
commit20cef31934e4ad2c313a1f1ea76a0916c2f7bb81 (patch)
tree2b1d5fa2ed013677b75f096e7354a07312d26b02
parente201a8febb351c61a8e7714c2dbc83173575c8c6 (diff)
Sync keybindings manually when building without libgnome (#437925).
2007-05-12 Ross Burton <ross@openedhand.com> * shell/main.c: Sync keybindings manually when building without libgnome (#437925). svn path=/trunk/; revision=2452
-rw-r--r--ChangeLog6
-rw-r--r--shell/main.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 843568b..c9757ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-05-12 Ross Burton <ross@openedhand.com>
+ * shell/main.c:
+ Sync keybindings manually when building without libgnome
+ (#437925).
+
+2007-05-12 Ross Burton <ross@openedhand.com>
+
* shell/ev-window.c:
Respect the screen when opening help (#437866).
diff --git a/shell/main.c b/shell/main.c
index 01d6c31..c7005cf 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -307,6 +307,7 @@ main (int argc, char *argv[])
#if WITH_GNOME
GnomeProgram *program;
#else
+ char *accel_filename;
GError *error = NULL;
#endif
@@ -339,6 +340,9 @@ main (int argc, char *argv[])
g_option_context_free (context);
gnome_vfs_init ();
+
+ accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL);
+ gtk_accel_map_load (accel_filename);
#endif
args = arguments_parse ();
@@ -379,6 +383,9 @@ main (int argc, char *argv[])
#if WITH_GNOME
gnome_accelerators_sync ();
+#else
+ gtk_accel_map_save (accel_filename);
+ g_free (accel_filename);
#endif
ev_file_helpers_shutdown ();