New big icon for compose windows, by Simon Steinbeiss
[claws.git] / src / gtk / gtkutils.c
index 8c8207b232f7a2259abd7ef0476ec0980ec8d4d0..72dbf4b77704a10f8b711f9ae535e1f31566ca91 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -84,7 +85,7 @@ void gtkut_widget_set_small_font_size(GtkWidget *widget)
        gint size;
 
        cm_return_if_fail(widget != NULL);
-       cm_return_if_fail(widget->style != NULL);
+       cm_return_if_fail(gtk_widget_get_style(widget) != NULL);
 
        if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
                font_desc = pango_font_description_from_string(NORMAL_FONT);
@@ -126,7 +127,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
 
        *help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
 
-       GTK_WIDGET_SET_FLAGS(*help_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*help_btn, TRUE);
        gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);
        gtk_button_box_set_child_secondary(GTK_BUTTON_BOX (bbox),
                        *help_btn, TRUE);
@@ -163,20 +164,20 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
        gtk_box_set_spacing(GTK_BOX(*bbox), 5);
 
        *button1 = gtk_button_new_from_stock(label1);
-       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*button1, TRUE);
        gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
        gtk_widget_show(*button1);
 
        if (button2) {
                *button2 = gtk_button_new_from_stock(label2);
-               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button2, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
 
        if (button3) {
                *button3 = gtk_button_new_from_stock(label3);
-               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button3, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }
@@ -197,7 +198,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
        *button1 = gtk_button_new_with_mnemonic(text1);
        gtk_button_set_image(GTK_BUTTON(*button1),
                gtk_image_new_from_stock(label1, GTK_ICON_SIZE_BUTTON));
-       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*button1, TRUE);
        gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
        gtk_widget_show(*button1);
 
@@ -205,7 +206,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                *button2 = gtk_button_new_with_mnemonic(text2);
                gtk_button_set_image(GTK_BUTTON(*button2),
                        gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
-               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button2, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
@@ -214,7 +215,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                *button3 = gtk_button_new_with_mnemonic(text3);
                gtk_button_set_image(GTK_BUTTON(*button3),
                        gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
-               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button3, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }
@@ -447,7 +448,7 @@ static gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter
 
        wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
        if (error != NULL) {
-               g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n",
+               g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
                          error->message);
                g_error_free(error);
        }
@@ -483,7 +484,8 @@ static gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
 
        wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
        if (error != NULL) {
-               g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+               g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s\n",
+                         error->message);
                g_error_free(error);
        }
        if (!wcs || items_written <= 0) return FALSE;
