Auto-configuration: set port only when not default
[claws.git] / src / gtk / gtkutils.c
index 7bf39da1e78881275e5cca814ecbdecbdd68eb18..4eabff0556363e3c9b2de949445ff965c730114e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 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
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.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>
+#include "gtk/gtksctree.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
@@ -61,7 +57,6 @@
 #include "prefs_account.h"
 #include "prefs_common.h"
 #include "manage_window.h"
-#include "base64.h"
 #include "manual.h"
 #include "combobox.h"
 
@@ -71,10 +66,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);
@@ -88,19 +83,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);
@@ -108,13 +109,24 @@ 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);
@@ -129,8 +141,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);
@@ -143,28 +155,28 @@ 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);
        }
@@ -175,8 +187,8 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                                   GtkWidget **button2, const gchar *label2, const gchar *text2,
                                   GtkWidget **button3, const gchar *label3, const gchar *text3)
 {
-       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);
@@ -185,22 +197,24 @@ 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);
 
        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));
+               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);
        }
 
        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));
+               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);
        }
@@ -213,24 +227,24 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
 #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 &&
@@ -242,11 +256,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;
        }
 }
@@ -255,115 +269,119 @@ 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)
 {
+       gtk_cmclist_freeze(GTK_CMCLIST(ctree));
+
        while ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
-               gtk_ctree_expand(ctree, node);
+               gtk_cmctree_expand(ctree, node);
+
+       gtk_cmclist_thaw(GTK_CMCLIST(ctree));
 }
 
-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);
@@ -433,7 +451,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);
        }
@@ -469,7 +487,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;
@@ -496,7 +515,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,
@@ -514,14 +533,16 @@ void gtkut_text_view_set_position(GtkTextView *text, gint pos)
 {
        GtkTextBuffer *buffer;
        GtkTextIter iter;
+       GtkTextMark *mark;
 
-       g_return_if_fail(text != NULL);
+       cm_return_if_fail(text != NULL);
 
        buffer = gtk_text_view_get_buffer(text);
 
        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,
@@ -532,13 +553,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);
@@ -550,7 +571,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;
        }
 
@@ -565,13 +586,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);
@@ -582,7 +603,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;
        }
 
@@ -591,41 +612,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_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;
 
-       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;
@@ -635,8 +658,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)
@@ -644,13 +667,13 @@ 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);
-       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);
@@ -660,51 +683,61 @@ void gtkut_widget_init(void)
 {
        GtkWidget *clist;
 
-       clist = gtk_clist_new(1);
-       gtk_object_ref(GTK_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+       clist = gtk_cmclist_new(1);
+       g_object_ref(G_OBJECT(clist));
+       g_object_ref_sink (G_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
-       gtk_object_unref(GTK_OBJECT(clist));
+       g_object_unref(G_OBJECT(clist));
 
-       clist = gtk_ctree_new(1, 0);
-       gtk_object_ref(GTK_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+       clist = gtk_cmctree_new(1, 0);
+       g_object_ref(G_OBJECT(clist));
+       g_object_ref_sink (G_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
-       gtk_object_unref(GTK_OBJECT(clist));
+       g_object_unref(G_OBJECT(clist));
 
        clist = gtk_sctree_new_with_titles(1, 0, NULL);
-       gtk_object_ref(GTK_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+       g_object_ref(G_OBJECT(clist));
+       g_object_ref_sink (G_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
-       gtk_object_unref(GTK_OBJECT(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;
-       
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(widget->window != NULL);
-       if (!sylpheedclawsxpm) {
-               PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
-                             claws_mail_xpm);
-       }               
-       gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
+       static GList *icon_list = NULL;
+
+       cm_return_if_fail(widget != NULL);
+       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);
+               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 GdkPixmap *xpm;
-       static GdkBitmap *bmp;
-
-       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);
+       static GList *icon_list = NULL;
+
+       cm_return_if_fail(widget != NULL);
+       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);
+               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);
        }
-       gdk_window_set_icon(widget->window, NULL, xpm, bmp);    
+       if (icon_list)
+               gtk_window_set_icon_list(GTK_WINDOW(widget), icon_list);
 }
 
 static gboolean move_bar = FALSE;
@@ -787,7 +820,7 @@ GtkWidget *gtkut_account_menu_new(GList                     *ac_list,
        PrefsAccount *account;
        gchar *name;
        
-       g_return_val_if_fail(ac_list != NULL, NULL);
+       cm_return_val_if_fail(ac_list != NULL, NULL);
 
        optmenu = gtkut_sc_combobox_create(NULL, FALSE);
        menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
@@ -836,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);
@@ -845,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 (gtk_widget_has_focus(GTK_WIDGET(c->data))) {
                                result = GTK_WIDGET(c->data);
                                break;
                        }
@@ -1045,20 +1078,14 @@ gboolean get_tag_range(GtkTextIter *iter,
 }
 
 #if HAVE_LIBCOMPFACE
-GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
-                                GdkWindow *window)
+GtkWidget *xface_get_from_header(const gchar *o_xface)
 {
        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));
