diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2008-12-10 19:55:08 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-12-10 19:55:08 +0800 |
commit | f9987008ded88dd073458bbf3d80417e032c5e3b (patch) | |
tree | 5963b0f05f31b627c1bf15c7b6b6ccdcd9d0c4cf /shell | |
parent | 65145381a69be1ac144c6e6dc7c2ab3fdb05d3b7 (diff) | |
download | gsoc2013-evolution-f9987008ded88dd073458bbf3d80417e032c5e3b.tar.gz gsoc2013-evolution-f9987008ded88dd073458bbf3d80417e032c5e3b.tar.zst gsoc2013-evolution-f9987008ded88dd073458bbf3d80417e032c5e3b.zip |
** Fixes bug #563250
2008-12-10 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #563250
* e-util/e-util.c (e_get_accels_filename):
New function returns the filename where custom keyboard
accelerators are stored. Currently only applies to the
various editor windows in Evolution.
* shell/main.c (main):
Load on startup and save on shutdown, custom keyboard accelerators.
svn path=/trunk/; revision=36864
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ChangeLog | 7 | ||||
-rw-r--r-- | shell/main.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index ef89b297a9..05f0b2399c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-12-10 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #563250 + + * main.c (main): + Load on startup and save on shutdown, custom keyboard accelerators. + 2008-12-08 Jeff Cai <jeff.cai@sun.com> ** Fix for bug #563077 diff --git a/shell/main.c b/shell/main.c index 116f5a1fd3..81155975bc 100644 --- a/shell/main.c +++ b/shell/main.c @@ -661,6 +661,7 @@ main (int argc, char **argv) exit (0); gnome_sound_init ("localhost"); + gtk_accel_map_load (e_get_accels_filename ()); if (!disable_eplugin) { e_plugin_register_type(e_plugin_lib_get_type()); @@ -693,6 +694,8 @@ main (int argc, char **argv) bonobo_main (); + gtk_accel_map_save (e_get_accels_filename ()); + e_icon_factory_shutdown (); g_object_unref (program); gnome_sound_shutdown (); |