aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog17
-rw-r--r--shell/main.c3
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 ();