+       strncpy(xface, o_xface, sizeof(xface) - 1);
+       xface[sizeof(xface) - 1] = '\0';
 
-       if (!window) {
-               g_warning("no window\n");
-               return NULL;
-       }
        if (uncompface(xface) < 0) {
                g_warning("uncompface failed\n");
                return NULL;
@@ -1076,9 +1103,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));
 }
@@ -1087,8 +1111,8 @@ GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,
 GtkWidget *face_get_from_header(const gchar *o_face)
 {
        gchar face[2048];
-       gchar face_png[2048];
-       gint pngsize;
+       gchar *face_png;
+       gsize pngsize;
        GdkPixbuf *pixbuf;
        GError *error = NULL;
        GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
@@ -1102,14 +1126,17 @@ GtkWidget *face_get_from_header(const gchar *o_face)
        unfold_line(face); /* strip all whitespace and linebreaks */
        remove_space(face);
 
-       pngsize = base64_decode(face_png, face, strlen(face));
+       face_png = g_base64_decode(face, &pngsize);
+       debug_print("---------------------- loaded face png\n");
 
        if (!gdk_pixbuf_loader_write (loader, face_png, pngsize, &error) ||
            !gdk_pixbuf_loader_close (loader, &error)) {
                g_warning("loading face failed\n");
                g_object_unref(loader);
+               g_free(face_png);
                return NULL;
        }
+       g_free(face_png);
 
        pixbuf = g_object_ref(gdk_pixbuf_loader_get_pixbuf(loader));
 
@@ -1117,7 +1144,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;
        }
 
@@ -1130,12 +1157,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);
@@ -1144,10 +1174,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);
@@ -1170,7 +1203,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)
@@ -1185,9 +1218,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;
@@ -1199,10 +1234,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
@@ -1211,8 +1248,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);
@@ -1236,12 +1275,14 @@ static gboolean _combobox_separator_func(GtkTreeModel *model,
 {
        gchar *txt = NULL;
 
-       g_return_val_if_fail(model != NULL, FALSE);
+       cm_return_val_if_fail(model != NULL, FALSE);
 
        gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
 
        if( txt == NULL )
                return TRUE;
+       
+       g_free(txt);
        return FALSE;
 }
 
@@ -1264,9 +1305,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);
@@ -1291,12 +1330,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);
@@ -1309,16 +1348,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,
@@ -1327,9 +1365,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,
@@ -1346,28 +1383,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
@@ -1382,11 +1422,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,
@@ -1394,9 +1434,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,
@@ -1409,24 +1448,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);
                }
