2011-10-07 [colin] 3.7.10cvs21
[claws.git] / src / gtk / gtkutils.c
index 1ddd84ea5eadfe5a95a9dbb3f4143d3bfcb47e33..9ec46c2b59b279f39753fb8b13575c6c757fb528 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
+#include "gtk/gtksctree.h"
+#endif
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 
+#include "combobox.h"
+
 #if HAVE_LIBCOMPFACE
 #  include <compface.h>
 #endif
@@ -52,7 +51,9 @@
 #include "defs.h"
 #include "gtkutils.h"
 #include "utils.h"
+#if !GTK_CHECK_VERSION(3, 0, 0)
 #include "gtksctree.h"
+#endif
 #include "codeconv.h"
 #include "stock_pixmap.h"
 #include "menu.h"
@@ -61,6 +62,7 @@
 #include "manage_window.h"
 #include "base64.h"
 #include "manual.h"
+#include "combobox.h"
 
 gboolean gtkut_get_font_size(GtkWidget *widget,
                             gint *width, gint *height)
@@ -68,10 +70,10 @@ gboolean gtkut_get_font_size(GtkWidget *widget,
        PangoLayout *layout;
        const gchar *str = "Abcdef";
 
-       g_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
+       cm_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
 
        layout = gtk_widget_create_pango_layout(widget, str);
-       g_return_val_if_fail(layout, FALSE);
+       cm_return_val_if_fail(layout, FALSE);
        pango_layout_get_pixel_size(layout, width, height);
        if (width)
                *width = *width / g_utf8_strlen(str, -1);
@@ -85,19 +87,25 @@ void gtkut_widget_set_small_font_size(GtkWidget *widget)
        PangoFontDescription *font_desc;
        gint size;
 
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(widget->style != NULL);
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(gtk_widget_get_style(widget) != NULL);
 
-       font_desc = pango_font_description_from_string(NORMAL_FONT);
-       size = pango_font_description_get_size(font_desc);
-       pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
-       gtk_widget_modify_font(widget, font_desc);
-       pango_font_description_free(font_desc);
+       if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
+               font_desc = pango_font_description_from_string(NORMAL_FONT);
+               size = pango_font_description_get_size(font_desc);
+               pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+               gtk_widget_modify_font(widget, font_desc);
+               pango_font_description_free(font_desc);
+       } else {
+               font_desc = pango_font_description_from_string(SMALL_FONT);
+               gtk_widget_modify_font(widget, font_desc);
+               pango_font_description_free(font_desc);
+       }
 }
 
 void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
 {
-       g_return_if_fail(color != NULL);
+       cm_return_if_fail(color != NULL);
 
        color->pixel = 0L;
        color->red   = (int) (((gdouble)((rgbvalue & 0xff0000) >> 16) / 255.0) * 65535.0);
@@ -105,18 +113,29 @@ void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
        color->blue  = (int) (((gdouble) (rgbvalue & 0x0000ff)        / 255.0) * 65535.0);
 }
 
+#define CL(x)  (((gulong) (x) >> (gulong) 8) & 0xFFUL)
+#define RGB_FROM_GDK_COLOR(c) \
+       ((CL(c->red)   << (gulong) 16) | \
+        (CL(c->green) << (gulong)  8) | \
+        (CL(c->blue)))
+
+gint gtkut_convert_gdk_color_to_int(GdkColor *color)
+{
+       return RGB_FROM_GDK_COLOR(color);
+}
+
 void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
 {
-       g_return_if_fail(bbox != NULL);
+       cm_return_if_fail(bbox != NULL);
 
        *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);
        gtk_widget_set_sensitive(*help_btn,
-                       manual_available(MANUAL_MANUAL_LOCAL));
+                       manual_available(MANUAL_MANUAL_CLAWS));
        gtk_widget_show(*help_btn);
 }
 
@@ -126,8 +145,8 @@ void gtkut_stock_button_set_create_with_help(GtkWidget **bbox,
                GtkWidget **button2, const gchar *label2,
                GtkWidget **button3, const gchar *label3)
 {
-       g_return_if_fail(bbox != NULL);
-       g_return_if_fail(button1 != NULL);
+       cm_return_if_fail(bbox != NULL);
+       cm_return_if_fail(button1 != NULL);
 
        gtkut_stock_button_set_create(bbox, button1, label1,
                        button2, label2, button3, label3);
@@ -140,134 +159,71 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
                                   GtkWidget **button2, const gchar *label2,
                                   GtkWidget **button3, const gchar *label3)
 {
-       g_return_if_fail(bbox != NULL);
-       g_return_if_fail(button1 != NULL);
+       cm_return_if_fail(bbox != NULL);
+       cm_return_if_fail(button1 != NULL);
 
        *bbox = gtk_hbutton_box_new();
        gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
        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);
        }
 }
 
-static void combo_button_size_request(GtkWidget *widget,
-                                     GtkRequisition *requisition,
-                                     gpointer data)
+void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
+                                  GtkWidget **button1, const gchar *label1, const gchar *text1,
+                                  GtkWidget **button2, const gchar *label2, const gchar *text2,
+                                  GtkWidget **button3, const gchar *label3, const gchar *text3)
 {
-       ComboButton *combo = (ComboButton *)data;
+       cm_return_if_fail(bbox != NULL);
+       cm_return_if_fail(button1 != NULL);
 
-       if (combo->arrow->allocation.height != requisition->height)
-               gtk_widget_set_size_request(combo->arrow,
-                                           -1, requisition->height);
-}
+       *bbox = gtk_hbutton_box_new();
+       gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
+       gtk_box_set_spacing(GTK_BOX(*bbox), 5);
 
