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

diff --git a/ChangeLog b/ChangeLog
index 843568b1b2db3ac06ebf1ac194b6c5b0fedd83b7..c9757ba85c34f21bf50824bcb96ef36d58eb55a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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:

diff --git a/shell/main.c b/shell/main.c
index 01d6c318a8a9c896e3294767435f6eb2c840a11f..c7005cfe205d4e0061e0f7c72dd97b0b71046c8f 100644 (file)
--- 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 ();