diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-12-11 02:30:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-12-11 02:30:29 +0800 |
| commit | d158af8cdfa6e4bf85c1e74769e8d61bc469494c (patch) | |
| tree | ba55b970ae3a23e5ade4edbddc4eb8dcaf3033bd /shell | |
| parent | dc0d0ee010319425b19d8d8d493f0bc489d5fd07 (diff) | |
| download | gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.gz gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.zst gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.zip | |
Merge revisions 36811:36865 from trunk.
svn path=/branches/kill-bonobo/; revision=36867
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 17 | ||||
| -rw-r--r-- | shell/main.c | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 307de5bf79..05f0b2399c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,20 @@ +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 + + * e-shell-window.c (setup_widgets): Don't pass NULL to + gtk_icon_info_get_filename(). + + Fixes a crash if the gnome-settings-daemon is not running. + Observed on SUN Solaris. + 2008-11-07 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #557581 diff --git a/shell/main.c b/shell/main.c index 32efec4bd5..b078320c32 100644 --- a/shell/main.c +++ b/shell/main.c @@ -643,6 +643,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 ()); @@ -677,6 +678,8 @@ main (int argc, char **argv) gtk_main (); + gtk_accel_map_save (e_get_accels_filename ()); + e_icon_factory_shutdown (); g_object_unref (program); gnome_sound_shutdown (); |