aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c9
-rw-r--r--configure.in18
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-folder-view.c9
6 files changed, 53 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f085552be..9cf133c1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12 Bastien Nocera <hadess@hadess.net>
+
+ * configure.in: Detect the X11/XF86keysym.h header, and
+ enable multimedia keys if available (Closes: #442631)
+
2007-06-07 Duarte Loreto <happyguy_pt@hotmail.com>
* configure.in: Added help/quickref/pt/Makefile for Portuguese
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a6c54e6784..865e6dea5d 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-12 Bastien Nocera <hadess@hadess.net>
+
+ * e-msg-composer.c: (composer_key_pressed):
+ Add support for the XF86Send multimedia key
+ (Closes: #442631)
+
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d142c08edb..ac355bbffa 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3511,6 +3511,15 @@ composer_key_pressed (EMsgComposer *composer, GdkEventKey *event, void *user_dat
GtkWidget *widget;
EMsgComposerPrivate *p = composer->priv;
widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (p->hdrs));
+
+#ifdef HAVE_XFREE
+ if (event->keyval == XF86XK_Send) {
+ g_signal_emit (GTK_OBJECT (data), signals[SEND], 0);
+ g_signal_stop_emission_by_name (composer, "key-press-event");
+ return TRUE;
+ }
+#endif /* HAVE_XFREE */
+
if (event->keyval == GDK_Escape) {
do_exit (composer);
g_signal_stop_emission_by_name (composer, "key-press-event");
diff --git a/configure.in b/configure.in
index 4e8f3d822e..31388c41b2 100644
--- a/configure.in
+++ b/configure.in
@@ -416,6 +416,24 @@ AC_SUBST(A11Y_CFLAGS)
AC_SUBST(A11Y_LIBS)
dnl **************************************************
+dnl * XF86 multimedia keys support
+dnl **************************************************
+have_xfree=no
+AC_COMPILE_IFELSE([
+ #include <X11/XF86keysym.h>
+ int main(int argc,char **argv) {
+ return 0;
+ }
+ ],
+ have_xfree=yes
+)
+AC_MSG_CHECKING(for X11 XFree86 headers)
+AC_MSG_RESULT([$have_xfree])
+if test x"$have_xfree" = "xyes" ; then
+ AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h])
+fi
+
+dnl **************************************************
dnl LDAP support.
dnl **************************************************
if test "$os_win32" != yes; then
diff --git a/mail/ChangeLog b/mail/ChangeLog
index cf5fdeacd9..734bf616df 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-12 Bastien Nocera <hadess@hadess.net>
+
+ * em-folder-view.c: (emfv_list_key_press):
+ Add support for the XF86Reply and XF86MailForward multimedia
+ keys (Closes: #442631)
+
2007-06-09 Matthew Barnes <mbarnes@redhat.com>
* Makefile.am:
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index af075dd436..8861084001 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -2455,6 +2455,15 @@ emfv_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev,
case GDK_ISO_Enter:
em_folder_view_open_selected(emfv);
break;
+#ifdef HAVE_XFREE
+ case XF86XK_Reply:
+ emfv_message_reply(emfv, REPLY_MODE_ALL);
+ break;
+ case XF86XK_MailForward:
+ uids = message_list_get_selected(emfv->list);
+ em_utils_forward_messages (emfv->folder, uids, emfv->folder_uri);
+ break;
+#endif /* HAVE_XFREE */
case '!':
uids = message_list_get_selected(emfv->list);