@@ -1446,8 +1489,8 @@ gboolean gtkut_tree_model_text_iter_prev(GtkTreeModel *model,
        gboolean valid;
        gint count;
 
-       g_return_val_if_fail(model != NULL, FALSE);
-       g_return_val_if_fail(iter != NULL, FALSE);
+       cm_return_val_if_fail(model != NULL, FALSE);
+       cm_return_val_if_fail(iter != NULL, FALSE);
 
        if (text == NULL || *text == '\0')
                return FALSE;
@@ -1477,8 +1520,8 @@ gboolean gtkut_tree_model_get_iter_last(GtkTreeModel *model,
 {
        gint count;
 
-       g_return_val_if_fail(model != NULL, FALSE);
-       g_return_val_if_fail(iter != NULL, FALSE);
+       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);
 
@@ -1491,12 +1534,7 @@ gboolean gtkut_tree_model_get_iter_last(GtkTreeModel *model,
 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;
 }
@@ -1540,8 +1578,8 @@ gint gtkut_list_view_get_selected_row(GtkWidget *list_view)
        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))
+               if (gtk_tree_model_iter_nth_child(model, &itern, NULL, row)
+                && gtkut_tree_iter_comp(model, &iter, &itern))
                        return row;
        }
        
@@ -1571,3 +1609,422 @@ gboolean gtkut_list_view_select_row(GtkWidget *list, gint row)
        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;
