diff options
-rw-r--r-- | composer/ChangeLog | 7 | ||||
-rw-r--r-- | composer/e-msg-composer.c | 6 | ||||
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/em-folder-view.c | 4 |
4 files changed, 22 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 865e6dea5d..9e98dc4224 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2007-06-13 Sankar P <psankar@novell.com> + + * e-msg-composer.c: (composer_key_pressed): + Fixes build break. Includes a missing header. + Fixes an invalid variable name. + See #442631 + 2007-06-12 Bastien Nocera <hadess@hadess.net> * e-msg-composer.c: (composer_key_pressed): diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index ac355bbffa..c52783e990 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -126,6 +126,10 @@ #include "Editor.h" #include "listener.h" +#ifdef HAVE_XFREE +#include <X11/XF86keysym.h> +#endif + #define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:" GTKHTML_API_VERSION #define d(x) @@ -3514,7 +3518,7 @@ composer_key_pressed (EMsgComposer *composer, GdkEventKey *event, void *user_dat #ifdef HAVE_XFREE if (event->keyval == XF86XK_Send) { - g_signal_emit (GTK_OBJECT (data), signals[SEND], 0); + g_signal_emit (GTK_OBJECT (user_data), signals[SEND], 0); g_signal_stop_emission_by_name (composer, "key-press-event"); return TRUE; } diff --git a/mail/ChangeLog b/mail/ChangeLog index 734bf616df..5b833199d0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2007-06-13 Sankar P <psankar@novell.com> + + * em-folder-view.c: + Fixes build break by including missing headers. + See #442631 + 2007-06-12 Bastien Nocera <hadess@hadess.net> * em-folder-view.c: (emfv_list_key_press): diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 8861084001..b1a72f3be2 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -115,6 +115,10 @@ #include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */ +#ifdef HAVE_XFREE +#include <X11/XF86keysym.h> +#endif + static void emfv_list_message_selected(MessageList *ml, const char *uid, EMFolderView *emfv); static void emfv_list_built(MessageList *ml, EMFolderView *emfv); static int emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv); |