@@ -528,6 +530,7 @@ void gtkut_text_view_set_position(GtkTextView *text, gint pos)
 {
        GtkTextBuffer *buffer;
        GtkTextIter iter;
+       GtkTextMark *mark;
 
        cm_return_if_fail(text != NULL);
 
@@ -535,7 +538,8 @@ void gtkut_text_view_set_position(GtkTextView *text, gint pos)
 
        gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
        gtk_text_buffer_place_cursor(buffer, &iter);
-       gtk_text_view_scroll_to_iter(text, &iter, 0.0, FALSE, 0.0, 0.0);
+       mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, TRUE);
+       gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
 }
 
 gboolean gtkut_text_view_search_string(GtkTextView *text, const gchar *str,
@@ -605,41 +609,43 @@ gboolean gtkut_text_view_search_string_backward(GtkTextView *text, const gchar *
 
 void gtkut_window_popup(GtkWidget *window)
 {
+       GdkWindow *gdkwin;
        gint x, y, sx, sy, new_x, new_y;
 
+       gdkwin = gtk_widget_get_window(window);
+
        cm_return_if_fail(window != NULL);
-       cm_return_if_fail(window->window != NULL);
+       cm_return_if_fail(gdkwin != NULL);
 
        sx = gdk_screen_width();
        sy = gdk_screen_height();
 
-       gdk_window_get_origin(window->window, &x, &y);
+       gdk_window_get_origin(gdkwin, &x, &y);
        new_x = x % sx; if (new_x < 0) new_x = 0;
        new_y = y % sy; if (new_y < 0) new_y = 0;
        if (new_x != x || new_y != y)
-               gdk_window_move(window->window, new_x, new_y);
+               gdk_window_move(gdkwin, new_x, new_y);
 
        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE);
-#if GTK_CHECK_VERSION(2,8,0)
        gtk_window_present_with_time(GTK_WINDOW(window), time(NULL));
-#else
-       gtk_window_present(GTK_WINDOW(window));
-#endif
 }
 
 void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
 {
+       GdkWindow *gdkwin;
        gint x, y;
        gint sx, sy;
 
+       gdkwin = gtk_widget_get_window(widget);
+
        cm_return_if_fail(widget != NULL);
-       cm_return_if_fail(widget->window != NULL);
+       cm_return_if_fail(gdkwin != NULL);
 
        sx = gdk_screen_width();
        sy = gdk_screen_height();
 
        /* gdk_window_get_root_origin ever return *rootwindow*'s position */
-       gdk_window_get_root_origin(widget->window, &x, &y);
+       gdk_window_get_root_origin(gdkwin, &x, &y);
 
        x %= sx; if (x < 0) x = 0;
        y %= sy; if (y < 0) y = 0;
@@ -649,8 +655,8 @@ void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
 
 void gtkut_widget_draw_now(GtkWidget *widget)
 {
-       if (widget && GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_DRAWABLE(widget))
-               gdk_window_process_updates(widget->window, FALSE);
+       if (widget && gtk_widget_get_visible(widget) && gtk_widget_is_drawable(widget))
+               gdk_window_process_updates(gtk_widget_get_window(widget), FALSE);
 }
 
 static void gtkut_clist_bindings_add(GtkWidget *clist)
@@ -660,11 +666,11 @@ static void gtkut_clist_bindings_add(GtkWidget *clist)
        binding_set = gtk_binding_set_by_class
                (GTK_CMCLIST_GET_CLASS(clist));
 
-       gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
+       gtk_binding_entry_add_signal(binding_set, GDK_KEY_n, GDK_CONTROL_MASK,
                                     "scroll_vertical", 2,
                                     G_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
                                     G_TYPE_FLOAT, 0.0);
-       gtk_binding_entry_add_signal(binding_set, GDK_p, GDK_CONTROL_MASK,
+       gtk_binding_entry_add_signal(binding_set, GDK_KEY_p, GDK_CONTROL_MASK,
                                     "scroll_vertical", 2,
                                     G_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
                                     G_TYPE_FLOAT, 0.0);
@@ -710,28 +716,40 @@ void gtkut_widget_init(void)
 
 void gtkut_widget_set_app_icon(GtkWidget *widget)
 {
-       static GdkPixbuf *icon = NULL;
-       
+       static GList *icon_list = NULL;
+
        cm_return_if_fail(widget != NULL);
-       cm_return_if_fail(widget->window != NULL);
-       if (!icon) {
+       cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
+       if (!icon_list) {
+               GdkPixbuf *icon = NULL, *big_icon = NULL;
                stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
-       }               
-       if (icon)
-               gtk_window_set_icon(GTK_WINDOW(widget), icon);
+               stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_LOGO, &big_icon);
+               if (icon)
+                       icon_list = g_list_append(icon_list, icon);
+               if (big_icon)
+                       icon_list = g_list_append(icon_list, big_icon);
+       }
+       if (icon_list)
+               gtk_window_set_icon_list(GTK_WINDOW(widget), icon_list);
 }
 
 void gtkut_widget_set_composer_icon(GtkWidget *widget)
 {
-       static GdkPixbuf *icon = NULL;
-       
+       static GList *icon_list = NULL;
+
        cm_return_if_fail(widget != NULL);
-       cm_return_if_fail(widget->window != NULL);
-       if (!icon) {
+       cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
+       if (!icon_list) {
+               GdkPixbuf *icon = NULL, *big_icon = NULL;
                stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
-       }               
-       if (icon)
-               gtk_window_set_icon(GTK_WINDOW(widget), icon);
+               stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE_LOGO, &big_icon);
+               if (icon)
+                       icon_list = g_list_append(icon_list, icon);
+               if (big_icon)
+                       icon_list = g_list_append(icon_list, big_icon);
+       }
+       if (icon_list)
+               gtk_window_set_icon_list(GTK_WINDOW(widget), icon_list);
 }
 
 static gboolean move_bar = FALSE;
@@ -872,7 +890,7 @@ GtkWidget *gtkut_get_focused_child(GtkContainer *parent)
 
        for (c = child_list; c != NULL; c = g_list_next(c)) {
                if (c->data && GTK_IS_WIDGET(c->data)) {
-                       if (GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(c->data))) {
+                       if (gtk_widget_has_focus(GTK_WIDGET(c->data))) {
                                result = GTK_WIDGET(c->data);
                                break;
                        }
@@ -1077,8 +1095,6 @@ GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
 {
        static gchar *xpm_xface[XPM_XFACE_HEIGHT];
        static gboolean xpm_xface_init = TRUE;
-       GdkPixmap *pixmap;
-       GdkBitmap *mask;
        gchar xface[2048];
        strncpy(xface, o_xface, sizeof(xface));
 
@@ -1103,9 +1119,6 @@ GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
 
        create_xpm_from_xface(xpm_xface, xface);
 
-       pixmap = gdk_pixmap_create_from_xpm_d
-               (window, &mask, 
-                background, xpm_xface);
        return gtk_image_new_from_pixbuf(
                gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
 }
@@ -1144,7 +1157,7 @@ GtkWidget *face_get_from_header(const gchar *o_face)
 
        if ((gdk_pixbuf_get_width(pixbuf) != 48) || (gdk_pixbuf_get_height(pixbuf) != 48)) {
                g_object_unref(pixbuf);
-               g_warning("wrong_size");
+               g_warning("wrong_size\n");
                return NULL;
        }
 
@@ -1157,12 +1170,15 @@ static GdkCursor *hand_cursor = NULL;
 
 static void link_btn_enter(GtkButton *button, gpointer data)
 {
+       GdkWindow *gdkwin;
        GtkWidget *window = (GtkWidget *)data;
 
+       gdkwin = gtk_widget_get_window(window);
+
        if (!hand_cursor)
                hand_cursor = gdk_cursor_new(GDK_HAND2);
-       if (window && window->window)
-               gdk_window_set_cursor(window->window, hand_cursor);
+       if (window && gdkwin)
+               gdk_window_set_cursor(gdkwin, hand_cursor);
 
        gtk_button_set_relief(button, GTK_RELIEF_NONE);
        gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
@@ -1171,10 +1187,13 @@ static void link_btn_enter(GtkButton *button, gpointer data)
 
 static void link_btn_leave(GtkButton *button, gpointer data)
 {
+       GdkWindow *gdkwin;
        GtkWidget *window = (GtkWidget *)data;
 
-       if (window && window->window)
-               gdk_window_set_cursor(window->window, NULL);
+       gdkwin = gtk_widget_get_window(window);
+
+       if (window && gdkwin)
+               gdk_window_set_cursor(gdkwin, NULL);
 
        gtk_button_set_relief(button, GTK_RELIEF_NONE);
        gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
@@ -1212,9 +1231,11 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
 {
        GtkWidget *btn;
        GtkWidget *btn_label;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GdkColormap *cmap;
-       GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gboolean success[2];
+#endif
+       GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gchar *local_url = NULL;
        if (!url)
                return NULL;
@@ -1227,9 +1248,11 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
        btn = gtk_button_new_with_label(label?label:url);
        gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE);
        btn_label = gtk_bin_get_child(GTK_BIN((btn)));
-       cmap = gdk_drawable_get_colormap(window->window);
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       cmap = gdk_drawable_get_colormap(gtk_widget_get_window(window));
        gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
        if (success[0] == TRUE && success[1] == TRUE) {
+#endif
                GtkStyle *style;
                gtk_widget_ensure_style(btn_label);
                style = gtk_style_copy
@@ -1238,8 +1261,10 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
                style->fg[GTK_STATE_ACTIVE]   = uri_color[1];
                style->fg[GTK_STATE_PRELIGHT] = uri_color[0];
                gtk_widget_set_style(btn_label, style);
+#if !GTK_CHECK_VERSION(3, 0, 0)
        } else
-               g_warning("about_create(): color allocation failed.\n");
+               g_warning("color allocation failed\n");
+#endif
 
        g_signal_connect(G_OBJECT(btn), "enter",
                         G_CALLBACK(link_btn_enter), window);
@@ -1291,9 +1316,7 @@ GtkWidget *gtkut_sc_combobox_create(GtkWidget *eventbox, gboolean focus_on_click
 
        if( eventbox != NULL )
                gtk_container_add(GTK_CONTAINER(eventbox), combobox);
-#if GTK_CHECK_VERSION(2,6,0)
        gtk_combo_box_set_focus_on_click(GTK_COMBO_BOX(combobox), focus_on_click);
-#endif
 
        gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combobox),
                        (GtkTreeViewRowSeparatorFunc)_combobox_separator_func, NULL, NULL);
@@ -1318,12 +1341,12 @@ static void gtkutils_smooth_scroll_do(GtkWidget *widget, GtkAdjustment *vadj,
        }
 
        for (i = step; i <= change_value; i += step) {
-               vadj->value = old_value + (up ? -i : i);
+               gtk_adjustment_set_value(vadj, old_value + (up ? -i : i));
                g_signal_emit_by_name(G_OBJECT(vadj),
                                      "value_changed", 0);
        }
 
-       vadj->value = last_value;
+       gtk_adjustment_set_value(vadj, last_value);
        g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
 
        gtk_widget_queue_draw(widget);
@@ -1336,16 +1359,15 @@ static gboolean gtkutils_smooth_scroll_page(GtkWidget *widget, GtkAdjustment *va
        gfloat old_value;
        gfloat last_value;
 
+       page_incr = gtk_adjustment_get_page_increment(vadj);
        if (prefs_common.scroll_halfpage)
-               page_incr = vadj->page_increment / 2;
-       else
-               page_incr = vadj->page_increment;
+               page_incr /= 2;
 
+       old_value = gtk_adjustment_get_value(vadj);
        if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       old_value = vadj->value;
-                       last_value = vadj->value + page_incr;
+               upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+               if (old_value < upper) {
+                       last_value = old_value + page_incr;
                        last_value = MIN(last_value, upper);
 
                        gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1354,9 +1376,8 @@ static gboolean gtkutils_smooth_scroll_page(GtkWidget *widget, GtkAdjustment *va
                } else
                        return FALSE;
        } else {
-               if (vadj->value > 0.0) {
-                       old_value = vadj->value;
-                       last_value = vadj->value - page_incr;
+               if (old_value > 0.0) {
+                       last_value = old_value - page_incr;
                        last_value = MAX(last_value, 0.0);
 
                        gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1373,28 +1394,31 @@ gboolean gtkutils_scroll_page(GtkWidget *widget, GtkAdjustment *vadj, gboolean u
 {
        gfloat upper;
        gfloat page_incr;
+       gfloat old_value;
 
        if (prefs_common.enable_smooth_scroll)
                return gtkutils_smooth_scroll_page(widget, vadj, up);
 
+       page_incr = gtk_adjustment_get_page_increment(vadj);
        if (prefs_common.scroll_halfpage)
-               page_incr = vadj->page_increment / 2;
-       else
-               page_incr = vadj->page_increment;
+               page_incr /= 2;
 
+       old_value = gtk_adjustment_get_value(vadj);
        if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       vadj->value += page_incr;
-                       vadj->value = MIN(vadj->value, upper);
+               upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+               if (old_value < upper) {
+                       old_value += page_incr;
+                       old_value = MIN(old_value, upper);
+                       gtk_adjustment_set_value(vadj, old_value);
                        g_signal_emit_by_name(G_OBJECT(vadj),
                                              "value_changed", 0);
                } else
                        return FALSE;
        } else {
-               if (vadj->value > 0.0) {
-                       vadj->value -= page_incr;
-                       vadj->value = MAX(vadj->value, 0.0);
+               if (old_value > 0.0) {
+                       old_value -= page_incr;
+                       old_value = MAX(old_value, 0.0);
+                       gtk_adjustment_set_value(vadj, old_value);
                        g_signal_emit_by_name(G_OBJECT(vadj),
                                              "value_changed", 0);
                } else
@@ -1409,11 +1433,11 @@ static void gtkutils_smooth_scroll_one_line(GtkWidget *widget, GtkAdjustment *va
        gfloat old_value;
        gfloat last_value;
 
+       old_value = gtk_adjustment_get_value(vadj);
        if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       old_value = vadj->value;
-                       last_value = vadj->value + vadj->step_increment;
+               upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+               if (old_value < upper) {
+                       last_value = old_value + gtk_adjustment_get_step_increment(vadj);
                        last_value = MIN(last_value, upper);
 
                        gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1421,9 +1445,8 @@ static void gtkutils_smooth_scroll_one_line(GtkWidget *widget, GtkAdjustment *va
                                                  prefs_common.scroll_step);
                }
        } else {
-               if (vadj->value > 0.0) {
-                       old_value = vadj->value;
-                       last_value = vadj->value - vadj->step_increment;
+               if (old_value > 0.0) {
+                       last_value = old_value - gtk_adjustment_get_step_increment(vadj);
                        last_value = MAX(last_value, 0.0);
 
                        gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1436,24 +1459,28 @@ static void gtkutils_smooth_scroll_one_line(GtkWidget *widget, GtkAdjustment *va
 void gtkutils_scroll_one_line(GtkWidget *widget, GtkAdjustment *vadj, gboolean up)
 {
        gfloat upper;
+       gfloat old_value;
 
        if (prefs_common.enable_smooth_scroll) {
                gtkutils_smooth_scroll_one_line(widget, vadj, up);
                return;
        }
 
+       old_value = gtk_adjustment_get_value(vadj);
        if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       vadj->value += vadj->step_increment;
-                       vadj->value = MIN(vadj->value, upper);
+               upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+               if (old_value < upper) {
+                       old_value += gtk_adjustment_get_step_increment(vadj);
+                       old_value = MIN(old_value, upper);
+                       gtk_adjustment_set_value(vadj, old_value);
                        g_signal_emit_by_name(G_OBJECT(vadj),
                                              "value_changed", 0);
                }
        } else {
-               if (vadj->value > 0.0) {
-                       vadj->value -= vadj->step_increment;
-                       vadj->value = MAX(vadj->value, 0.0);
+               if (old_value > 0.0) {
+                       old_value -= gtk_adjustment_get_step_increment(vadj);
+                       old_value = MAX(old_value, 0.0);
+                       gtk_adjustment_set_value(vadj, old_value);
                        g_signal_emit_by_name(G_OBJECT(vadj),
                                              "value_changed", 0);
                }
@@ -1611,36 +1638,30 @@ GtkUIManager *gtkut_ui_manager(void)
        return gui_manager;
 }
 
-#define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR)
-#define WRITE_CONDITION (G_IO_OUT | G_IO_ERR)
-#define EXCEPTION_CONDITION (G_IO_PRI)
 typedef struct _ClawsIOClosure ClawsIOClosure;
 
 struct _ClawsIOClosure
 {
-  GdkInputFunction function;
-  GdkInputCondition condition;
+  ClawsIOFunc function;
+  GIOCondition condition;
   GDestroyNotify notify;
   gpointer data;
 };
 
 static gboolean  
 claws_io_invoke (GIOChannel   *source,
-              GIOCondition  condition,
-              gpointer      data)
+                GIOCondition  condition,
+                gpointer      data)
 {
   ClawsIOClosure *closure = data;
-  GdkInputCondition gdk_cond = 0;
-
-  if (condition & READ_CONDITION)
-    gdk_cond |= GDK_INPUT_READ;
-  if (condition & WRITE_CONDITION)
-    gdk_cond |= GDK_INPUT_WRITE;
-  if (condition & EXCEPTION_CONDITION)
-    gdk_cond |= GDK_INPUT_EXCEPTION;
-
-  if (closure->condition & gdk_cond)
-    closure->function (closure->data, g_io_channel_unix_get_fd (source), gdk_cond);
+  int fd;
+#ifndef G_OS_WIN32
+  fd = g_io_channel_unix_get_fd (source);
+#else
+  fd = g_io_channel_win32_get_fd (source);
+#endif
+  if (closure->condition & condition)
+    closure->function (closure->data, fd, condition);
 
   return TRUE;
 }
@@ -1658,28 +1679,20 @@ claws_io_destroy (gpointer data)
 
 gint
 claws_input_add    (gint             source,
-                   GdkInputCondition condition,
-                   GdkInputFunction  function,
+                   GIOCondition      condition,
+                   ClawsIOFunc       function,
                    gpointer          data,
                    gboolean          is_sock)
 {
   guint result;
   ClawsIOClosure *closure = g_new (ClawsIOClosure, 1);
   GIOChannel *channel;
-  GIOCondition cond = 0;
 
   closure->function = function;
   closure->condition = condition;
   closure->notify = NULL;
   closure->data = data;
 
-  if (condition & GDK_INPUT_READ)
-    cond |= READ_CONDITION;
-  if (condition & GDK_INPUT_WRITE)
-    cond |= WRITE_CONDITION;
-  if (condition & GDK_INPUT_EXCEPTION)
-    cond |= EXCEPTION_CONDITION;
-
 #ifndef G_OS_WIN32
   channel = g_io_channel_unix_new (source);
 #else
@@ -1688,10 +1701,187 @@ claws_input_add    (gint             source,
   else
     channel = g_io_channel_win32_new_fd(source);
 #endif
-  result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond, 
+  result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, condition
                                claws_io_invoke,
                                closure, claws_io_destroy);
   g_io_channel_unref (channel);
 
   return result;
 }
+
+void gtkut_widget_set_mapped(GtkWidget *widget, gboolean mapped)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_mapped(widget, mapped);
+#else
+       if (mapped)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_MAPPED);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED);
+#endif
+}
+
+void gtkut_widget_set_realized(GtkWidget *widget, gboolean realized)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_realized(widget, realized);
+#else
+       if (realized)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_REALIZED);
+#endif
+}
+
+void gtkut_widget_set_can_default(GtkWidget *widget, gboolean can_default)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_can_default(widget, can_default);
+#else
+       if (can_default)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT);
+#endif
+}
+
+void gtkut_widget_set_receives_default(GtkWidget *widget, gboolean receives_default)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_receives_default(widget, receives_default);
+#else
+       if (receives_default)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_RECEIVES_DEFAULT);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_RECEIVES_DEFAULT);
+#endif
+}
+
+void gtkut_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_can_focus(widget, can_focus);
+#else
+       if (can_focus)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS);
+#endif
+}
+
+void gtkut_widget_set_has_window(GtkWidget *widget, gboolean has_window)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_has_window(widget, has_window);
+#else
+       if (has_window) /* Inverted logic there */
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_NO_WINDOW);
+       else
+               GTK_WIDGET_SET_FLAGS(widget, GTK_NO_WINDOW);
+#endif
+}
+
+/**
+ * Load a pixbuf fitting inside the specified size. EXIF orientation is
+ * respected if available.
+ *
+ * @param[in] filename         the file to load
+ * @param[in] box_width                the max width (-1 for no resize)
+ * @param[in] box_height       the max height (-1 for no resize)
+ * @param[out] error           the possible load error
+ *
+ * @return a GdkPixbuf
+ */
+GdkPixbuf *claws_load_pixbuf_fitting(GdkPixbuf *src_pixbuf, int box_width,
+                                    int box_height)
+{
+       gint w, h, orientation, angle;
+       gint avail_width, avail_height;
+       gboolean flip_horiz, flip_vert;
+       const gchar *orient_str;
+       GdkPixbuf *pixbuf, *t_pixbuf;
+
+       pixbuf = src_pixbuf;
+
+       if (pixbuf == NULL)
+               return NULL;
+
+       angle = 0;
+       flip_horiz = flip_vert = FALSE;
+
+       /* EXIF orientation */
+       orient_str = gdk_pixbuf_get_option(pixbuf, "orientation");
+       if (orient_str != NULL && *orient_str != '\0') {
+               orientation = atoi(orient_str);
+               switch(orientation) {
+                       /* See EXIF standard for different values */
+                       case 1: break;
+                       case 2: flip_horiz = 1;
+                               break;
+                       case 3: angle = 180;
+                               break;
+                       case 4: flip_vert = 1;
+                               break;
+                       case 5: angle = 90;
+                               flip_horiz = 1;
+                               break;
+                       case 6: angle = 270;
+                               break;
+                       case 7: angle = 90;
+                               flip_vert = 1;
+                               break;
+                       case 8: angle = 90;
+                               break;
+               }
+       }
+
+       w = gdk_pixbuf_get_width(pixbuf);
+       h = gdk_pixbuf_get_height(pixbuf);
+
+       if (angle == 90 || angle == 270) {
+               avail_height = box_width;
+               avail_width = box_height;
+       } else {
+               avail_width = box_width;
+               avail_height = box_height;
+       }
+
+       /* Scale first */
+       if (box_width != -1 && box_height != -1 && avail_width - 100 > 0) {
+               if (w > avail_width) {
+                       h = (avail_width * h) / w;
+                       w = avail_width;
+               }
+               if (h > avail_height) {
+                       w = (avail_height * w) / h;
+                       h = avail_height;
+               }
+               t_pixbuf = gdk_pixbuf_scale_simple(pixbuf, 
+                       w, h, GDK_INTERP_BILINEAR);
+               g_object_unref(pixbuf);
+               pixbuf = t_pixbuf;
+       }
+
+       /* Rotate if needed */
+       if (angle != 0) {
+               t_pixbuf = gdk_pixbuf_rotate_simple(pixbuf, angle);
+               g_object_unref(pixbuf);
+               pixbuf = t_pixbuf;
+       }
+
+       /* Flip horizontally if needed */
+       if (flip_horiz) {
+               t_pixbuf = gdk_pixbuf_flip(pixbuf, TRUE);
+               g_object_unref(pixbuf);
+               pixbuf = t_pixbuf;
+       }
+
+       /* Flip vertically if needed */
+       if (flip_vert) {
+               t_pixbuf = gdk_pixbuf_flip(pixbuf, FALSE);
+               g_object_unref(pixbuf);
+               pixbuf = t_pixbuf;
+       }
+
+       return pixbuf;
+}