+}
+
+typedef struct _ClawsIOClosure ClawsIOClosure;
+
+struct _ClawsIOClosure
+{
+  ClawsIOFunc function;
+  GIOCondition condition;
+  GDestroyNotify notify;
+  gpointer data;
+};
+
+static gboolean  
+claws_io_invoke (GIOChannel   *source,
+                GIOCondition  condition,
+                gpointer      data)
+{
+  ClawsIOClosure *closure = data;
+  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;
+}
+
+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,
+                   GIOCondition      condition,
+                   ClawsIOFunc       function,
+                   gpointer          data,
+                   gboolean          is_sock)
+{
+  guint result;
+  ClawsIOClosure *closure = g_new (ClawsIOClosure, 1);
+  GIOChannel *channel;
+
+  closure->function = function;
+  closure->condition = condition;
+  closure->notify = NULL;
+  closure->data = data;
+
+#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, 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;
+}
+
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+static void auto_configure_done(const gchar *hostname, gint port, gboolean ssl, AutoConfigureData *data)
+{
+       if (hostname != NULL) {
+               if (data->hostname_entry)
+                       gtk_entry_set_text(data->hostname_entry, hostname);
+               if (data->set_port)
+                       gtk_toggle_button_set_active(data->set_port,
+                               (ssl && port != data->default_ssl_port) || (!ssl && port != data->default_port));
+               if (data->port)
+                       gtk_spin_button_set_value(data->port, port);
+               else if (data->hostname_entry) {
+                       if ((ssl && port != data->default_ssl_port) || (!ssl && port != data->default_port)) {
+                               gchar *tmp = g_strdup_printf("%s:%d", hostname, port);
+                               gtk_entry_set_text(data->hostname_entry, tmp);
+                               g_free(tmp);
+                       } else
+                               gtk_entry_set_text(data->hostname_entry, hostname);
+               }
+
+               if (ssl && data->ssl_checkbtn) {
+                       gtk_toggle_button_set_active(data->ssl_checkbtn, TRUE);
+                       gtk_toggle_button_set_active(data->tls_checkbtn, FALSE);
+               } else if (data->tls_checkbtn) {
+                       if (!GTK_IS_RADIO_BUTTON(data->ssl_checkbtn)) {
+                               /* Wizard where TLS is [x]SSL + [x]TLS */
+                               gtk_toggle_button_set_active(data->ssl_checkbtn, TRUE);
+                       }
+                       gtk_toggle_button_set_active(data->tls_checkbtn, TRUE);
+               }
+
+               /* Check authentication by default. This is probably required if
+                * auto-configuration worked.
+                */
+               if (data->auth_checkbtn)
+                       gtk_toggle_button_set_active(data->auth_checkbtn, TRUE);
+
+               /* Set user ID to full email address, which is used by the
+                * majority of providers where auto-configuration works.
+                */
+               if (data->uid_entry)
+                       gtk_entry_set_text(data->uid_entry, data->address);
+
+               gtk_label_set_text(data->info_label, _("Done."));
+       } else {
+       gtk_label_set_text(data->info_label, _("Failed."));
+       }
+       gtk_widget_show(GTK_WIDGET(data->configure_button));
+       gtk_widget_hide(GTK_WIDGET(data->cancel_button));
+       g_free(data->address);
+       g_free(data);
+}
+
+static void resolve_done(GObject *source, GAsyncResult *result, gpointer user_data)
+{
+       AutoConfigureData *data = (AutoConfigureData *)user_data;
+       GResolver *resolver = (GResolver *)source;
+       GError *error = NULL;
+       gchar *hostname = NULL;
+       guint16 port;
+       GList *answers, *cur;
+       gboolean found = FALSE;
+       gboolean abort = FALSE;
+
+       answers = g_resolver_lookup_service_finish(resolver, result, &error);
+
+       if (answers) {
+               for (cur = g_srv_target_list_sort(answers); cur; cur = cur->next) {
+                       GSrvTarget *target = (GSrvTarget *)cur->data;
+                       const gchar *h = g_srv_target_get_hostname(target);
+                       port = g_srv_target_get_port(target);
+                       if (h && strcmp(h,"") && port > 0) {
+                               hostname = g_strdup(h);
+                               found = TRUE;
+                               break;
+                       }
+               }
+               g_resolver_free_targets(answers);
+       } else if (error) {
+               if (error->code == G_IO_ERROR_CANCELLED)
+                       abort = TRUE;
+               debug_print("error %s\n", error->message);
+               g_error_free(error);
+       }
+
+       if (found) {
+               auto_configure_done(hostname, port, data->ssl_service != NULL, data);
+       } else if (data->ssl_service && !abort) {
+               /* Fallback to TLS */
+               data->ssl_service = NULL;
+               auto_configure_service(data);
+       } else {
+               auto_configure_done(NULL, 0, FALSE, data);
+       }
+       g_free(hostname);
+       g_object_unref(resolver);
+}
+
+void auto_configure_service(AutoConfigureData *data)
+{
+       GResolver *resolver;
+       const gchar *cur_service = data->ssl_service != NULL ? data->ssl_service : data->tls_service;
+
+       cm_return_if_fail(cur_service != NULL);
+       cm_return_if_fail(data->address != NULL);
+
+       resolver = g_resolver_get_default();
+       if (resolver != NULL) {
+               const gchar *domain = strchr(data->address, '@') + 1;
+
+               gtk_label_set_text(data->info_label, _("Configuring..."));
+               gtk_widget_hide(GTK_WIDGET(data->configure_button));
+               gtk_widget_show(GTK_WIDGET(data->cancel_button));
+               g_resolver_lookup_service_async(resolver, cur_service, "tcp", domain,
+                                       data->cancel, resolve_done, data);
+       }
+}
+
+gboolean auto_configure_service_sync(const gchar *service, const gchar *domain, gchar **srvhost, guint16 *srvport)
+{
+       GResolver *resolver;
+       GList *answers, *cur;
+       GError *error = NULL;
+       gboolean result = FALSE;
+
+       cm_return_val_if_fail(service != NULL, FALSE);
+       cm_return_val_if_fail(domain != NULL, FALSE);
+
+       resolver = g_resolver_get_default();
+       if (resolver == NULL)
+               return FALSE;
+
+       answers = g_resolver_lookup_service(resolver, service, "tcp", domain, NULL, &error);
+
+       *srvhost = NULL;
+       *srvport = 0;
+
+       if (answers) {
+               for (cur = g_srv_target_list_sort(answers); cur; cur = cur->next) {
+                       GSrvTarget *target = (GSrvTarget *)cur->data;
+                       const gchar *hostname = g_srv_target_get_hostname(target);
+                       guint16 port = g_srv_target_get_port(target);
+                       if (hostname && strcmp(hostname,"") && port > 0) {
+                               result = TRUE;
+                               *srvhost = g_strdup(hostname);
+                               *srvport = port;
+                               break;
+                       }
+               }
+               g_resolver_free_targets(answers);
+       } else if (error) {
+               g_error_free(error);
+       }
+
+       g_object_unref(resolver);
+       return result;
+}
+#endif