2010-10-17 [colin] 3.7.6cvs56
[claws.git] / src / gtk / gtkutils.c
index bef9b0e152fcbc4ca8c7f37bc212f99c6a49deea..4fa559ba57b7b9a34e6ed9d4173a8bf27d601145 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-2009 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
 #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>
@@ -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(widget->style != 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,7 +197,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
        *button1 = gtk_button_new_with_mnemonic(text1);
        gtk_button_set_image(GTK_BUTTON(*button1),
                gtk_image_new_from_stock(label1, GTK_ICON_SIZE_BUTTON));
-       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*button1, TRUE);
        gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
        gtk_widget_show(*button1);
 
@@ -193,7 +205,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                *button2 = gtk_button_new_with_mnemonic(text2);
                gtk_button_set_image(GTK_BUTTON(*button2),
                        gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
-               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button2, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
@@ -202,7 +214,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                *button3 = gtk_button_new_with_mnemonic(text3);
                gtk_button_set_image(GTK_BUTTON(*button3),
                        gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
-               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button3, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }
@@ -215,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 &&
@@ -244,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;
        }
 }
@@ -257,115 +269,115 @@ 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);
@@ -498,7 +510,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,
@@ -517,7 +529,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);
 
@@ -534,13 +546,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);
@@ -552,7 +564,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;
        }
 
@@ -567,13 +579,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);
@@ -584,7 +596,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;
        }
 
@@ -595,8 +607,8 @@ void gtkut_window_popup(GtkWidget *window)
 {
        gint x, y, sx, sy, new_x, new_y;
 
-       g_return_if_fail(window != NULL);
-       g_return_if_fail(window->window != NULL);
+       cm_return_if_fail(window != NULL);
+       cm_return_if_fail(window->window != NULL);
 
        sx = gdk_screen_width();
        sy = gdk_screen_height();
@@ -608,11 +620,7 @@ void gtkut_window_popup(GtkWidget *window)
                gdk_window_move(window->window, 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)
@@ -620,8 +628,8 @@ void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
        gint x, y;
        gint sx, sy;
 
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(widget->window != NULL);
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(widget->window != NULL);
 
        sx = gdk_screen_width();
        sy = gdk_screen_height();
@@ -637,7 +645,7 @@ 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))
+       if (widget && gtkut_widget_get_visible(widget) && gtkut_widget_is_drawable(widget))
                gdk_window_process_updates(widget->window, FALSE);
 }
 
@@ -646,7 +654,7 @@ 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,
                                     "scroll_vertical", 2,
@@ -662,51 +670,64 @@ 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));
+#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);
-       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));
+#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);
-       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));
+#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);
-       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;
+       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(widget->window != 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;
-
-       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);
-       }
-       gdk_window_set_icon(widget->window, NULL, xpm, bmp);    
+       static GdkPixbuf *icon = NULL;
+       
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(widget->window != 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;
@@ -789,7 +810,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)));
@@ -838,7 +859,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);
@@ -847,7 +868,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;
                        }
@@ -1052,7 +1073,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));
@@ -1078,9 +1098,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));
 }
@@ -1201,7 +1218,7 @@ 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;
+       btn_label = gtk_bin_get_child(GTK_BIN((btn)));
        cmap = gdk_drawable_get_colormap(window->window);
        gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
        if (success[0] == TRUE && success[1] == TRUE) {
@@ -1238,7 +1255,7 @@ 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);
 
@@ -1266,9 +1283,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);
@@ -1448,8 +1463,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;
@@ -1479,8 +1494,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);
 
@@ -1573,3 +1588,280 @@ 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;
+}
+
+#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
+}