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 94d50e455d7c3b885ab8bc802c6120eb4186a2d8..0fc06cca22d8fdbcd0dff20f53c71c712d93df70 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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>
@@ -81,14 +80,21 @@ static gboolean key_pressed         (GtkWidget      *widget,
                                         gpointer        data);
 
 
-#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {   \
+#if !GTK_CHECK_VERSION(2,14,0)
+/* Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 */
+#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {                                   \
        gboolean in_btn = FALSE;                                                        \
        if (GTK_IS_BUTTON(widget))                                                      \
-               in_btn = GTK_BUTTON(widget)->in_button;                 \
-       gtk_widget_set_sensitive(widget, sensitive);            \
+               in_btn = GTK_BUTTON(widget)->in_button;                                 \
+       gtk_widget_set_sensitive(widget, sensitive);                                    \
        if (GTK_IS_BUTTON(widget))                                                      \
-               GTK_BUTTON(widget)->in_button = in_btn;                 \
+               GTK_BUTTON(widget)->in_button = in_btn;                                 \
 }
+#else
+#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {                                   \
+       gtk_widget_set_sensitive(widget, sensitive);                                    \
+}
+#endif
 
 static void message_show_stop_button(void)
 {
@@ -188,9 +194,9 @@ static void message_search_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), body_entry, TRUE, TRUE, 0);
        g_signal_connect(G_OBJECT(body_entry), "changed",
                         G_CALLBACK(body_changed), NULL);
-       g_signal_connect(G_OBJECT(GTK_BIN(body_entry)->child),
+       g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((body_entry)))),
                         "focus_in_event", G_CALLBACK(body_entry_focus_evt_in), NULL);
-       g_signal_connect(G_OBJECT(GTK_BIN(body_entry)->child),
+       g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((body_entry)))),
                         "focus_out_event", G_CALLBACK(body_entry_focus_evt_out), NULL);
 
        checkbtn_hbox = gtk_hbox_new (FALSE, 8);
@@ -212,23 +218,23 @@ static void message_search_create(void)
        gtkut_stock_button_add_help(confirm_area, &help_btn);
 
        prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
-       GTK_WIDGET_SET_FLAGS(prev_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(prev_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
        gtk_widget_show(prev_btn);
 
        next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
-       GTK_WIDGET_SET_FLAGS(next_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(next_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
        gtk_widget_show(next_btn);
 
        close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-       GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(close_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
        gtk_widget_show(close_btn);
 
        /* stop button hidden */
        stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
-       GTK_WIDGET_SET_FLAGS(stop_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(stop_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
 
        gtk_widget_show (confirm_area);
@@ -384,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),