-static void combo_button_enter(GtkWidget *widget, gpointer data)
-{
-       ComboButton *combo = (ComboButton *)data;
+       *button1 = gtk_button_new_with_mnemonic(text1);
+       gtk_button_set_image(GTK_BUTTON(*button1),
+               gtk_image_new_from_stock(label1, GTK_ICON_SIZE_BUTTON));
+       gtkut_widget_set_can_default(*button1, TRUE);
+       gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
+       gtk_widget_show(*button1);
 
-       if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_PRELIGHT) {
-               gtk_widget_set_state(combo->arrow, GTK_STATE_PRELIGHT);
-               gtk_widget_queue_draw(combo->arrow);
-       }
-       if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_PRELIGHT) {
-               gtk_widget_set_state(combo->button, GTK_STATE_PRELIGHT);
-               gtk_widget_queue_draw(combo->button);
+       if (button2) {
+               *button2 = gtk_button_new_with_mnemonic(text2);
+               gtk_button_set_image(GTK_BUTTON(*button2),
+                       gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+               gtkut_widget_set_can_default(*button2, TRUE);
+               gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
+               gtk_widget_show(*button2);
        }
-}
 
-static void combo_button_leave(GtkWidget *widget, gpointer data)
-{
-       ComboButton *combo = (ComboButton *)data;
-
-       if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_NORMAL) {
-               gtk_widget_set_state(combo->arrow, GTK_STATE_NORMAL);
-               gtk_widget_queue_draw(combo->arrow);
-       }
-       if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_NORMAL) {
-               gtk_widget_set_state(combo->button, GTK_STATE_NORMAL);
-               gtk_widget_queue_draw(combo->button);
+       if (button3) {
+               *button3 = gtk_button_new_with_mnemonic(text3);
+               gtk_button_set_image(GTK_BUTTON(*button3),
+                       gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+               gtkut_widget_set_can_default(*button3, TRUE);
+               gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
+               gtk_widget_show(*button3);
        }
 }
 
-static gint combo_button_arrow_pressed(GtkWidget *widget, GdkEventButton *event,
-                                      gpointer data)
-{
-       ComboButton *combo = (ComboButton *)data;
-
-       if (!event) return FALSE;
-
-       gtk_menu_popup(GTK_MENU(combo->menu), NULL, NULL,
-                      menu_button_position, combo->button,
-                      event->button, event->time);
-
-       return FALSE;
-}
-
-static void combo_button_destroy(GtkWidget *widget, gpointer data)
-{
-       ComboButton *combo = (ComboButton *)data;
-
-       gtk_object_destroy(GTK_OBJECT(combo->factory));
-       g_free(combo);
-}
-
-ComboButton *gtkut_combo_button_create(GtkWidget *button,
-                                      GtkItemFactoryEntry *entries,
-                                      gint n_entries, const gchar *path,
-                                      gpointer data)
-{
-       ComboButton *combo;
-       GtkWidget *arrow;
-
-       combo = g_new0(ComboButton, 1);
-
-       combo->arrow = gtk_button_new();
-       arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_widget_set_size_request(arrow, 7, -1);
-       gtk_container_add(GTK_CONTAINER(combo->arrow), arrow);
-       GTK_WIDGET_UNSET_FLAGS(combo->arrow, GTK_CAN_FOCUS);
-       gtk_widget_show_all(combo->arrow);
-
-       combo->button = button;
-       combo->menu = menu_create_items(entries, n_entries, path,
-                                       &combo->factory, data);
-       combo->data = data;
-
-       g_signal_connect(G_OBJECT(combo->button), "size_request",
-                        G_CALLBACK(combo_button_size_request), combo);
-       g_signal_connect(G_OBJECT(combo->button), "enter",
-                        G_CALLBACK(combo_button_enter), combo);
-       g_signal_connect(G_OBJECT(combo->button), "leave",
-                        G_CALLBACK(combo_button_leave), combo);
-       g_signal_connect(G_OBJECT(combo->arrow), "enter",
-                        G_CALLBACK(combo_button_enter), combo);
-       g_signal_connect(G_OBJECT(combo->arrow), "leave",
-                        G_CALLBACK(combo_button_leave), combo);
-       g_signal_connect(G_OBJECT(combo->arrow), "button_press_event",
-                        G_CALLBACK(combo_button_arrow_pressed), combo);
-       g_signal_connect(G_OBJECT(combo->arrow), "destroy",
-                        G_CALLBACK(combo_button_destroy), combo);
-
-       return combo;
-}
-
 #define CELL_SPACING 1
 #define ROW_TOP_YPIXEL(clist, row) (((clist)->row_height * (row)) + \
                                    (((row) + 1) * CELL_SPACING) + \
@@ -275,24 +231,24 @@ ComboButton *gtkut_combo_button_create(GtkWidget *button,
 #define ROW_FROM_YPIXEL(clist, y) (((y) - (clist)->voffset) / \
                                   ((clist)->row_height + CELL_SPACING))
 
-void gtkut_ctree_node_move_if_on_the_edge(GtkCTree *ctree, GtkCTreeNode *node, gint _row)
+void gtkut_ctree_node_move_if_on_the_edge(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint _row)
 {
-       GtkCList *clist = GTK_CLIST(ctree);
+       GtkCMCList *clist = GTK_CMCLIST(ctree);
        gint row;
        GtkVisibility row_visibility, prev_row_visibility, next_row_visibility;
 
-       g_return_if_fail(ctree != NULL);
-       g_return_if_fail(node != NULL);
+       cm_return_if_fail(ctree != NULL);
+       cm_return_if_fail(node != NULL);
 
        row = (_row != -1 ? _row : g_list_position(clist->row_list, (GList *)node));
 
        if (row < 0 || row >= clist->rows || clist->row_height == 0) return;
-       row_visibility = gtk_clist_row_is_visible(clist, row);
-       prev_row_visibility = gtk_clist_row_is_visible(clist, row - 1);
-       next_row_visibility = gtk_clist_row_is_visible(clist, row + 1);
+       row_visibility = gtk_cmclist_row_is_visible(clist, row);
+       prev_row_visibility = gtk_cmclist_row_is_visible(clist, row - 1);
+       next_row_visibility = gtk_cmclist_row_is_visible(clist, row + 1);
 
        if (row_visibility == GTK_VISIBILITY_NONE) {
-               gtk_clist_moveto(clist, row, -1, 0.5, 0);
+               gtk_cmclist_moveto(clist, row, -1, 0.5, 0);
                return;
        }
        if (row_visibility == GTK_VISIBILITY_FULL &&
@@ -304,11 +260,11 @@ void gtkut_ctree_node_move_if_on_the_edge(GtkCTree *ctree, GtkCTreeNode *node, g
                return;
 
        if (prev_row_visibility != GTK_VISIBILITY_FULL) {
-               gtk_clist_moveto(clist, row, -1, 0.2, 0);
+               gtk_cmclist_moveto(clist, row, -1, 0.2, 0);
                return;
        }
        if (next_row_visibility != GTK_VISIBILITY_FULL) {
-               gtk_clist_moveto(clist, row, -1, 0.8, 0);
+               gtk_cmclist_moveto(clist, row, -1, 0.8, 0);
                return;
        }
 }
@@ -317,179 +273,126 @@ void gtkut_ctree_node_move_if_on_the_edge(GtkCTree *ctree, GtkCTreeNode *node, g
 #undef ROW_TOP_YPIXEL
 #undef ROW_FROM_YPIXEL
 
-gint gtkut_ctree_get_nth_from_node(GtkCTree *ctree, GtkCTreeNode *node)
+gint gtkut_ctree_get_nth_from_node(GtkCMCTree *ctree, GtkCMCTreeNode *node)
 {
-       g_return_val_if_fail(ctree != NULL, -1);
-       g_return_val_if_fail(node != NULL, -1);
+       cm_return_val_if_fail(ctree != NULL, -1);
+       cm_return_val_if_fail(node != NULL, -1);
 
-       return g_list_position(GTK_CLIST(ctree)->row_list, (GList *)node);
+       return g_list_position(GTK_CMCLIST(ctree)->row_list, (GList *)node);
 }
 
 /* get the next node, including the invisible one */
-GtkCTreeNode *gtkut_ctree_node_next(GtkCTree *ctree, GtkCTreeNode *node)
+GtkCMCTreeNode *gtkut_ctree_node_next(GtkCMCTree *ctree, GtkCMCTreeNode *node)
 {
-       GtkCTreeNode *parent;
+       GtkCMCTreeNode *parent;
 
        if (!node) return NULL;
 
-       if (GTK_CTREE_ROW(node)->children)
-               return GTK_CTREE_ROW(node)->children;
+       if (GTK_CMCTREE_ROW(node)->children)
+               return GTK_CMCTREE_ROW(node)->children;
 
-       if (GTK_CTREE_ROW(node)->sibling)
-               return GTK_CTREE_ROW(node)->sibling;
+       if (GTK_CMCTREE_ROW(node)->sibling)
+               return GTK_CMCTREE_ROW(node)->sibling;
 
-       for (parent = GTK_CTREE_ROW(node)->parent; parent != NULL;
-            parent = GTK_CTREE_ROW(parent)->parent) {
-               if (GTK_CTREE_ROW(parent)->sibling)
-                       return GTK_CTREE_ROW(parent)->sibling;
+       for (parent = GTK_CMCTREE_ROW(node)->parent; parent != NULL;
+            parent = GTK_CMCTREE_ROW(parent)->parent) {
+               if (GTK_CMCTREE_ROW(parent)->sibling)
+                       return GTK_CMCTREE_ROW(parent)->sibling;
        }
 
        return NULL;
 }
 
 /* get the previous node, including the invisible one */
-GtkCTreeNode *gtkut_ctree_node_prev(GtkCTree *ctree, GtkCTreeNode *node)
+GtkCMCTreeNode *gtkut_ctree_node_prev(GtkCMCTree *ctree, GtkCMCTreeNode *node)
 {
-       GtkCTreeNode *prev;
-       GtkCTreeNode *child;
+       GtkCMCTreeNode *prev;
+       GtkCMCTreeNode *child;
 
        if (!node) return NULL;
 
-       prev = GTK_CTREE_NODE_PREV(node);
-       if (prev == GTK_CTREE_ROW(node)->parent)
+       prev = GTK_CMCTREE_NODE_PREV(node);
+       if (prev == GTK_CMCTREE_ROW(node)->parent)
                return prev;
 
        child = prev;
-       while (GTK_CTREE_ROW(child)->children != NULL) {
-               child = GTK_CTREE_ROW(child)->children;
-               while (GTK_CTREE_ROW(child)->sibling != NULL)
-                       child = GTK_CTREE_ROW(child)->sibling;
+       while (GTK_CMCTREE_ROW(child)->children != NULL) {
+               child = GTK_CMCTREE_ROW(child)->children;
+               while (GTK_CMCTREE_ROW(child)->sibling != NULL)
+                       child = GTK_CMCTREE_ROW(child)->sibling;
        }
 
        return child;
 }
 
-gboolean gtkut_ctree_node_is_selected(GtkCTree *ctree, GtkCTreeNode *node)
+gboolean gtkut_ctree_node_is_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node)
 {
-       GtkCList *clist = GTK_CLIST(ctree);
+       GtkCMCList *clist = GTK_CMCLIST(ctree);
        GList *cur;
 
        for (cur = clist->selection; cur != NULL; cur = cur->next) {
-               if (node == GTK_CTREE_NODE(cur->data))
+               if (node == GTK_CMCTREE_NODE(cur->data))
                        return TRUE;
        }
 
        return FALSE;
 }
 
-GtkCTreeNode *gtkut_ctree_find_collapsed_parent(GtkCTree *ctree,
-                                               GtkCTreeNode *node)
+GtkCMCTreeNode *gtkut_ctree_find_collapsed_parent(GtkCMCTree *ctree,
+                                               GtkCMCTreeNode *node)
 {
        if (!node) return NULL;
 
-       while ((node = GTK_CTREE_ROW(node)->parent) != NULL) {
-               if (!GTK_CTREE_ROW(node)->expanded)
+       while ((node = GTK_CMCTREE_ROW(node)->parent) != NULL) {
+               if (!GTK_CMCTREE_ROW(node)->expanded)
                        return node;
        }
 
        return NULL;
 }
 
-void gtkut_ctree_expand_parent_all(GtkCTree *ctree, GtkCTreeNode *node)
+void gtkut_ctree_expand_parent_all(GtkCMCTree *ctree, GtkCMCTreeNode *node)
 {
        while ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
-               gtk_ctree_expand(ctree, node);
+               gtk_cmctree_expand(ctree, node);
 }
 
-gboolean gtkut_ctree_node_is_parent(GtkCTreeNode *parent, GtkCTreeNode *node)
+gboolean gtkut_ctree_node_is_parent(GtkCMCTreeNode *parent, GtkCMCTreeNode *node)
 {
-       GtkCTreeNode *tmp;
-       g_return_val_if_fail(node != NULL, FALSE);
-       g_return_val_if_fail(parent != NULL, FALSE);
+       GtkCMCTreeNode *tmp;
+       cm_return_val_if_fail(node != NULL, FALSE);
+       cm_return_val_if_fail(parent != NULL, FALSE);
        tmp = node;
        
        while (tmp) {
-               if(GTK_CTREE_ROW(tmp)->parent && GTK_CTREE_ROW(tmp)->parent == parent)
+               if(GTK_CMCTREE_ROW(tmp)->parent && GTK_CMCTREE_ROW(tmp)->parent == parent)
                        return TRUE;
-               tmp = GTK_CTREE_ROW(tmp)->parent;
+               tmp = GTK_CMCTREE_ROW(tmp)->parent;
        }
        
        return FALSE;
 }
 
-void gtkut_ctree_set_focus_row(GtkCTree *ctree, GtkCTreeNode *node)
+void gtkut_ctree_set_focus_row(GtkCMCTree *ctree, GtkCMCTreeNode *node)
 {
        if (node == NULL)
                return;
-       gtkut_clist_set_focus_row(GTK_CLIST(ctree),
+       gtkut_clist_set_focus_row(GTK_CMCLIST(ctree),
                                  gtkut_ctree_get_nth_from_node(ctree, node));
 }
 
-void gtkut_clist_set_focus_row(GtkCList *clist, gint row)
+void gtkut_clist_set_focus_row(GtkCMCList *clist, gint row)
 {
        clist->focus_row = row;
        GTKUT_CTREE_REFRESH(clist);
 }
 
-void gtkut_combo_set_items(GtkCombo *combo, const gchar *str1, ...)
-{
-       va_list args;
-       gchar *s;
-       GList *combo_items = NULL;
-
-       g_return_if_fail(str1 != NULL);
-
-       combo_items = g_list_append(combo_items, (gpointer)str1);
-       va_start(args, str1);
-       s = va_arg(args, gchar*);
-       while (s) {
-               combo_items = g_list_append(combo_items, (gpointer)s);
-               s = va_arg(args, gchar*);
-       }
-       va_end(args);
-
-       gtk_combo_set_popdown_strings(combo, combo_items);
-
-       g_list_free(combo_items);
-}
-
-gchar *gtkut_editable_get_selection(GtkEditable *editable)
-{
-       guint start_pos, end_pos;
-       gboolean found;
-
-       g_return_val_if_fail(GTK_IS_EDITABLE(editable), NULL);
-
-       found = gtk_editable_get_selection_bounds(editable,
-                                                 &start_pos, &end_pos);
-       if (found)
-               return gtk_editable_get_chars(editable, start_pos, end_pos);
-       else
-               return NULL;
-}
-
-void gtkut_editable_disable_im(GtkEditable *editable)
-{
-       g_return_if_fail(editable != NULL);
-
-#if USE_XIM
-       if (editable->ic) {
-               gdk_ic_destroy(editable->ic);
-               editable->ic = NULL;
-       }
-       if (editable->ic_attr) {
-               gdk_ic_attr_destroy(editable->ic_attr);
-               editable->ic_attr = NULL;
-       }
-#endif
-}
-
 void gtkut_container_remove(GtkContainer *container, GtkWidget *widget)
 {
        gtk_container_remove(container, widget);
 }
 
-gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
+static gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
                                        const GtkTextIter *iter,
                                        gunichar *wcs, gint len,
                                        gboolean case_sens)
@@ -535,7 +438,7 @@ gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
                return FALSE;
 }
 
-gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter *iter,
+static gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter *iter,
                                const gchar *str, gboolean case_sens,
                                GtkTextIter *match_pos)
 {
@@ -570,7 +473,7 @@ gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter *iter,
        return found;
 }
 
-gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
+static gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
                                         const GtkTextIter *iter,
                                         const gchar *str, gboolean case_sens,
                                         GtkTextIter *match_pos)
@@ -611,7 +514,7 @@ gchar *gtkut_text_view_get_selection(GtkTextView *textview)
        GtkTextIter start_iter, end_iter;
        gboolean found;
 
-       g_return_val_if_fail(GTK_IS_TEXT_VIEW(textview), NULL);
+       cm_return_val_if_fail(GTK_IS_TEXT_VIEW(textview), NULL);
 
        buffer = gtk_text_view_get_buffer(textview);
        found = gtk_text_buffer_get_selection_bounds(buffer,
@@ -630,7 +533,7 @@ void gtkut_text_view_set_position(GtkTextView *text, gint pos)
        GtkTextBuffer *buffer;
        GtkTextIter iter;
 
-       g_return_if_fail(text != NULL);
+       cm_return_if_fail(text != NULL);
 
        buffer = gtk_text_view_get_buffer(text);
 
@@ -647,13 +550,13 @@ gboolean gtkut_text_view_search_string(GtkTextView *text, const gchar *str,
        GtkTextMark *mark;
        gint len;
 
-       g_return_val_if_fail(text != NULL, FALSE);
-       g_return_val_if_fail(str != NULL, FALSE);
+       cm_return_val_if_fail(text != NULL, FALSE);
+       cm_return_val_if_fail(str != NULL, FALSE);
 
        buffer = gtk_text_view_get_buffer(text);
 
        len = g_utf8_strlen(str, -1);
-       g_return_val_if_fail(len >= 0, FALSE);
+       cm_return_val_if_fail(len >= 0, FALSE);
 
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -665,7 +568,7 @@ gboolean gtkut_text_view_search_string(GtkTextView *text, const gchar *str,
                gtk_text_iter_forward_chars(&end, len);
                /* place "insert" at the last character */
                gtk_text_buffer_select_range(buffer, &end, &match_pos);
-               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+               gtk_text_view_scroll_to_mark(text, mark, 0.0, TRUE, 0.0, 0.5);
                return TRUE;
        }
 
@@ -680,13 +583,13 @@ gboolean gtkut_text_view_search_string_backward(GtkTextView *text, const gchar *
        GtkTextMark *mark;
        gint len;
 
-       g_return_val_if_fail(text != NULL, FALSE);
-       g_return_val_if_fail(str != NULL, FALSE);
+       cm_return_val_if_fail(text != NULL, FALSE);
+       cm_return_val_if_fail(str != NULL, FALSE);
 
        buffer = gtk_text_view_get_buffer(text);
 
        len = g_utf8_strlen(str, -1);
-       g_return_val_if_fail(len >= 0, FALSE);
+       cm_return_val_if_fail(len >= 0, FALSE);
 
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -697,7 +600,7 @@ gboolean gtkut_text_view_search_string_backward(GtkTextView *text, const gchar *
 
                gtk_text_iter_forward_chars(&end, len);
                gtk_text_buffer_select_range(buffer, &match_pos, &end);
-               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+               gtk_text_view_scroll_to_mark(text, mark, 0.0, TRUE, 0.0, 0.5);
                return TRUE;
        }
 
@@ -706,36 +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;
 
-       g_return_if_fail(window != NULL);
-       g_return_if_fail(window->window != NULL);
+       gdkwin = gtk_widget_get_window(window);
+
+       cm_return_if_fail(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_present(GTK_WINDOW(window));
+       gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE);
+       gtk_window_present_with_time(GTK_WINDOW(window), time(NULL));
 }
 
 void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
 {
+       GdkWindow *gdkwin;
        gint x, y;
        gint sx, sy;
 
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(widget->window != NULL);
+       gdkwin = gtk_widget_get_window(widget);
+
+       cm_return_if_fail(widget != 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;
@@ -745,8 +655,8 @@ void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
 
 void gtkut_widget_draw_now(GtkWidget *widget)
 {
-       if (GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_DRAWABLE(widget))
-               gdk_window_process_updates(widget->window, FALSE);
+       if (widget && gtkut_widget_get_visible(widget) && gtkut_widget_is_drawable(widget))
+               gdk_window_process_updates(gtk_widget_get_window(widget), FALSE);
 }
 
 static void gtkut_clist_bindings_add(GtkWidget *clist)
@@ -754,9 +664,9 @@ static void gtkut_clist_bindings_add(GtkWidget *clist)
        GtkBindingSet *binding_set;
 
        binding_set = gtk_binding_set_by_class
-               (GTK_CLIST_GET_CLASS(clist));
+               (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);
@@ -770,60 +680,92 @@ void gtkut_widget_init(void)
 {
        GtkWidget *clist;
 
-       clist = gtk_clist_new(1);
+       clist = gtk_cmclist_new(1);
        g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+       g_object_ref_sink (G_OBJECT(clist));
+#else
+       gtk_object_ref (G_OBJECT(clist));
+       gtk_object_sink (G_OBJECT(clist));
+#endif
        gtkut_clist_bindings_add(clist);
        g_object_unref(G_OBJECT(clist));
 
-       clist = gtk_ctree_new(1, 0);
+       clist = gtk_cmctree_new(1, 0);
        g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+       g_object_ref_sink (G_OBJECT(clist));
+#else
+       gtk_object_ref (G_OBJECT(clist));
+       gtk_object_sink (G_OBJECT(clist));
+#endif
        gtkut_clist_bindings_add(clist);
        g_object_unref(G_OBJECT(clist));
 
        clist = gtk_sctree_new_with_titles(1, 0, NULL);
        g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+       g_object_ref_sink (G_OBJECT(clist));
+#else
+       gtk_object_ref (G_OBJECT(clist));
+       gtk_object_sink (G_OBJECT(clist));
+#endif
        gtkut_clist_bindings_add(clist);
        g_object_unref(G_OBJECT(clist));
 }
 
 void gtkut_widget_set_app_icon(GtkWidget *widget)
 {
-#include "pixmaps/claws-mail.xpm"
-       static GdkPixmap *sylpheedclawsxpm;
-       static GdkBitmap *sylpheedclawsxpmmask;
+       static GdkPixbuf *icon = NULL;
        
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(widget->window != NULL);
-       if (!sylpheedclawsxpm) {
-               PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
-                             claws_mail_xpm);
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
+       if (!icon) {
+               stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        }               
-       gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
+       if (icon)
+               gtk_window_set_icon(GTK_WINDOW(widget), icon);
 }
 
 void gtkut_widget_set_composer_icon(GtkWidget *widget)
 {
-       static GdkPixmap *xpm;
-       static GdkBitmap *bmp;
+       static GdkPixbuf *icon = NULL;
+       
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
+       if (!icon) {
+               stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
+       }               
+       if (icon)
+               gtk_window_set_icon(GTK_WINDOW(widget), icon);
+}
+
+static gboolean move_bar = FALSE;
+static gint move_bar_id = -1;
+
+static gboolean move_bar_cb(gpointer data)
+{
+       GtkWidget *w = (GtkWidget *)data;
+       if (!move_bar)
+               return FALSE;
 
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(widget->window != NULL);
-       if (!xpm) {
-               stock_pixmap_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &xpm, &bmp);
+       if (!GTK_IS_PROGRESS_BAR(w)) {
+               return FALSE;
        }
-       gdk_window_set_icon(widget->window, NULL, xpm, bmp);    
+
+       gtk_progress_bar_pulse(GTK_PROGRESS_BAR(w));
+       GTK_EVENTS_FLUSH();
+       return TRUE;
 }
 
 GtkWidget *label_window_create(const gchar *str)
 {
        GtkWidget *window;
-       GtkWidget *label;
+       GtkWidget *label, *vbox, *hbox;
+       GtkWidget *wait_progress = gtk_progress_bar_new();
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_size_request(window, 380, 60);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "gtkutils");
+       gtk_widget_set_size_request(window, 380, 70);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_title(GTK_WINDOW(window), str);
@@ -832,33 +774,58 @@ GtkWidget *label_window_create(const gchar *str)
        manage_window_set_transient(GTK_WINDOW(window));
 
        label = gtk_label_new(str);
-       gtk_container_add(GTK_CONTAINER(window), label);
+       
+       vbox = gtk_vbox_new(FALSE, 6);
+       hbox = gtk_hbox_new(FALSE, 6);
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
+       hbox = gtk_hbox_new(FALSE, 6);
+       gtk_box_pack_start(GTK_BOX(hbox), wait_progress, TRUE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       
+       gtk_container_add(GTK_CONTAINER(window), vbox);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-       gtk_widget_show(label);
+       gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
+       gtk_widget_show_all(vbox);
 
        gtk_widget_show_now(window);
        
+       if (move_bar_id == -1) {
+               move_bar_id = g_timeout_add(200, move_bar_cb, wait_progress);
+               move_bar = TRUE;
+       }
+
        GTK_EVENTS_FLUSH();
 
        return window;
 }
 
+void label_window_destroy(GtkWidget *window)
+{
+       move_bar = FALSE;
+       g_source_remove(move_bar_id);
+       move_bar_id = -1;
+       GTK_EVENTS_FLUSH();
+       gtk_widget_destroy(window);     
+}
+
 GtkWidget *gtkut_account_menu_new(GList                        *ac_list,
-                                 GCallback              callback,
-                                 gpointer               data)
+                                       GCallback               callback,
+                                 gpointer              data)
 {
        GList *cur_ac;
-       GtkWidget *menu;
+       GtkWidget *optmenu;
+       GtkListStore *menu;
+       GtkTreeIter iter;
+       PrefsAccount *account;
+       gchar *name;
        
-       g_return_val_if_fail(ac_list != NULL, NULL);
+       cm_return_val_if_fail(ac_list != NULL, NULL);
 
-       menu = gtk_menu_new();
+       optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
 
        for (cur_ac = ac_list; cur_ac != NULL; cur_ac = cur_ac->next) {
-               gchar *name;
-               GtkWidget *menuitem;
-               PrefsAccount *account;
-               
                account = (PrefsAccount *) cur_ac->data;
                if (account->name)
                        name = g_strdup_printf("%s: %s <%s>",
@@ -869,13 +836,15 @@ GtkWidget *gtkut_account_menu_new(GList                   *ac_list,
                        name = g_strdup_printf("%s: %s",
                                               account->account_name,
                                               account->address);
-               MENUITEM_ADD(menu, menuitem, name, account->account_id);
+               COMBOBOX_ADD_ESCAPED(menu, name, account->account_id);
                g_free(name);
-               if (callback != NULL)
-                       g_signal_connect(G_OBJECT(menuitem), "activate",
-                                        callback, data);
        }
-       return menu;
+       gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), 0);
+
+       if( callback != NULL )
+               g_signal_connect(G_OBJECT(optmenu), "changed", callback, data);
+
+       return optmenu;
 }
 
 void gtkut_set_widget_bgcolor_rgb(GtkWidget *widget, guint rgbvalue)
@@ -900,7 +869,7 @@ GtkWidget *gtkut_get_focused_child(GtkContainer *parent)
        GList *child_list = NULL;
        GList *c;
 
-       g_return_val_if_fail(parent, NULL);
+       cm_return_val_if_fail(parent, NULL);
 
        /* Get children list and see which has the focus. */
        child_list = gtk_container_get_children(parent);
@@ -909,7 +878,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 (gtkut_widget_has_focus(GTK_WIDGET(c->data))) {
                                result = GTK_WIDGET(c->data);
                                break;
                        }
@@ -981,8 +950,38 @@ GtkWidget *gtkut_get_replace_btn(const gchar *button_label)
        return button;
 }
 
+/**
+ * merge some part of code into one function : it creates a frame and add
+ *     these into gtk box widget passed in param.
+ * \param box gtk box where adding new created frame.
+ * \param pframe pointer with which to assign the frame. If NULL, no pointer
+ *     is assigned but the frame is anyway created and added to @box.
+ * \param frame_label frame label of new created frame.
+ */
+GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **pframe,
+               const gchar *frame_label)
+{
+       GtkWidget *vbox;
+       GtkWidget *frame;
+
+       frame = gtk_frame_new(frame_label);
+       gtk_widget_show(frame);
+       gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
+       gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5);
+
+       vbox = gtk_vbox_new (FALSE, 4);
+       gtk_widget_show(vbox);
+       gtk_container_add(GTK_CONTAINER (frame), vbox);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+
+       if (pframe != NULL)
+               *pframe = frame;
+
+       return vbox;
+}
+
 #if HAVE_LIBCOMPFACE
-gint create_xpm_from_xface(gchar *xpm[], const gchar *xface)
+static gint create_xpm_from_xface(gchar *xpm[], const gchar *xface)
 {
        static gchar *bit_pattern[] = {
                "....",
@@ -1084,8 +1083,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));
 
@@ -1110,10 +1107,8 @@ 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_pixmap(pixmap, mask);
+       return gtk_image_new_from_pixbuf(
+               gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
 }
 #endif
 
@@ -1163,12 +1158,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);
@@ -1177,10 +1175,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);
@@ -1203,7 +1204,7 @@ static void link_btn_clicked(GtkButton *button, gpointer data)
        gchar *url = (gchar *)data;
        gtk_button_set_relief(button, GTK_RELIEF_NONE);
        gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
-       open_uri(url, prefs_common.uri_cmd);
+       open_uri(url, prefs_common_get_uri_cmd());
 }
 
 static void link_btn_unrealize(GtkButton *button, gpointer data)
