2011-10-07 [colin] 3.7.10cvs21

[claws.git] / src / message_search.c

diff --git a/src/message_search.c b/src/message_search.c
index 59646eadccbd7fff0863a88eb7a078e6e0ce7cb2..0fc06cca22d8fdbcd0dff20f53c71c712d93df70 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include "gtk/gtksctree.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -275,7 +274,7 @@ static void message_search_execute(gboolean backward)
        gboolean all_searched = FALSE;
        gchar *body_str;
 
-       body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
+       body_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
        if (!body_str)
                body_str = gtk_editable_get_chars(
                                GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.body_entry))),0,-1);
@@ -391,15 +390,15 @@ static void message_search_next_clicked(GtkButton *button, gpointer data)
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                            gpointer data)
 {
-       if (event && (event->keyval == GDK_Escape)) {
+       if (event && (event->keyval == GDK_KEY_Escape)) {
                gtk_widget_hide(search_window.window);
        }
 
-       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+       if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
                message_search_execute(FALSE);
        }
 
-       if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+       if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
                if (search_window.body_entry_has_focus) {
                        combobox_set_value_from_arrow_key(
                                        GTK_COMBO_BOX(search_window.body_entry),