aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-12-10 19:55:08 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-12-10 19:55:08 +0800
commitf9987008ded88dd073458bbf3d80417e032c5e3b (patch)
tree5963b0f05f31b627c1bf15c7b6b6ccdcd9d0c4cf
parent65145381a69be1ac144c6e6dc7c2ab3fdb05d3b7 (diff)
downloadgsoc2013-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
-rw-r--r--e-util/ChangeLog9
-rw-r--r--e-util/e-util.c23
-rw-r--r--e-util/e-util.h1
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/main.c3
5 files changed, 42 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index b06be75c5b..2cc9357c29 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-10 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #563250
+
+ * 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.
+
2008-12-10 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #563870
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 215a494df9..4ab1a39636 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -39,7 +39,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <libgnome/gnome-help.h>
-#include <libgnome/gnome-util.h>
+#include <libgnome/gnome-init.h>
#ifdef G_OS_WIN32
#include <windows.h>
@@ -72,6 +72,27 @@ e_get_user_data_dir (void)
}
/**
+ * e_get_accels_filename:
+ *
+ * Returns the name of the user data file containing custom keyboard
+ * accelerator specifications.
+ *
+ * Returns: filename for accelerator specifications
+ **/
+const gchar *
+e_get_accels_filename (void)
+{
+ static gchar *filename = NULL;
+
+ if (G_UNLIKELY (filename == NULL))
+ filename = g_build_filename (
+ gnome_user_dir_get (),
+ "accels", PACKAGE, NULL);
+
+ return filename;
+}
+
+/**
* e_display_help:
* @parent: a parent #GtkWindow or %NULL
* @link_id: help section to present or %NULL
diff --git a/e-util/e-util.h b/e-util/e-util.h
index a27602848c..e2eafacd75 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -41,6 +41,7 @@ typedef enum {
} EFocus;
const gchar * e_get_user_data_dir (void);
+const gchar * e_get_accels_filename (void);
void e_display_help (GtkWindow *parent,
const gchar *link_id);
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 ();