@@ -1218,9 +1219,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;
@@ -1232,10 +1235,12 @@ 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(btn)->child;
-       cmap = gdk_drawable_get_colormap(window->window);
+       btn_label = gtk_bin_get_child(GTK_BIN((btn)));
+#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
@@ -1244,8 +1249,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");
+#endif
 
        g_signal_connect(G_OBJECT(btn), "enter",
                         G_CALLBACK(link_btn_enter), window);
@@ -1264,27 +1271,44 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
        return btn;
 }
 
+static gboolean _combobox_separator_func(GtkTreeModel *model,
+               GtkTreeIter *iter, gpointer data)
+{
+       gchar *txt = NULL;
+
+       cm_return_val_if_fail(model != NULL, FALSE);
+
+       gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
+
+       if( txt == NULL )
+               return TRUE;
+       return FALSE;
+}
+
 GtkWidget *gtkut_sc_combobox_create(GtkWidget *eventbox, gboolean focus_on_click)
 {
        GtkWidget *combobox;
        GtkListStore *menu;
        GtkCellRenderer *rend;
 
-       menu = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+       menu = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
 
        combobox = gtk_combo_box_new_with_model(GTK_TREE_MODEL(menu));
 
        rend = gtk_cell_renderer_text_new();
        gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), rend, TRUE);
        gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), rend,
-                       "markup", 0,
+                       "markup", COMBOBOX_TEXT,
+                       "sensitive", COMBOBOX_SENS,
                        NULL);
 
        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);
+
        return combobox;
 }
 
@@ -1305,12 +1329,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);
@@ -1323,16 +1347,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,
@@ -1341,9 +1364,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,
@@ -1360,28 +1382,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
@@ -1396,11 +1421,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,
@@ -1408,9 +1433,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,
@@ -1423,26 +1447,551 @@ 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);
                }
        }
 }
+
+gboolean gtkut_tree_model_text_iter_prev(GtkTreeModel *model,
+                                GtkTreeIter *iter,
+                                const gchar* text)
+/* do the same as gtk_tree_model_iter_next, but _prev instead.
+   to use with widgets with one text column (gtk_combo_box_new_text()
+   and with GtkComboBoxEntry's for instance),
+*/
+{
+       GtkTreeIter cur_iter;
+       gchar *cur_value;
+       gboolean valid;
+       gint count;
+
+       cm_return_val_if_fail(model != NULL, FALSE);
+       cm_return_val_if_fail(iter != NULL, FALSE);
+
+       if (text == NULL || *text == '\0')
+               return FALSE;
+
+       valid = gtk_tree_model_get_iter_first(model, &cur_iter);
+       count = 0;
+       while (valid) {
+               gtk_tree_model_get(model, &cur_iter, 0, &cur_value, -1);
+
+               if (strcmp(text, cur_value) == 0) {
+                       if (count <= 0)
+                               return FALSE;
+
+                       return gtk_tree_model_iter_nth_child(model, iter, NULL, count - 1);
+               }
+
+               valid = gtk_tree_model_iter_next(model, &cur_iter);
+               count++;
+       }
+       return FALSE;           
+}
+
+gboolean gtkut_tree_model_get_iter_last(GtkTreeModel *model,
+                                GtkTreeIter *iter)
+/* do the same as gtk_tree_model_get_iter_first, but _last instead.
+*/
+{
+       gint count;
+
+       cm_return_val_if_fail(model != NULL, FALSE);
+       cm_return_val_if_fail(iter != NULL, FALSE);
+
+       count = gtk_tree_model_iter_n_children(model, NULL);
+
+       if (count <= 0)
+               return FALSE;
+
+       return gtk_tree_model_iter_nth_child(model, iter, NULL, count - 1);
+}
+
+GtkWidget *gtkut_window_new            (GtkWindowType   type,
+                                        const gchar    *class)
+{
+#ifndef MAEMO
+       GtkWidget *window = gtk_window_new(type);
+#else
+       GtkWidget *window = hildon_window_new();
+       hildon_program_add_window(hildon_program, HILDON_WINDOW(window));
+#endif
+       gtk_window_set_role(GTK_WINDOW(window), class);
+       return window;
+}
+
+static gboolean gtkut_tree_iter_comp(GtkTreeModel *model, 
+                                    GtkTreeIter *iter1, 
+                                    GtkTreeIter *iter2)
+{
+       GtkTreePath *path1 = gtk_tree_model_get_path(model, iter1);
+       GtkTreePath *path2 = gtk_tree_model_get_path(model, iter2);
+       gboolean result;
+
+       result = gtk_tree_path_compare(path1, path2) == 0;
+
+       gtk_tree_path_free(path1);
+       gtk_tree_path_free(path2);
+       
+       return result;
+}
+
+/*!
+ *\brief       Get selected row number.
+ */
+gint gtkut_list_view_get_selected_row(GtkWidget *list_view)
+{
+       GtkTreeView *view = GTK_TREE_VIEW(list_view);
+       GtkTreeModel *model = gtk_tree_view_get_model(view);
+       int n_rows = gtk_tree_model_iter_n_children(model, NULL);
+       GtkTreeSelection *selection;
+       GtkTreeIter iter;
+       int row;
+
+       if (n_rows == 0) 
+               return -1;
+       
+       selection = gtk_tree_view_get_selection(view);
+       if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+               return -1;
+       
+       /* get all iterators and compare them... */
+       for (row = 0; row < n_rows; row++) {
+               GtkTreeIter itern;
+
+               gtk_tree_model_iter_nth_child(model, &itern, NULL, row);
+               if (gtkut_tree_iter_comp(model, &iter, &itern))
+                       return row;
+       }
+       
+       return -1;
+}
+
+/*!
+ *\brief       Select a row by its number.
+ */
+gboolean gtkut_list_view_select_row(GtkWidget *list, gint row)
+{
+       GtkTreeView *list_view = GTK_TREE_VIEW(list);
+       GtkTreeSelection *selection = gtk_tree_view_get_selection(list_view);
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       GtkTreeIter iter;
+       GtkTreePath *path;
+
+       if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
+               return FALSE;
+       
+       gtk_tree_selection_select_iter(selection, &iter);
+
+       path = gtk_tree_model_get_path(model, &iter);
+       gtk_tree_view_set_cursor(list_view, path, NULL, FALSE);
+       gtk_tree_path_free(path);
+       
+       return TRUE;
+}
+
+static GtkUIManager *gui_manager = NULL;
+
+GtkUIManager *gtkut_create_ui_manager(void)
+{
+       cm_return_val_if_fail(gui_manager == NULL, gui_manager);
+       return (gui_manager = gtk_ui_manager_new());
+}
+
+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;
+  GDestroyNotify notify;
+  gpointer data;
+};
+
+static gboolean  
+claws_io_invoke (GIOChannel   *source,
+              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);
+
+  return TRUE;
+}
+
+static void
+claws_io_destroy (gpointer data)
+{
+  ClawsIOClosure *closure = data;
+
+  if (closure->notify)
+    closure->notify (closure->data);
+
+  g_free (closure);
+}
+
+gint
+claws_input_add    (gint             source,
+                   GdkInputCondition condition,
+                   GdkInputFunction  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
+  if (is_sock)
+    channel = g_io_channel_win32_new_socket(source);
+  else
+    channel = g_io_channel_win32_new_fd(source);
+#endif
+  result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond, 
+                               claws_io_invoke,
+                               closure, claws_io_destroy);
+  g_io_channel_unref (channel);
+
+  return result;
+}
+
+gboolean gtkut_widget_has_focus(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_has_focus(widget);
+#else
+       return GTK_WIDGET_HAS_FOCUS(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_can_focus(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_get_can_focus(widget);
+#else
+       return GTK_WIDGET_CAN_FOCUS(widget);
+#endif
+}
+
+gboolean gtkut_widget_has_grab(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_has_grab(widget);
+#else
+       return GTK_WIDGET_HAS_GRAB(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_visible(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_get_visible(widget);
+#else
+       return GTK_WIDGET_VISIBLE(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_realized(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,19,0)
+       return gtk_widget_get_realized(widget);
+#else
+       return GTK_WIDGET_REALIZED(widget);
+#endif
+}
+
+gboolean gtkut_widget_is_sensitive(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_is_sensitive(widget);
+#else
+       return GTK_WIDGET_IS_SENSITIVE(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_sensitive(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_get_sensitive(widget);
+#else
+       return GTK_WIDGET_SENSITIVE(widget);
+#endif
+}
+
+gboolean gtkut_widget_is_drawable(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_is_drawable(widget);
+#else
+       return GTK_WIDGET_DRAWABLE(widget);
+#endif
+}
+
+GtkStateType gtkut_widget_get_state(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_get_state(widget);
+#else
+       return GTK_WIDGET_STATE(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_mapped(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,19,0)
+       return gtk_widget_get_mapped(widget);
+#else
+       return GTK_WIDGET_MAPPED(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_has_window(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_get_has_window(widget);
+#else
+       return GTK_WIDGET_NO_WINDOW(widget);
+#endif
+}
+
+gboolean gtkut_widget_get_app_paintable(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+       return gtk_widget_get_app_paintable(widget);
+#else
+       return GTK_WIDGET_APP_PAINTABLE(widget);
+#endif
+}
+
+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;
+}