2011-10-22 [colin] 3.7.10cvs41
authorColin Leroy <colin@colino.net>
Sat, 22 Oct 2011 17:09:05 +0000 (17:09 +0000)
committerColin Leroy <colin@colino.net>
Sat, 22 Oct 2011 17:09:05 +0000 (17:09 +0000)
* src/account.c
* src/addr_compl.c
* src/addrgather.c
* src/compose.c
* src/editldap.c
* src/expldifdlg.c
* src/folderview.c
* src/grouplistdialog.c
* src/headerview.c
* src/importldif.c
* src/main.c
* src/mainwindow.c
* src/mimeview.c
* src/noticeview.c
* src/prefs_account.c
* src/prefs_actions.c
* src/prefs_ext_prog.c
* src/prefs_filtering.c
* src/prefs_folder_item.c
* src/prefs_image_viewer.c
* src/prefs_logging.c
* src/prefs_msg_colors.c
* src/prefs_other.c
* src/prefs_send.c
* src/prefs_spelling.c
* src/prefs_summaries.c
* src/prefs_template.c
* src/printing.c
* src/quote_fmt.c
* src/send_message.c
* src/statusbar.c
* src/summary_search.c
* src/summaryview.c
* src/wizard.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtksctree.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/gtk/inputdialog.c
* src/gtk/pluginwindow.c
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/dillo_viewer/dillo_prefs.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
* src/plugins/trayicon/trayicon_prefs.c
Remove all possible #if GTK_CHECK_VERSION() checks,
and make Claws build with GTK+2.16 (untested right
now), as the Gpg4Win project uses GTK+2.16 currently.

54 files changed:
ChangeLog
PATCHSETS
configure.ac
src/account.c
src/addr_compl.c
src/addrgather.c
src/compose.c
src/editldap.c
src/expldifdlg.c
src/folderview.c
src/grouplistdialog.c
src/gtk/gtkcmclist.c
src/gtk/gtkcmctree.c
src/gtk/gtkcmoptionmenu.c
src/gtk/gtksctree.c
src/gtk/gtkutils.c
src/gtk/gtkutils.h
src/gtk/gtkvscrollbutton.c
src/gtk/inputdialog.c
src/gtk/pluginwindow.c
src/gtk/quicksearch.c
src/gtk/spell_entry.c
src/headerview.c
src/importldif.c
src/main.c
src/mainwindow.c
src/mimeview.c
src/noticeview.c
src/plugins/bogofilter/bogofilter_gtk.c
src/plugins/dillo_viewer/dillo_prefs.c
src/plugins/pgpcore/prefs_gpg.c
src/plugins/spamassassin/spamassassin_gtk.c
src/plugins/trayicon/trayicon.c
src/plugins/trayicon/trayicon_prefs.c
src/prefs_account.c
src/prefs_actions.c
src/prefs_ext_prog.c
src/prefs_filtering.c
src/prefs_folder_item.c
src/prefs_image_viewer.c
src/prefs_logging.c
src/prefs_msg_colors.c
src/prefs_other.c
src/prefs_send.c
src/prefs_spelling.c
src/prefs_summaries.c
src/prefs_template.c
src/printing.c
src/quote_fmt.c
src/send_message.c
src/statusbar.c
src/summary_search.c
src/summaryview.c
src/wizard.c

index a662935..2041ddf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+2011-10-22 [colin]     3.7.10cvs41
+
+       * src/account.c
+       * src/addr_compl.c
+       * src/addrgather.c
+       * src/compose.c
+       * src/editldap.c
+       * src/expldifdlg.c
+       * src/folderview.c
+       * src/grouplistdialog.c
+       * src/headerview.c
+       * src/importldif.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/mimeview.c
+       * src/noticeview.c
+       * src/prefs_account.c
+       * src/prefs_actions.c
+       * src/prefs_ext_prog.c
+       * src/prefs_filtering.c
+       * src/prefs_folder_item.c
+       * src/prefs_image_viewer.c
+       * src/prefs_logging.c
+       * src/prefs_msg_colors.c
+       * src/prefs_other.c
+       * src/prefs_send.c
+       * src/prefs_spelling.c
+       * src/prefs_summaries.c
+       * src/prefs_template.c
+       * src/printing.c
+       * src/quote_fmt.c
+       * src/send_message.c
+       * src/statusbar.c
+       * src/summary_search.c
+       * src/summaryview.c
+       * src/wizard.c
+       * src/gtk/gtkcmclist.c
+       * src/gtk/gtkcmctree.c
+       * src/gtk/gtkcmoptionmenu.c
+       * src/gtk/gtksctree.c
+       * src/gtk/gtkutils.c
+       * src/gtk/gtkutils.h
+       * src/gtk/gtkvscrollbutton.c
+       * src/gtk/inputdialog.c
+       * src/gtk/pluginwindow.c
+       * src/gtk/quicksearch.c
+       * src/gtk/spell_entry.c
+       * src/plugins/bogofilter/bogofilter_gtk.c
+       * src/plugins/dillo_viewer/dillo_prefs.c
+       * src/plugins/pgpcore/prefs_gpg.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/trayicon/trayicon.c
+       * src/plugins/trayicon/trayicon_prefs.c
+               Remove all possible #if GTK_CHECK_VERSION() checks,
+               and make Claws build with GTK+2.16 (untested right
+               now), as the Gpg4Win project uses GTK+2.16 currently.
+
 2011-10-22 [colin]     3.7.10cvs40
 
        * src/gtk/gtkutils.h
index a2a1a55..0b18f94 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.42.2.55 -r 1.42.2.56 po/fr.po;  cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/common/defs.h;  ) > 3.7.10cvs38.patchset
 ( cvs diff -u -r 1.100.2.80 -r 1.100.2.81 AUTHORS;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/ldif.c;  cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/gtk/authors.h;  ) > 3.7.10cvs39.patchset
 ( cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/gtkutils.h;  cvs diff -u -r 1.654.2.4320 -r 1.654.2.4321 configure.ac;  ) > 3.7.10cvs40.patchset
+( cvs diff -u -r 1.61.2.100 -r 1.61.2.101 src/account.c;  cvs diff -u -r 1.27.2.57 -r 1.27.2.58 src/addr_compl.c;  cvs diff -u -r 1.5.10.35 -r 1.5.10.36 src/addrgather.c;  cvs diff -u -r 1.382.2.586 -r 1.382.2.587 src/compose.c;  cvs diff -u -r 1.8.2.42 -r 1.8.2.43 src/editldap.c;  cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/expldifdlg.c;  cvs diff -u -r 1.207.2.222 -r 1.207.2.223 src/folderview.c;  cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/headerview.c;  cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/importldif.c;  cvs diff -u -r 1.115.2.242 -r 1.115.2.243 src/main.c;  cvs diff -u -r 1.274.2.331 -r 1.274.2.332 src/mainwindow.c;  cvs diff -u -r 1.83.2.173 -r 1.83.2.174 src/mimeview.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/noticeview.c;  cvs diff -u -r 1.105.2.169 -r 1.105.2.170 src/prefs_account.c;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/prefs_actions.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_ext_prog.c;  cvs diff -u -r 1.59.2.83 -r 1.59.2.84 src/prefs_filtering.c;  cvs diff -u -r 1.52.2.84 -r 1.52.2.85 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_logging.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_other.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_send.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/prefs_spelling.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/prefs_summaries.c;  cvs diff -u -r 1.12.2.76 -r 1.12.2.77 src/prefs_template.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/printing.c;  cvs diff -u -r 1.8.2.44 -r 1.8.2.45 src/quote_fmt.c;  cvs diff -u -r 1.17.2.60 -r 1.17.2.61 src/send_message.c;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/statusbar.c;  cvs diff -u -r 1.15.2.67 -r 1.15.2.68 src/summary_search.c;  cvs diff -u -r 1.395.2.432 -r 1.395.2.433 src/summaryview.c;  cvs diff -u -r 1.1.2.85 -r 1.1.2.86 src/wizard.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.99 -r 1.5.2.100 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.2.2.44 -r 1.2.2.45 src/gtk/inputdialog.c;  cvs diff -u -r 1.5.2.60 -r 1.5.2.61 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.105 -r 1.1.2.106 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/spell_entry.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.56 -r 1.23.2.57 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.78 -r 1.14.2.79 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.7.10cvs41.patchset
index 1b430da..4061d07 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -475,7 +475,7 @@ if test x"$ac_cv_enable_gtk3" = x"yes"; then
        AM_CONDITIONAL(GTK3, true)
        AM_CONDITIONAL(GTK2, false)
 else
-       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
 
        dnl --disable-deprecated switch for GTK2 purification
        AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
index 42d56c2..3cc9db4 100644 (file)
@@ -1518,7 +1518,6 @@ static void account_create_list_view_columns(GtkWidget *list_view)
 {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
-       CLAWS_TIP_DECL();
 
        renderer = gtk_cell_renderer_toggle_new();
        g_object_set(renderer, 
index c0ded1f..b2b89a5 100644 (file)
@@ -1262,7 +1262,7 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
 
        cm_return_val_if_fail(entry != NULL, FALSE);
 
-       if (!gtkut_widget_has_focus(GTK_WIDGET(entry))) return FALSE;
+       if (!gtk_widget_has_focus(GTK_WIDGET(entry))) return FALSE;
 
        /* get an address component from the cursor */
        searchTerm = get_address_from_edit( entry, &cursor_pos );
index 5bdaaa8..3b748ba 100644 (file)
@@ -275,7 +275,6 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl)
        GtkWidget *checkRecurse;
        gint top;
        gint i;
-       CLAWS_TIP_DECL();
 
        /* Container */
        vbox = gtk_vbox_new(FALSE, 6);
index a895324..0a20d22 100644 (file)
@@ -7080,7 +7080,6 @@ static Compose *compose_create(PrefsAccount *account,
        GtkWidget *text;
        GtkTextBuffer *buffer;
        GtkClipboard *clipboard;
-       CLAWS_TIP_DECL();
 
        UndoMain *undostruct;
 
@@ -9988,7 +9987,7 @@ static void compose_cut_cb(GtkAction *action, gpointer data)
        Compose *compose = (Compose *)data;
        if (compose->focused_editable 
 #ifndef GENERIC_UMPC
-           && gtkut_widget_has_focus(compose->focused_editable)
+           && gtk_widget_has_focus(compose->focused_editable)
 #endif
            )
                entry_cut_clipboard(compose->focused_editable);
@@ -9999,7 +9998,7 @@ static void compose_copy_cb(GtkAction *action, gpointer data)
        Compose *compose = (Compose *)data;
        if (compose->focused_editable 
 #ifndef GENERIC_UMPC
-           && gtkut_widget_has_focus(compose->focused_editable)
+           && gtk_widget_has_focus(compose->focused_editable)
 #endif
            )
                entry_copy_clipboard(compose->focused_editable);
@@ -10012,14 +10011,14 @@ static void compose_paste_cb(GtkAction *action, gpointer data)
        GtkTextBuffer *buffer;
        BLOCK_WRAP();
        if (compose->focused_editable &&
-           gtkut_widget_has_focus(compose->focused_editable))
+           gtk_widget_has_focus(compose->focused_editable))
                entry_paste_clipboard(compose, compose->focused_editable, 
                                prefs_common.linewrap_pastes,
                                GDK_SELECTION_CLIPBOARD, NULL);
        UNBLOCK_WRAP();
 
 #ifdef USE_ENCHANT
-       if (gtkut_widget_has_focus(compose->text) &&
+       if (gtk_widget_has_focus(compose->text) &&
            compose->gtkaspell && 
             compose->gtkaspell->check_while_typing)
                gtkaspell_highlight_all(compose->gtkaspell);
@@ -10032,7 +10031,7 @@ static void compose_paste_as_quote_cb(GtkAction *action, gpointer data)
        gint wrap_quote = prefs_common.linewrap_quote;
        if (compose->focused_editable 
 #ifndef GENERIC_UMPC
-           && gtkut_widget_has_focus(compose->focused_editable)
+           && gtk_widget_has_focus(compose->focused_editable)
 #endif
            ) {
                /* let text_insert() (called directly or at a later time
@@ -10061,7 +10060,7 @@ static void compose_paste_no_wrap_cb(GtkAction *action, gpointer data)
        BLOCK_WRAP();
        if (compose->focused_editable 
 #ifndef GENERIC_UMPC
-           && gtkut_widget_has_focus(compose->focused_editable)
+           && gtk_widget_has_focus(compose->focused_editable)
 #endif
            )
                entry_paste_clipboard(compose, compose->focused_editable, FALSE,
@@ -10069,7 +10068,7 @@ static void compose_paste_no_wrap_cb(GtkAction *action, gpointer data)
        UNBLOCK_WRAP();
 
 #ifdef USE_ENCHANT
-       if (gtkut_widget_has_focus(compose->text) &&
+       if (gtk_widget_has_focus(compose->text) &&
            compose->gtkaspell && 
             compose->gtkaspell->check_while_typing)
                gtkaspell_highlight_all(compose->gtkaspell);
@@ -10084,7 +10083,7 @@ static void compose_paste_wrap_cb(GtkAction *action, gpointer data)
        BLOCK_WRAP();
        if (compose->focused_editable 
 #ifndef GENERIC_UMPC
-           && gtkut_widget_has_focus(compose->focused_editable)
+           && gtk_widget_has_focus(compose->focused_editable)
 #endif
            )
                entry_paste_clipboard(compose, compose->focused_editable, TRUE,
@@ -10092,7 +10091,7 @@ static void compose_paste_wrap_cb(GtkAction *action, gpointer data)
        UNBLOCK_WRAP();
 
 #ifdef USE_ENCHANT
-       if (gtkut_widget_has_focus(compose->text) &&
+       if (gtk_widget_has_focus(compose->text) &&
            compose->gtkaspell &&
             compose->gtkaspell->check_while_typing)
                gtkaspell_highlight_all(compose->gtkaspell);
@@ -10104,7 +10103,7 @@ static void compose_allsel_cb(GtkAction *action, gpointer data)
        Compose *compose = (Compose *)data;
        if (compose->focused_editable 
 #ifndef GENERIC_UMPC
-           && gtkut_widget_has_focus(compose->focused_editable)
+           && gtk_widget_has_focus(compose->focused_editable)
 #endif
            )
                entry_allsel(compose->focused_editable);
@@ -10408,7 +10407,7 @@ static void compose_advanced_action_cb(GtkAction *gaction, gpointer data)
                {textview_delete_to_line_end}
        };
 
-       if (!gtkut_widget_has_focus(GTK_WIDGET(text))) return;
+       if (!gtk_widget_has_focus(GTK_WIDGET(text))) return;
 
        if (action >= COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE &&
            action <= COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END) {
@@ -10991,7 +10990,7 @@ static void compose_check_all(GtkAction *action, gpointer data)
        if (!compose->gtkaspell)
                return;
                
-       if (gtkut_widget_has_focus(compose->subject_entry))
+       if (gtk_widget_has_focus(compose->subject_entry))
                claws_spell_entry_check_all(
                        CLAWS_SPELL_ENTRY(compose->subject_entry));             
        else
@@ -11016,7 +11015,7 @@ static void compose_check_backwards(GtkAction *action, gpointer data)
                return;
        }
 
-       if (gtkut_widget_has_focus(compose->subject_entry))
+       if (gtk_widget_has_focus(compose->subject_entry))
                claws_spell_entry_check_backwards(
                        CLAWS_SPELL_ENTRY(compose->subject_entry));
        else
@@ -11031,7 +11030,7 @@ static void compose_check_forwards_go(GtkAction *action, gpointer data)
                return;
        }
 
-       if (gtkut_widget_has_focus(compose->subject_entry))
+       if (gtk_widget_has_focus(compose->subject_entry))
                claws_spell_entry_check_forwards_go(
                        CLAWS_SPELL_ENTRY(compose->subject_entry));
        else
index 61e58e7..02b3bae 100644 (file)
@@ -404,7 +404,6 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
        GtkWidget *entry_baseDN;
        GtkWidget *check_btn;
        GtkWidget *lookdn_btn;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new( FALSE, 8 );
@@ -555,7 +554,6 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
        GtkWidget *check_dynsearch;
        GtkWidget *check_matchoption;
        GtkWidget *reset_btn;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new( FALSE, 8 );
@@ -679,7 +677,6 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        GtkWidget *spinbtn_timeout;
        GtkAdjustment *spinbtn_maxentry_adj;
        GtkWidget *spinbtn_maxentry;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new( FALSE, 8 );
index 40880a0..34b874d 100644 (file)
@@ -463,7 +463,6 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) {
        GtkWidget *checkEMail;
        GtkListStore *store;
        GtkTreeIter iter;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new(FALSE, 8);
index 96ccd93..8b3e748 100644 (file)
@@ -2173,7 +2173,7 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                gtk_cmctree_expand(ctree, row);
 
        /* ungrab the mouse event */
-       if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+       if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
                gtk_grab_remove(GTK_WIDGET(ctree));
                if (gdk_pointer_is_grabbed())
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
index de0f383..335853a 100644 (file)
@@ -94,7 +94,7 @@ GSList *grouplist_dialog(Folder *folder)
        GNode *node;
        FolderItem *item;
 
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                grouplist_dialog_create();
index bda09ea..235c84b 100644 (file)
@@ -1029,7 +1029,7 @@ gtk_cmclist_get_arg (GObject *object,
       g_value_set_boolean(value, TRUE);
       for (i = 0; i < clist->columns; i++)
        if (clist->column[i].button &&
-           !gtkut_widget_get_sensitive (clist->column[i].button))
+           !gtk_widget_get_sensitive (clist->column[i].button))
          {
            g_value_set_boolean(value, FALSE);
            break;
@@ -1332,7 +1332,7 @@ gtk_cmclist_set_shadow_type (GtkCMCList      *clist,
 
   clist->shadow_type = type;
 
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)))
     gtk_widget_queue_resize (GTK_WIDGET (clist));
 }
 
@@ -1455,7 +1455,7 @@ gtk_cmclist_column_title_active (GtkCMCList *clist,
                    0, 0, 0, column_title_passive_func, 0);
 
   gtkut_widget_set_can_focus (clist->column[column].button, TRUE);
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)))
     gtk_widget_queue_draw (clist->column[column].button);
 }
 
@@ -1491,7 +1491,7 @@ gtk_cmclist_column_title_passive (GtkCMCList *clist,
                      G_CALLBACK(column_title_passive_func), NULL);
 
   gtkut_widget_set_can_focus (clist->column[column].button, FALSE);
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)))
     gtk_widget_queue_draw (clist->column[column].button);
 }
 
@@ -1577,7 +1577,7 @@ gtk_cmclist_set_column_title (GtkCMCList    *clist,
 
   /* if this button didn't previously exist, then the
    * column button positions have to be re-computed */
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)) && new_button)
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)) && new_button)
     size_allocate_title_buttons (clist);
 }
 
@@ -1631,7 +1631,7 @@ gtk_cmclist_set_column_widget (GtkCMCList  *clist,
 
   /* if this button didn't previously exist, then the
    * column button positions have to be re-computed */
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)) && new_button)
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)) && new_button)
     size_allocate_title_buttons (clist);
 }
 
@@ -1752,7 +1752,7 @@ gtk_cmclist_set_column_resizeable (GtkCMCList *clist,
   if (resizeable)
     clist->column[column].auto_resize = FALSE;
 
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)))
     size_allocate_title_buttons (clist);
 }
 
@@ -1781,7 +1781,7 @@ gtk_cmclist_set_column_auto_resize (GtkCMCList *clist,
        }
     }
 
-  if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
+  if (gtk_widget_get_visible (GTK_WIDGET(clist)))
     size_allocate_title_buttons (clist);
 }
 
@@ -2025,7 +2025,7 @@ size_allocate_title_buttons (GtkCMCList *clist)
   gint last_button = 0;
   gint i;
 
-  if (!gtkut_widget_get_realized (GTK_WIDGET(clist)))
+  if (!gtk_widget_get_realized (GTK_WIDGET(clist)))
     return;
 
   button_allocation.x = clist->hoffset;
@@ -2232,7 +2232,7 @@ column_button_create (GtkCMCList *clist,
   gtk_container_set_border_width(GTK_CONTAINER(button), 0);
   gtk_widget_pop_composite_child ();
 
-  if (gtkut_widget_get_realized (GTK_WIDGET(clist)) && clist->title_window)
+  if (gtk_widget_get_realized (GTK_WIDGET(clist)) && clist->title_window)
     gtk_widget_set_parent_window (clist->column[column].button,
                                  clist->title_window);
   gtk_widget_set_parent (button, GTK_WIDGET (clist));
@@ -3299,7 +3299,7 @@ gtk_cmclist_set_foreground (GtkCMCList       *clist,
     {
       clist_row->foreground = *color;
       clist_row->fg_set = TRUE;
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (clist)),
                         &clist_row->foreground, TRUE, TRUE);
     }
@@ -3328,7 +3328,7 @@ gtk_cmclist_set_background (GtkCMCList       *clist,
     {
       clist_row->background = *color;
       clist_row->bg_set = TRUE;
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (clist)),
                         &clist_row->background, TRUE, TRUE);
     }
@@ -3374,7 +3374,7 @@ gtk_cmclist_set_cell_style (GtkCMCList *clist,
 
   if (clist_row->cell[column].style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
         gtk_style_detach (clist_row->cell[column].style);
       g_object_unref (clist_row->cell[column].style);
     }
@@ -3385,7 +3385,7 @@ gtk_cmclist_set_cell_style (GtkCMCList *clist,
     {
       g_object_ref (clist_row->cell[column].style);
       
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
         clist_row->cell[column].style =
          gtk_style_attach (clist_row->cell[column].style,
                            clist->clist_window);
@@ -3453,7 +3453,7 @@ gtk_cmclist_set_row_style (GtkCMCList *clist,
 
   if (clist_row->style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
         gtk_style_detach (clist_row->style);
       g_object_unref (clist_row->style);
     }
@@ -3464,7 +3464,7 @@ gtk_cmclist_set_row_style (GtkCMCList *clist,
     {
       g_object_ref (clist_row->style);
       
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
         clist_row->style = gtk_style_attach (clist_row->style,
                                             clist->clist_window);
     }
@@ -3696,7 +3696,7 @@ fake_toggle_row (GtkCMCList *clist,
 static gboolean
 clist_has_grab (GtkCMCList *clist)
 {
-  return (gtkut_widget_has_grab (GTK_WIDGET(clist)) &&
+  return (gtk_widget_has_grab (GTK_WIDGET(clist)) &&
          gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))));
 }
 
@@ -4013,7 +4013,7 @@ real_undo_selection (GtkCMCList *clist)
                       GPOINTER_TO_INT (work->data), -1, NULL);
     }
 
-  if (gtkut_widget_has_focus(GTK_WIDGET(clist)) && clist->focus_row != clist->undo_anchor)
+  if (gtk_widget_has_focus(GTK_WIDGET(clist)) && clist->focus_row != clist->undo_anchor)
     {
       gtk_cmclist_draw_focus (GTK_WIDGET (clist));
       clist->focus_row = clist->undo_anchor;
@@ -4355,7 +4355,7 @@ end_selection (GtkCMCList *clist)
   cm_return_if_fail (GTK_IS_CMCLIST (clist));
 
   if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) &&
-      gtkut_widget_has_focus (GTK_WIDGET(clist)))
+      gtk_widget_has_focus (GTK_WIDGET(clist)))
     return;
 
   GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
@@ -4705,13 +4705,13 @@ gtk_cmclist_unrealize (GtkWidget *widget)
   /* freeze the list */
   clist->freeze_count++;
 
-  if (gtkut_widget_get_mapped (widget))
+  if (gtk_widget_get_mapped (widget))
     gtk_cmclist_unmap (widget);
 
   gtkut_widget_set_mapped (widget, FALSE);
 
   /* detach optional row/cell styles */
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       GtkCMCListRow *clist_row;
       GList *list;
@@ -4775,7 +4775,7 @@ gtk_cmclist_map (GtkWidget *widget)
 
   clist = GTK_CMCLIST (widget);
 
-  if (!gtkut_widget_get_mapped (widget))
+  if (!gtk_widget_get_mapped (widget))
     {
       gtkut_widget_set_mapped (widget, TRUE);
 
@@ -4783,8 +4783,8 @@ gtk_cmclist_map (GtkWidget *widget)
       for (i = 0; i < clist->columns; i++)
        {
          if (clist->column[i].button &&
-             gtkut_widget_get_visible (clist->column[i].button) &&
-             !gtkut_widget_get_mapped (clist->column[i].button))
+             gtk_widget_get_visible (clist->column[i].button) &&
+             !gtk_widget_get_mapped (clist->column[i].button))
            gtk_widget_map (clist->column[i].button);
        }
       
@@ -4814,7 +4814,7 @@ gtk_cmclist_unmap (GtkWidget *widget)
 
   clist = GTK_CMCLIST (widget);
 
-  if (gtkut_widget_get_mapped (widget))
+  if (gtk_widget_get_mapped (widget))
     {
       gtkut_widget_set_mapped (widget, FALSE);
 
@@ -4852,7 +4852,7 @@ gtk_cmclist_unmap (GtkWidget *widget)
       /* unmap column buttons */
       for (i = 0; i < clist->columns; i++)
        if (clist->column[i].button &&
-           gtkut_widget_get_mapped (clist->column[i].button))
+           gtk_widget_get_mapped (clist->column[i].button))
          gtk_widget_unmap (clist->column[i].button);
 
       /* freeze the list */
@@ -4874,7 +4874,7 @@ gtk_cmclist_expose (GtkWidget      *widget,
   window = gtk_widget_get_window (widget);
   style = gtk_widget_get_style (widget);
 
-  if (gtkut_widget_is_drawable (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       clist = GTK_CMCLIST (widget);
 
@@ -4933,7 +4933,7 @@ gtk_cmclist_style_set (GtkWidget *widget,
 
   clist = GTK_CMCLIST (widget);
 
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       style = gtk_widget_get_style (widget);
       gtk_style_set_background (style, gtk_widget_get_window (widget),
@@ -5029,7 +5029,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
              if (GTK_CMCLIST_ADD_MODE(clist))
                {
                  GTK_CMCLIST_UNSET_FLAG (clist, CMCLIST_ADD_MODE);
-                 if (gtkut_widget_has_focus(widget))
+                 if (gtk_widget_has_focus(widget))
                    {
                      gtk_cmclist_draw_focus (widget);
                      gdk_gc_set_line_attributes (clist->xor_gc, 1,
@@ -5046,7 +5046,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
                }
              else if (row != clist->focus_row)
                {
-                 if (gtkut_widget_has_focus(widget))
+                 if (gtk_widget_has_focus(widget))
                    {
                      gtk_cmclist_draw_focus (widget);
                      clist->focus_row = row;
@@ -5057,7 +5057,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
                }
            }
 
-         if (!gtkut_widget_has_focus(widget))
+         if (!gtk_widget_has_focus(widget))
            gtk_widget_grab_focus (widget);
 
          if (button_actions & GTK_CMBUTTON_SELECTS)
@@ -5165,7 +5165,7 @@ gtk_cmclist_button_press (GtkWidget      *widget,
                g_signal_handlers_block_matched(G_OBJECT(clist), G_SIGNAL_MATCH_DATA,
                                        0, 0, 0, 0, drag_data);
 
-       if (!gtkut_widget_has_focus(widget))
+       if (!gtk_widget_has_focus(widget))
          gtk_widget_grab_focus (widget);
 
        clist->drag_pos = i;
@@ -5253,7 +5253,7 @@ gtk_cmclist_button_release (GtkWidget      *widget,
            {
            case GTK_SELECTION_MULTIPLE:
              if (!(event->state & GDK_SHIFT_MASK) ||
-                 !gtkut_widget_get_can_focus (widget) ||
+                 !gtk_widget_get_can_focus (widget) ||
                  event->x < 0 || event->x >= clist->clist_window_width ||
                  event->y < 0 || event->y >= clist->clist_window_height)
                GTK_CMCLIST_GET_CLASS (clist)->resync_selection
@@ -5379,13 +5379,8 @@ gtk_cmclist_motion (GtkWidget      *widget,
       if (clist->htimer)
        return FALSE;
 
-#if GTK_CHECK_VERSION(2,12,0)
       clist->htimer = gdk_threads_add_timeout
        (SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
-#else
-      clist->htimer = g_timeout_add
-       (SCROLL_TIME, (GSourceFunc) horizontal_timeout, clist);
-#endif
       value = gtk_adjustment_get_value (clist->hadjustment);
       if (!((x < 0 && value == 0) ||
            (x >= clist->clist_window_width &&
@@ -5415,13 +5410,8 @@ gtk_cmclist_motion (GtkWidget      *widget,
     {
       if (clist->vtimer)
        return FALSE;
-#if GTK_CHECK_VERSION(2,12,0)
       clist->vtimer = gdk_threads_add_timeout (SCROLL_TIME,
                                     (GSourceFunc) vertical_timeout, clist);
-#else
-      clist->vtimer = g_timeout_add (SCROLL_TIME,
-                                    (GSourceFunc) vertical_timeout, clist);
-#endif
       if (clist->drag_button &&
          ((y < 0 && clist->focus_row == 0) ||
           (y >= clist->clist_window_height &&
@@ -5529,7 +5519,7 @@ gtk_cmclist_size_allocate (GtkWidget     *widget,
   gtk_widget_set_allocation (widget, allocation);
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_move_resize (gtk_widget_get_window (widget),
                              allocation->x + border_width,
@@ -5563,7 +5553,7 @@ gtk_cmclist_size_allocate (GtkWidget     *widget,
   clist->clist_window_width = clist_allocation.width;
   clist->clist_window_height = clist_allocation.height;
   
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_move_resize (clist->clist_window,
                              clist_allocation.x,
@@ -5577,7 +5567,7 @@ gtk_cmclist_size_allocate (GtkWidget     *widget,
   clist->column_title_area.y = style->ythickness;
   clist->column_title_area.width = clist_allocation.width;
   
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_move_resize (clist->title_window,
                              clist->column_title_area.x,
@@ -5754,7 +5744,7 @@ draw_row (GtkCMCList     *clist,
   cm_return_if_fail (clist != NULL);
 
   /* bail now if we arn't drawable yet */
-  if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+  if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
     return;
 
   widget = GTK_WIDGET (clist);
@@ -5986,7 +5976,7 @@ draw_row (GtkCMCList     *clist,
 
   /* draw focus rectangle */
   if (clist->focus_row == row &&
-      gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus(widget))
+      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus(widget))
     {
       if (!area)
        gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -6018,7 +6008,7 @@ draw_rows (GtkCMCList     *clist,
   cm_return_if_fail (GTK_IS_CMCLIST (clist));
 
   if (clist->row_height == 0 ||
-      !gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+      !gtk_widget_is_drawable (GTK_WIDGET(clist)))
     return;
 
   if (area)
@@ -6253,7 +6243,7 @@ vadjustment_value_changed (GtkAdjustment *adjustment,
   dy = value - clist->voffset;
   clist->voffset = value;
 
-  if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+  if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
     {
       gdk_window_scroll (clist->clist_window, 0, dy);
       gdk_window_process_updates (clist->clist_window, FALSE);
@@ -6270,7 +6260,7 @@ typedef struct
 
 /* The window to which widget->window is relative */
 #define ALLOCATION_WINDOW(widget)              \
-   (!gtkut_widget_get_has_window (widget) ?            \
+   (!gtk_widget_get_has_window (widget) ?              \
        gtk_widget_get_window (widget) :         \
        gdk_window_get_parent (gtk_widget_get_window(widget)))
 
@@ -6283,9 +6273,9 @@ adjust_allocation_recurse (GtkWidget *widget,
 
   gtk_widget_get_allocation (widget, &allocation);
   
-  if (!gtkut_widget_get_realized (widget))
+  if (!gtk_widget_get_realized (widget))
     {
-      if (gtkut_widget_get_visible (widget))
+      if (gtk_widget_get_visible (widget))
        {
          GdkRectangle tmp_rectangle = allocation;
          tmp_rectangle.x += scroll_data->dx;
@@ -6314,7 +6304,7 @@ adjust_allocation (GtkWidget *widget,
 {
   ScrollData scroll_data;
 
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     scroll_data.window = ALLOCATION_WINDOW (widget);
   else
     scroll_data.window = NULL;
@@ -6349,7 +6339,7 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
 
   dx = -value - clist->hoffset;
 
-  if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+  if (gtk_widget_get_realized (GTK_WIDGET(clist)))
     gdk_window_scroll (clist->title_window, dx, 0);
 
   /* adjust the column button's allocations */
@@ -6359,11 +6349,11 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
 
   clist->hoffset = -value;
 
-  if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+  if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
     {
       GtkWidget *focus_child = gtk_container_get_focus_child (container);
-      if (gtkut_widget_get_can_focus(GTK_WIDGET(clist)) && 
-          gtkut_widget_has_focus(GTK_WIDGET(clist)) &&
+      if (gtk_widget_get_can_focus(GTK_WIDGET(clist)) && 
+          gtk_widget_has_focus(GTK_WIDGET(clist)) &&
           !focus_child && GTK_CMCLIST_ADD_MODE(clist))
         {
           y = ROW_TOP_YPIXEL (clist, clist->focus_row);
@@ -6376,8 +6366,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
       gdk_window_scroll (clist->clist_window, dx, 0);
       gdk_window_process_updates (clist->clist_window, FALSE);
 
-      if (gtkut_widget_get_can_focus(GTK_WIDGET(clist)) && 
-          gtkut_widget_has_focus(GTK_WIDGET(clist)) &&
+      if (gtk_widget_get_can_focus(GTK_WIDGET(clist)) && 
+          gtk_widget_has_focus(GTK_WIDGET(clist)) &&
           !focus_child)
         {
           if (GTK_CMCLIST_ADD_MODE(clist))
@@ -6527,7 +6517,7 @@ row_delete (GtkCMCList    *clist,
        (clist, clist_row, i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
       if (clist_row->cell[i].style)
        {
-         if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+         if (gtk_widget_get_realized (GTK_WIDGET(clist)))
            gtk_style_detach (clist_row->cell[i].style);
          g_object_unref (clist_row->cell[i].style);
        }
@@ -6535,7 +6525,7 @@ row_delete (GtkCMCList    *clist,
 
   if (clist_row->style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(clist)))
+      if (gtk_widget_get_realized (GTK_WIDGET(clist)))
         gtk_style_detach (clist_row->style);
       g_object_unref (clist_row->style);
     }
@@ -6585,7 +6575,7 @@ gtk_cmclist_focus (GtkWidget        *widget,
   GtkWidget *focus_child;
   gboolean is_current_focus;
 
-  if (!gtkut_widget_is_sensitive (widget))
+  if (!gtk_widget_is_sensitive (widget))
     return FALSE;
 
   focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget));
@@ -6667,7 +6657,7 @@ gtk_cmclist_draw_focus (GtkWidget *widget)
 
   cm_return_if_fail (GTK_IS_CMCLIST (widget));
 
-  if (!gtkut_widget_is_drawable (widget) || !gtkut_widget_get_can_focus (widget))
+  if (!gtk_widget_is_drawable (widget) || !gtk_widget_get_can_focus (widget))
     return;
 
   clist = GTK_CMCLIST (widget);
@@ -6724,7 +6714,7 @@ focus_column (GtkCMCList *clist, gint column, gint dir)
     {
       return TRUE;
     }
-  else if (gtkut_widget_get_can_focus (child))
+  else if (gtk_widget_get_can_focus (child))
     {
       gtk_widget_grab_focus (child);
       return TRUE;
@@ -6831,7 +6821,7 @@ title_focus_move (GtkCMCList *clist,
   while (!return_val && j >= 0 && j < clist->columns)
     {
       if (clist->column[j].button &&
-         gtkut_widget_get_visible (clist->column[j].button))
+         gtk_widget_get_visible (clist->column[j].button))
        {
          if (focus_column (clist, j, dir))
            {
@@ -6851,7 +6841,7 @@ title_focus_move (GtkCMCList *clist,
       while (!return_val && j != i)
        {
          if (clist->column[j].button &&
-             gtkut_widget_get_visible (clist->column[j].button))
+             gtk_widget_get_visible (clist->column[j].button))
            {
              if (focus_column (clist, j, dir))
                {
@@ -7214,7 +7204,7 @@ remove_grab (GtkCMCList *clist)
 {
   GtkWidget *widget = GTK_WIDGET (clist);
   
-  if (gtkut_widget_has_grab (widget))
+  if (gtk_widget_has_grab (widget))
     {
       GdkDisplay *display = gtk_widget_get_display (widget);
       
@@ -7922,7 +7912,7 @@ gtk_cmclist_set_button_actions (GtkCMCList *clist,
   if (button < MAX_BUTTON)
     {
       if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) || 
-         gtkut_widget_has_grab (GTK_WIDGET(clist)))
+         gtk_widget_has_grab (GTK_WIDGET(clist)))
        {
          remove_grab (clist);
          clist->drag_button = 0;
index f3bd8c6..6ac4754 100644 (file)
@@ -896,7 +896,7 @@ gtk_cmctree_unrealize (GtkWidget *widget)
   ctree = GTK_CMCTREE (widget);
   clist = GTK_CMCLIST (widget);
 
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
     {
       GtkCMCTreeNode *node;
       GtkCMCTreeNode *child;
@@ -1764,7 +1764,7 @@ draw_row (GtkCMCList     *clist,
   cm_return_if_fail (clist != NULL);
 
   /* bail now if we arn't drawable yet */
-  if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+  if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
     return;
 
   widget = GTK_WIDGET (clist);
@@ -2122,7 +2122,7 @@ draw_row (GtkCMCList     *clist,
 
   /* draw focus rectangle */
   if (clist->focus_row == row &&
-      gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus (widget))
+      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
     {
       if (!area)
        gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -2601,7 +2601,7 @@ change_focus_row_expansion (GtkCMCTree          *ctree,
   clist = GTK_CMCLIST (ctree);
 
   if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (ctree))) && 
-      gtkut_widget_has_grab (GTK_WIDGET(ctree)))
+      gtk_widget_has_grab (GTK_WIDGET(ctree)))
     return;
   
   if (!(node =
@@ -3318,7 +3318,7 @@ row_delete (GtkCMCTree    *ctree,
        (clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
       if (ctree_row->row.cell[i].style)
        {
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gtk_style_detach (ctree_row->row.cell[i].style);
          g_object_unref (ctree_row->row.cell[i].style);
        }
@@ -3326,7 +3326,7 @@ row_delete (GtkCMCTree    *ctree,
 
   if (ctree_row->row.style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gtk_style_detach (ctree_row->row.style);
       g_object_unref (ctree_row->row.style);
     }
@@ -4819,7 +4819,7 @@ static void
 remove_grab (GtkCMCList *clist)
 {
   if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) && 
-      gtkut_widget_has_grab (GTK_WIDGET(clist)))
+      gtk_widget_has_grab (GTK_WIDGET(clist)))
     {
       gtk_grab_remove (GTK_WIDGET (clist));
       gdk_display_pointer_ungrab (gtk_widget_get_display (GTK_WIDGET (clist)),
@@ -5027,7 +5027,7 @@ gtk_cmctree_node_set_cell_style (GtkCMCTree     *ctree,
 
   if (GTK_CMCTREE_ROW (node)->row.cell[column].style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         gtk_style_detach (GTK_CMCTREE_ROW (node)->row.cell[column].style);
       g_object_unref (GTK_CMCTREE_ROW (node)->row.cell[column].style);
     }
@@ -5038,7 +5038,7 @@ gtk_cmctree_node_set_cell_style (GtkCMCTree     *ctree,
     {
       g_object_ref (GTK_CMCTREE_ROW (node)->row.cell[column].style);
       
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         GTK_CMCTREE_ROW (node)->row.cell[column].style =
          gtk_style_attach (GTK_CMCTREE_ROW (node)->row.cell[column].style,
                            clist->clist_window);
@@ -5099,7 +5099,7 @@ gtk_cmctree_node_set_row_style (GtkCMCTree     *ctree,
 
   if (GTK_CMCTREE_ROW (node)->row.style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         gtk_style_detach (GTK_CMCTREE_ROW (node)->row.style);
       g_object_unref (GTK_CMCTREE_ROW (node)->row.style);
     }
@@ -5110,7 +5110,7 @@ gtk_cmctree_node_set_row_style (GtkCMCTree     *ctree,
     {
       g_object_ref (GTK_CMCTREE_ROW (node)->row.style);
       
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
         GTK_CMCTREE_ROW (node)->row.style =
          gtk_style_attach (GTK_CMCTREE_ROW (node)->row.style,
                            clist->clist_window);
@@ -5149,7 +5149,7 @@ gtk_cmctree_node_set_foreground (GtkCMCTree       *ctree,
     {
       GTK_CMCTREE_ROW (node)->row.foreground = *color;
       GTK_CMCTREE_ROW (node)->row.fg_set = TRUE;
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (ctree)),
                         &GTK_CMCTREE_ROW (node)->row.foreground, TRUE, TRUE);
     }
@@ -5171,7 +5171,7 @@ gtk_cmctree_node_set_background (GtkCMCTree       *ctree,
     {
       GTK_CMCTREE_ROW (node)->row.background = *color;
       GTK_CMCTREE_ROW (node)->row.bg_set = TRUE;
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (ctree)),
                         &GTK_CMCTREE_ROW (node)->row.background, TRUE, TRUE);
     }
@@ -5364,23 +5364,23 @@ gtk_cmctree_set_line_style (GtkCMCTree          *ctree,
           clist->column[ctree->tree_column].width + 3);
     }
 
-  if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+  if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
     {
       switch (line_style)
        {
        case GTK_CMCTREE_LINES_SOLID:
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID, 
                                        GDK_CAP_BUTT, GDK_JOIN_MITER);
          break;
        case GTK_CMCTREE_LINES_DOTTED:
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, 
                                        GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
          gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
          break;
        case GTK_CMCTREE_LINES_TABBED:
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID, 
                                        GDK_CAP_BUTT, GDK_JOIN_MITER);
          break;
@@ -5445,7 +5445,7 @@ gtk_cmctree_set_expander_style (GtkCMCTree              *ctree,
       gtk_cmclist_set_column_width (clist, ctree->tree_column, new_width);
     }
 
-  if (gtkut_widget_is_drawable (GTK_WIDGET(clist)))
+  if (gtk_widget_is_drawable (GTK_WIDGET(clist)))
     CLIST_REFRESH (clist);
 }
 
@@ -5776,7 +5776,7 @@ real_undo_selection (GtkCMCList *clist)
     if (GTK_CMCTREE_ROW (work->data)->row.selectable)
       gtk_cmctree_unselect (ctree, GTK_CMCTREE_NODE (work->data));
 
-  if (gtkut_widget_has_focus (GTK_WIDGET(clist)) &&
+  if (gtk_widget_has_focus (GTK_WIDGET(clist)) &&
       clist->focus_row != clist->undo_anchor)
     {
       clist->focus_row = clist->undo_anchor;
index 8c28bc1..eeaa157 100644 (file)
@@ -436,7 +436,7 @@ gtk_cmoption_menu_size_request (GtkWidget      *widget,
   gtk_cmoption_menu_get_props (option_menu, &props);
  
   child = gtk_bin_get_child (GTK_BIN (option_menu));
-  if (child && gtkut_widget_get_visible (child))
+  if (child && gtk_widget_get_visible (child))
     {
       gtk_widget_size_request (child, &child_requisition);
 
@@ -477,13 +477,13 @@ gtk_cmoption_menu_size_allocate (GtkWidget     *widget,
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   gtk_widget_set_allocation (widget, allocation);
-  if (gtkut_widget_get_realized (widget))
+  if (gtk_widget_get_realized (widget))
        gdk_window_move_resize (gtk_button_get_event_window (button),
                            allocation->x + border_width, allocation->y + border_width,
                            allocation->width - border_width * 2, allocation->height - border_width * 2);
 
   child = gtk_bin_get_child (GTK_BIN (widget));
-  if (child && gtkut_widget_get_visible (child))
+  if (child && gtk_widget_get_visible (child))
     {
       style = gtk_widget_get_style (widget);
       gint xthickness = style->xthickness;
@@ -520,7 +520,7 @@ gtk_cmoption_menu_paint (GtkWidget    *widget,
   cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
   cm_return_if_fail (area != NULL);
 
-  if (gtkut_widget_is_drawable (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       gtk_widget_get_allocation (widget, &allocation);
       border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
@@ -531,7 +531,7 @@ gtk_cmoption_menu_paint (GtkWidget    *widget,
       button_area.width = allocation.width - 2 * border_width;
       button_area.height = allocation.height - 2 * border_width;
 
-      if (!props.interior_focus && gtkut_widget_has_focus (widget))
+      if (!props.interior_focus && gtk_widget_has_focus (widget))
        {
          button_area.x += props.focus_width + props.focus_pad;
          button_area.y += props.focus_width + props.focus_pad;
@@ -542,7 +542,7 @@ gtk_cmoption_menu_paint (GtkWidget    *widget,
       style = gtk_widget_get_style (widget);
       window = gtk_widget_get_window (widget);
       gtk_paint_box (style, window,
-                    gtkut_widget_get_state (widget), GTK_SHADOW_OUT,
+                    gtk_widget_get_state (widget), GTK_SHADOW_OUT,
                     area, widget, "optionmenu",
                     button_area.x, button_area.y,
                     button_area.width, button_area.height);
@@ -556,13 +556,13 @@ gtk_cmoption_menu_paint (GtkWidget    *widget,
          style->xthickness;
 
       gtk_paint_tab (style, window,
-                    gtkut_widget_get_state (widget), GTK_SHADOW_OUT,
+                    gtk_widget_get_state (widget), GTK_SHADOW_OUT,
                     area, widget, "optionmenutab",
                     tab_x,
                     button_area.y + (button_area.height - props.indicator_size.height) / 2,
                     props.indicator_size.width, props.indicator_size.height);
       
-      if (gtkut_widget_has_focus (widget))
+      if (gtk_widget_has_focus (widget))
        {
          if (props.interior_focus)
            {
@@ -586,7 +586,7 @@ gtk_cmoption_menu_paint (GtkWidget    *widget,
              button_area.height += 2 * (props.focus_width + props.focus_pad);
            }
            
-         gtk_paint_focus (style, window, gtkut_widget_get_state (widget),
+         gtk_paint_focus (style, window, gtk_widget_get_state (widget),
                           area, widget, "button",
                           button_area.x, 
                           button_area.y, 
@@ -604,7 +604,7 @@ gtk_cmoption_menu_expose (GtkWidget      *widget,
   cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
   cm_return_val_if_fail (event != NULL, FALSE);
 
-  if (gtkut_widget_is_drawable (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       gtk_cmoption_menu_paint (widget, &event->area);
 
@@ -739,7 +739,7 @@ gtk_cmoption_menu_select_first_sensitive (GtkCMOptionMenu *option_menu)
 
       while (children)
        {
-         if (gtkut_widget_get_sensitive (children->data))
+         if (gtk_widget_get_sensitive (children->data))
            {
              gtk_cmoption_menu_set_history (option_menu, index);
              return;
@@ -760,8 +760,8 @@ gtk_cmoption_menu_item_state_changed_cb (GtkWidget      *widget,
 {
   GtkWidget *child = gtk_bin_get_child (GTK_BIN (option_menu));
 
-  if (child && gtkut_widget_get_sensitive (child) != gtkut_widget_is_sensitive (widget))
-    gtk_widget_set_sensitive (child, gtkut_widget_is_sensitive (widget));
+  if (child && gtk_widget_get_sensitive (child) != gtk_widget_is_sensitive (widget))
+    gtk_widget_set_sensitive (child, gtk_widget_is_sensitive (widget));
 }
 
 static void
@@ -803,7 +803,7 @@ gtk_cmoption_menu_update_contents (GtkCMOptionMenu *option_menu)
          child = gtk_bin_get_child (GTK_BIN (option_menu->menu_item));
          if (child)
            {
-             if (!gtkut_widget_is_sensitive (option_menu->menu_item))
+             if (!gtk_widget_is_sensitive (option_menu->menu_item))
                gtk_widget_set_sensitive (child, FALSE);
              gtk_widget_reparent (child, GTK_WIDGET (option_menu));
            }
@@ -818,7 +818,7 @@ gtk_cmoption_menu_update_contents (GtkCMOptionMenu *option_menu)
          gtk_widget_size_allocate (GTK_WIDGET (option_menu),
                                    &allocation);
 
-         if (gtkut_widget_is_drawable (GTK_WIDGET(option_menu)))
+         if (gtk_widget_is_drawable (GTK_WIDGET(option_menu)))
            gtk_widget_queue_draw (GTK_WIDGET (option_menu));
        }
 
@@ -879,7 +879,7 @@ gtk_cmoption_menu_calc_size (GtkCMOptionMenu *option_menu)
          child = children->data;
          children = children->next;
 
-         if (gtkut_widget_get_visible (child))
+         if (gtk_widget_get_visible (child))
            {
              GtkWidget *inner = gtk_bin_get_child (GTK_BIN (child));
 
@@ -948,7 +948,7 @@ gtk_cmoption_menu_position (GtkMenu  *menu,
       if (active == child)
        break;
 
-      if (gtkut_widget_get_visible (child))
+      if (gtk_widget_get_visible (child))
        {
          gtk_widget_get_child_requisition (child, &requisition);
          menu_ypos -= requisition.height;
@@ -1048,8 +1048,8 @@ gtk_cmoption_menu_scroll_event (GtkWidget          *widget,
 
          l = g_list_nth (children, index);
          item = GTK_MENU_ITEM (l->data);
-         if (gtkut_widget_get_visible (GTK_WIDGET(item)) && 
-             gtkut_widget_is_sensitive (GTK_WIDGET(item)))
+         if (gtk_widget_get_visible (GTK_WIDGET(item)) && 
+             gtk_widget_is_sensitive (GTK_WIDGET(item)))
            {
              gtk_cmoption_menu_set_history (option_menu, index);
              gtk_menu_item_activate (GTK_MENU_ITEM (item));
index 7fa8c14..1dac411 100644 (file)
@@ -887,7 +887,7 @@ gtk_sctree_draw_row (GtkCMCList     *clist,
   }
 
   /* bail now if we arn't drawable yet */
-  if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
+  if (!gtk_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
     return;
 
   ctree  = GTK_CMCTREE  (clist);
@@ -1256,7 +1256,7 @@ gtk_sctree_draw_row (GtkCMCList     *clist,
 
   /* draw focus rectangle */
   if (clist->focus_row == row &&
-      gtkut_widget_get_can_focus (widget) && gtkut_widget_has_focus (widget))
+      gtk_widget_get_can_focus (widget) && gtk_widget_has_focus (widget))
     {
       if (!area)
        gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -1287,7 +1287,7 @@ gtk_sctree_change_focus_row_expansion (GtkCMCTree          *ctree,
   clist = GTK_CMCLIST (ctree);
 
   if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (ctree))) && 
-      gtkut_widget_has_grab (GTK_WIDGET(ctree)))
+      gtk_widget_has_grab (GTK_WIDGET(ctree)))
     return;
   
   if (!(node =
@@ -1647,7 +1647,7 @@ gtk_sctree_button_press (GtkWidget *widget, GdkEventButton *event)
 
        on_row = gtk_cmclist_get_selection_info (clist, event->x, event->y, &row, &col);
 
-       if (on_row && !gtkut_widget_has_focus(widget))
+       if (on_row && !gtk_widget_has_focus(widget))
                gtk_widget_grab_focus (widget);
 
        if (gtk_sctree_is_hot_spot (GTK_SCTREE(sctree), event->x, event->y)) {
@@ -2842,7 +2842,7 @@ srow_delete (GtkCMCTree    *ctree,
        (clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
       if (ctree_row->row.cell[i].style)
        {
-         if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+         if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
            gtk_style_detach (ctree_row->row.cell[i].style);
          g_object_unref (ctree_row->row.cell[i].style);
        }
@@ -2850,7 +2850,7 @@ srow_delete (GtkCMCTree    *ctree,
 
   if (ctree_row->row.style)
     {
-      if (gtkut_widget_get_realized (GTK_WIDGET(ctree)))
+      if (gtk_widget_get_realized (GTK_WIDGET(ctree)))
        gtk_style_detach (ctree_row->row.style);
       g_object_unref (ctree_row->row.style);
     }
index 78864e8..9daa14b 100644 (file)
@@ -655,7 +655,7 @@ void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
 
 void gtkut_widget_draw_now(GtkWidget *widget)
 {
-       if (widget && gtkut_widget_get_visible(widget) && gtkut_widget_is_drawable(widget))
+       if (widget && gtk_widget_get_visible(widget) && gtk_widget_is_drawable(widget))
                gdk_window_process_updates(gtk_widget_get_window(widget), FALSE);
 }
 
@@ -878,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 (gtkut_widget_has_focus(GTK_WIDGET(c->data))) {
+                       if (gtk_widget_has_focus(GTK_WIDGET(c->data))) {
                                result = GTK_WIDGET(c->data);
                                break;
                        }
@@ -1693,114 +1693,6 @@ claws_input_add    (gint              source,
   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)
index 3442e2d..68f6de2 100644 (file)
@@ -152,18 +152,6 @@ void gtkut_widget_init                     (void);
 void gtkut_widget_set_app_icon         (GtkWidget      *widget);
 void gtkut_widget_set_composer_icon    (GtkWidget      *widget);
 
-gboolean gtkut_widget_get_app_paintable        (GtkWidget      *widget);
-gboolean gtkut_widget_get_can_focus    (GtkWidget      *widget);
-gboolean gtkut_widget_get_has_window   (GtkWidget      *widget);
-gboolean gtkut_widget_get_mapped       (GtkWidget      *widget);
-gboolean gtkut_widget_get_realized     (GtkWidget      *widget);
-gboolean gtkut_widget_get_sensitive    (GtkWidget      *widget);
-GtkStateType gtkut_widget_get_state    (GtkWidget      *widget);
-gboolean gtkut_widget_get_visible      (GtkWidget      *widget);
-gboolean gtkut_widget_has_grab         (GtkWidget      *widget);
-gboolean gtkut_widget_has_focus                (GtkWidget      *widget);
-gboolean gtkut_widget_is_drawable      (GtkWidget      *widget);
-gboolean gtkut_widget_is_sensitive     (GtkWidget      *widget);
 void gtkut_widget_set_mapped            (GtkWidget *widget, gboolean mapped);
 void gtkut_widget_set_realized          (GtkWidget *widget, gboolean realized);
 void gtkut_widget_set_can_default       (GtkWidget *widget, gboolean can_default);
@@ -229,8 +217,6 @@ claws_input_add    (gint          source,
                    gpointer          data,
                    gboolean          is_sock);
 
-#if GTK_CHECK_VERSION(2,12,0)
-#define CLAWS_TIP_DECL() {}
 #define CLAWS_SET_TIP(widget,tip) {                                    \
        if (tip != NULL)                                                \
                gtk_widget_set_tooltip_text(GTK_WIDGET(widget), tip);   \
@@ -238,15 +224,6 @@ claws_input_add    (gint         source,
                gtk_widget_set_has_tooltip(GTK_WIDGET(widget), FALSE);  \
 }
 
-#else
-#define CLAWS_TIP_DECL() \
-       GtkTooltips *tips = gtk_tooltips_new();
-
-#define CLAWS_SET_TIP(widget,tip) {                            \
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), widget,        \
-                           tip, NULL);                         \
-}
-#endif
 #if !GTK_CHECK_VERSION(2,22,0)
 #define gdk_drag_context_get_selected_action(x) ((x)->action)
 #define gdk_drag_context_get_actions(x) ((x)->actions)
@@ -256,9 +233,22 @@ claws_input_add    (gint         source,
 #endif
 #if !GTK_CHECK_VERSION(2,20,0)
 #define gtk_widget_get_requisition(x,r) (*(r) = (x)->requisition)
+#define gtk_statusbar_get_message_area(x) ((x)->label)
+#define gtk_widget_get_realized(x) (GTK_WIDGET_REALIZED(x))
+#define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
 #endif
 #if !GTK_CHECK_VERSION(2,18,0)
-#define gtk_widget_get_allocation(x,a) (*(a) = (x)->allocation)
-#define gtk_widget_get_state(x) ((x)->state)
+#define gtk_widget_has_focus(x) (GTK_WIDGET_HAS_FOCUS(x))
+#define gtk_widget_get_can_focus(x) (GTK_WIDGET_CAN_FOCUS(x))
+#define gtk_widget_has_grab(x) (GTK_WIDGET_HAS_GRAB(x))
+#define gtk_widget_get_visible(x) (GTK_WIDGET_VISIBLE(x))
+#define gtk_widget_get_realized(x) (GTK_WIDGET_REALIZED(x))
+#define gtk_widget_is_sensitive(x) (GTK_WIDGET_IS_SENSITIVE(x))
+#define gtk_widget_get_sensitive(x) (GTK_WIDGET_SENSITIVE(x))
+#define gtk_widget_is_drawable(x) (GTK_WIDGET_DRAWABLE(x))
+#define gtk_widget_get_state(x) (GTK_WIDGET_STATE(x))
+#define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
+#define gtk_widget_get_has_window(x) (!(GTK_WIDGET_NO_WINDOW(x)))
+#define gtk_widget_get_app_paintable(x) (GTK_WIDGET_APP_PAINTABLE(x))
 #endif
 #endif /* __GTKUTILS_H__ */
index 13c52ed..135ad1b 100644 (file)
@@ -253,7 +253,7 @@ static gint gtk_vscrollbutton_button_press(GtkWidget *widget,
                                           GdkEventButton *event,
                                           GtkVScrollbutton *scrollbutton)
 {
-    if (!gtkut_widget_has_focus(widget))
+    if (!gtk_widget_has_focus(widget))
        gtk_widget_grab_focus(widget);
 
     if (scrollbutton->button == 0) {
@@ -275,7 +275,7 @@ static gint gtk_vscrollbutton_button_release(GtkWidget *widget,
                                             GdkEventButton *event,
                                             GtkVScrollbutton *scrollbutton)
 {
-    if (!gtkut_widget_has_focus(widget))
+    if (!gtk_widget_has_focus(widget))
        gtk_widget_grab_focus(widget);
 
     if (scrollbutton->button == event->button) {
@@ -420,7 +420,7 @@ static void gtk_vscrollbutton_set_sensitivity   (GtkAdjustment    *adjustment,
                                                 GtkVScrollbutton *scrollbutton)
 {
        gfloat value;
-       if (!gtkut_widget_get_realized(GTK_WIDGET(scrollbutton))) return;
+       if (!gtk_widget_get_realized(GTK_WIDGET(scrollbutton))) return;
        if (scrollbutton->button != 0) return; /* not while something is pressed */
        
        value = gtk_adjustment_get_value(adjustment);
index a5c8d69..ba86a0c 100644 (file)
@@ -85,7 +85,7 @@ static void combo_activated   (GtkEditable    *editable);
 gchar *input_dialog(const gchar *title, const gchar *message,
                    const gchar *default_string)
 {
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                input_dialog_create(FALSE);
@@ -111,7 +111,7 @@ gchar *input_dialog(const gchar *title, const gchar *message,
 gchar *input_dialog_with_invisible(const gchar *title, const gchar *message,
                                   const gchar *default_string)
 {
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                input_dialog_create(TRUE);
@@ -137,7 +137,7 @@ gchar *input_dialog_with_invisible_checkbtn(const gchar *title, const gchar *mes
                                   const gchar *default_string, const gchar *checkbtn_label,
                                   gboolean *checkbtn_state)
 {
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                input_dialog_create(TRUE);
@@ -178,7 +178,7 @@ gchar *input_dialog_combo_remember(const gchar *title, const gchar *message,
                          const gchar *default_string, GList *list,
                          gboolean *remember)
 {
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                input_dialog_create(FALSE);
@@ -209,7 +209,7 @@ gchar *input_dialog_with_checkbtn(const gchar       *title,
                                   const gchar  *checkbtn_label,
                                   gboolean *checkbtn_state)
 {
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                input_dialog_create(FALSE);
@@ -421,7 +421,7 @@ static gchar *input_dialog_open(const gchar *title, const gchar *message,
 {
        gchar *str;
 
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                input_dialog_create(FALSE);
index e21d062..f55c093 100644 (file)
@@ -293,7 +293,6 @@ void pluginwindow_create()
        GtkWidget *vbox3;
        GtkWidget *hbox_info;
        static GdkGeometry geometry;
-       CLAWS_TIP_DECL();       
 
        debug_print("Creating plugins window...\n");
 
index 8d8042b..3998dae 100644 (file)
@@ -695,7 +695,6 @@ QuickSearch *quicksearch_new()
        GtkWidget *clear_search;
        GtkWidget *search_condition_expression;
        GtkWidget *menuitem;
-       CLAWS_TIP_DECL();
        GtkWidget *vbox;
 
        quicksearch = quicksearch_new_nogui();
index 1d6dbb5..9b30c58 100644 (file)
@@ -450,7 +450,7 @@ void claws_spell_entry_recheck_all(ClawsSpellEntry *entry)
        layout = gtk_entry_get_layout(GTK_ENTRY(entry));
        pango_layout_set_attributes(layout, entry->priv->attr_list);
 
-       if (gtkut_widget_get_realized(GTK_WIDGET(entry))) {
+       if (gtk_widget_get_realized(GTK_WIDGET(entry))) {
                rect.x = 0; rect.y = 0;
                rect.width  = GTK_WIDGET(entry)->allocation.width;
                rect.height = GTK_WIDGET(entry)->allocation.height;
index 14ed91c..a3a8c5e 100644 (file)
@@ -258,13 +258,13 @@ static gint headerview_show_xface(HeaderView *headerview, MsgInfo *msginfo)
            !msginfo->extradata->xface || 
            strlen(msginfo->extradata->xface) < 5) {
                if (headerview->image &&
-                   gtkut_widget_get_visible(headerview->image)) {
+                   gtk_widget_get_visible(headerview->image)) {
                        gtk_widget_hide(headerview->image);
                        gtk_widget_queue_resize(hbox);
                }
                return -1;
        }
-       if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+       if (!gtk_widget_get_visible(headerview->hbox)) return -1;
 
        if (headerview->image) {
                gtk_widget_destroy(headerview->image);
@@ -295,13 +295,13 @@ static gint headerview_show_face (HeaderView *headerview, MsgInfo *msginfo)
 
        if (!msginfo->extradata || !msginfo->extradata->face) {
                if (headerview->image &&
-                   gtkut_widget_get_visible(headerview->image)) {
+                   gtk_widget_get_visible(headerview->image)) {
                        gtk_widget_hide(headerview->image);
                        gtk_widget_queue_resize(hbox);
                }
                return -1;
        }
-       if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+       if (!gtk_widget_get_visible(headerview->hbox)) return -1;
 
        if (headerview->image) {
                gtk_widget_destroy(headerview->image);
@@ -331,7 +331,7 @@ static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginf
        GError *error = NULL;
        GdkPixbuf *picture = NULL;
 
-       if (!gtkut_widget_get_visible(headerview->hbox)) return;
+       if (!gtk_widget_get_visible(headerview->hbox)) return;
 
        if (headerview->image) {
                picture = gtk_image_get_pixbuf(GTK_IMAGE(headerview->image));
@@ -360,7 +360,7 @@ static gint headerview_show_contact_pic (HeaderView *headerview, MsgInfo *msginf
        GdkPixbuf *picture = NULL;
        gint w, h;
 
-       if (!gtkut_widget_get_visible(headerview->hbox)) return -1;
+       if (!gtk_widget_get_visible(headerview->hbox)) return -1;
 
        if (headerview->image) {
                gtk_widget_destroy(headerview->image);
@@ -425,7 +425,7 @@ void headerview_clear(HeaderView *headerview)
        gtk_widget_hide(headerview->tags_header_label);
        gtk_widget_hide(headerview->tags_body_label);
 
-       if (headerview->image && gtkut_widget_get_visible(headerview->image)) {
+       if (headerview->image && gtk_widget_get_visible(headerview->image)) {
                gtk_widget_hide(headerview->image);
                gtk_widget_queue_resize(headerview->hbox);
        }
index 8b1dbb9..4163d3b 100644 (file)
@@ -631,7 +631,6 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) {
        GtkWidget *entryFile;
        GtkWidget *entryName;
        GtkWidget *btnFile;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new(FALSE, 8);
@@ -717,7 +716,6 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
        GtkWidget *checkSelect;
        GtkWidget *btnModify;
        GtkWidget *eventBox;
-       CLAWS_TIP_DECL();
        gint top;
 
        gchar *titles[ FIELDS_N_COLS ];
index 34d9843..5b80f51 100644 (file)
@@ -424,7 +424,6 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        gint r = 0;
        GtkWidget *window = NULL;
        GtkWidget *keep_backup_chk;
-       CLAWS_TIP_DECL();
        gboolean backup = TRUE;
 
        keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
@@ -1182,33 +1181,6 @@ int main(int argc, char *argv[])
                g_error(_("g_thread is not supported by glib.\n"));
        }
 
-       /* check that we're not on a too recent/old gtk+ */
-#if GTK_CHECK_VERSION(2, 9, 0)
-       if (gtk_check_version(2, 9, 0) != NULL) {
-               alertpanel_error(_("Claws Mail has been compiled with "
-                                  "a more recent GTK+ library than is "
-                                  "currently available. This will cause "
-                                  "crashes. You need to upgrade GTK+ or "
-                                  "recompile Claws Mail."));
-#ifdef G_OS_WIN32
-               win32_close_log();
-#endif
-               exit(1);
-       }
-#else
-       if (gtk_check_version(2, 9, 0) == NULL) {
-               alertpanel_error(_("Claws Mail has been compiled with "
-                                  "an older GTK+ library than is "
-                                  "currently available. This will cause "
-                                  "crashes. You need to recompile "
-                                  "Claws Mail."));
-#ifdef G_OS_WIN32
-               win32_close_log();
-#endif
-               exit(1);
-       }
-#endif 
-
 #ifdef G_OS_WIN32
        CHDIR_EXEC_CODE_RETURN_VAL_IF_FAIL(get_home_dir(), 1, win32_close_log(););
 #else
index 6b6ea7d..d22f434 100644 (file)
@@ -1093,11 +1093,7 @@ void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModif
                        
                        if (keyval == GDK_KEY_BackSpace) {
                                const gchar *accel_path;
-#if GTK_CHECK_VERSION(2,14,0)
                                accel_path = gtk_menu_item_get_accel_path(item);
-#else
-                               accel_path = GTK_MENU_ITEM(item)->accel_path;
-#endif
                                keyval = 0; modifier = 0;
                                gtk_accel_map_change_entry (accel_path, keyval, modifier, TRUE);
                        }
@@ -1546,7 +1542,6 @@ MainWindow *main_window_create()
        GtkWidget *offline_pixmap;
        GtkWidget *warning_icon;
        GtkWidget *warning_btn;
-       CLAWS_TIP_DECL();
 #endif
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
@@ -3610,7 +3605,7 @@ void main_window_popup(MainWindow *mainwin)
 {
        static gboolean first_start = TRUE;
 
-       if (!gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+       if (!gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
                main_window_show(mainwin);
 
        if (prefs_common.mainwin_maximised)
@@ -4868,7 +4863,7 @@ static void allsel_cb(GtkAction *action, gpointer data)
        MessageView *msgview = mainwin->messageview;
 
        if (messageview_is_visible(msgview) &&
-                (gtkut_widget_has_focus(msgview->mimeview->textview->text)))
+                (gtk_widget_has_focus(msgview->mimeview->textview->text)))
                messageview_select_all(mainwin->messageview);
        else
                summary_select_all(mainwin->summaryview);
index ac2cb49..4fba82d 100644 (file)
@@ -263,7 +263,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        gchar *titles[N_MIMEVIEW_COLS];
        gint i;
-       CLAWS_TIP_DECL();
 
        if (!hand_cursor)
                hand_cursor = gdk_cursor_new(GDK_HAND2);
@@ -1254,7 +1253,7 @@ static void mimeview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint colu
        if (!partinfo) return;
 
        /* ungrab the mouse event */
-       if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+       if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
                gtk_grab_remove(GTK_WIDGET(ctree));
                if (gdk_pointer_is_grabbed())
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
@@ -2376,15 +2375,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        content_type = procmime_get_content_type_str(mimeinfo->type,
                                                     mimeinfo->subtype);
 
-#if GTK_CHECK_VERSION(2,12,0)
        tip = g_strconcat("<b>", _("Type:"), "  </b>", content_type,
                          "\n<b>", _("Size:"), " </b>",
                          to_human_readable((goffset)mimeinfo->length), NULL);
-#else
-       tip = g_strconcat(_("Type:"), " ", content_type,
-                         "\n", _("Size:"), " ",
-                         to_human_readable((goffset)mimeinfo->length), NULL);
-#endif 
        g_free(content_type);
        if (desc && *desc) {
                gchar *tmp = NULL;
@@ -2393,17 +2386,10 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                } else {
                        tmp = g_strdup(desc);
                }
-#if GTK_CHECK_VERSION(2,12,0)
                tiptmp = g_strconcat(tip, "\n<b>",
                                prefs_common.attach_desc && mimeinfo->description ?
                                _("Description:") : _("Filename:"),
                                " </b>", tmp, NULL);
-#else
-               tiptmp = g_strconcat(tip, "\n",
-                               prefs_common.attach_desc && mimeinfo->description ?
-                               _("Description:") : _("Filename:"),
-                               " ", tmp, NULL);
-#endif
                g_free(tip);
                tip = tiptmp;
                g_free(tmp);
@@ -2415,11 +2401,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        }
        g_free(sigshort);
 
-#if GTK_CHECK_VERSION(2,12,0)
        gtk_widget_set_tooltip_markup(button, tip);
-#else
-       CLAWS_SET_TIP(button, tip);
-#endif
        g_free(tip);
        gtk_widget_show_all(button);
        gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
index a6d0199..334d7bc 100644 (file)
@@ -68,7 +68,6 @@ NoticeView *noticeview_create(MainWindow *mainwin)
        GtkWidget  *widget;
        GtkWidget  *widget2;
        GtkWidget  *evtbox;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating notice view...\n");
        noticeview = g_new0(NoticeView, 1);
index 7c06787..66382ea 100644 (file)
@@ -130,7 +130,6 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 
        GtkWidget *whitelist_ab_folder_combo;
        GtkWidget *whitelist_ab_select_btn;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index dacfffb..0533824 100644 (file)
@@ -157,7 +157,6 @@ static void create_dillo_prefs_page(PrefsPage *page,
        GtkWidget *whitelist_ab_folder_combo;
        GtkWidget *whitelist_ab_select_btn;
        GtkWidget *hbox_whitelist, *spacer;
-       CLAWS_TIP_DECL();
 
         vbox = gtk_vbox_new(FALSE, 3);
         gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
index 5c149ff..0fc5c6f 100644 (file)
@@ -88,7 +88,6 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
        GtkWidget *spinbtn_store_passphrase;
        GtkWidget *label_expire2;
        GtkWidget *frame_passphrase;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index 79c3074..93709ed 100644 (file)
@@ -254,7 +254,6 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        GtkListStore *store;
        GtkCellRenderer *renderer;
        GtkTreeIter iter;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index 10c4b5a..2635a36 100644 (file)
@@ -238,7 +238,7 @@ static gboolean trayicon_close_hook(gpointer source, gpointer data)
                        *close_allowed = FALSE;
                        focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
                        
-                       if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+                       if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
                                main_window_hide(mainwin);
                }
        }
@@ -250,7 +250,7 @@ static gboolean trayicon_got_iconified_hook(gpointer source, gpointer data)
        MainWindow *mainwin = mainwindow_get_mainwindow();
 
        if (trayicon_prefs.hide_when_iconified
-                       && gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))
+                       && gtk_widget_get_visible(GTK_WIDGET(mainwin->window))
                        && !gtk_window_get_skip_taskbar_hint(GTK_WINDOW(mainwin->window))) {
                focused_widget = gtk_window_get_focus(GTK_WINDOW(mainwin->window));
                gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), TRUE);
@@ -283,7 +283,7 @@ static gboolean click_cb(GtkWidget * widget,
 
        switch (event->button) {
        case 1:
-               if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window))) {
+               if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window))) {
                        if ((gdk_window_get_state(gtk_widget_get_window(
                                GTK_WIDGET(mainwin->window)))&GDK_WINDOW_STATE_ICONIFIED)
                                        || mainwindow_is_obscured()) {
@@ -348,9 +348,7 @@ static void create_trayicon()
 {
        GtkActionGroup *action_group;
        trayicon = gtk_status_icon_new();
-#if GTK_CHECK_VERSION(2,18,0)
        gtk_status_icon_set_title(GTK_STATUS_ICON(trayicon), _("Claws Mail"));
-#endif
        g_signal_connect(G_OBJECT(trayicon), "button-press-event",
                G_CALLBACK(click_cb), NULL);
 
@@ -433,7 +431,7 @@ int plugin_init(gchar **error)
        if (trayicon_prefs.hide_at_startup && claws_is_starting()) {
                MainWindow *mainwin = mainwindow_get_mainwindow();
 
-               if (gtkut_widget_get_visible(GTK_WIDGET(mainwin->window)))
+               if (gtk_widget_get_visible(GTK_WIDGET(mainwin->window)))
                        main_window_hide(mainwin);
                main_set_show_at_startup(FALSE);
        }
index 3b7d3fe..c74ff03 100644 (file)
@@ -97,7 +97,6 @@ static void create_trayicon_prefs_page(PrefsPage *page,
         GtkWidget *hide_at_startup_checkbox;
         GtkWidget *close_to_tray_checkbox;
         GtkWidget *hide_when_iconified_checkbox;
-       CLAWS_TIP_DECL();
 
         vbox = gtk_vbox_new(FALSE, 3);
         gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
index 91a3f55..d7887d5 100644 (file)
@@ -1391,7 +1391,6 @@ static void receive_create_widget_func(PrefsPage * _page,
        GtkWidget *maxarticle_label;
        GtkWidget *maxarticle_spinbtn;
        GtkAdjustment *maxarticle_spinbtn_adj;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -2404,7 +2403,6 @@ static void ssl_create_widget_func(PrefsPage * _page,
        GtkWidget *hbox;
        GtkWidget *hbox_spc;
        GtkWidget *label;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -2638,8 +2636,6 @@ static void advanced_create_widget_func(PrefsPage * _page,
        GtkWidget *trash_folder_checkbtn;
        GtkWidget *trash_folder_entry;
        GtkWidget *imap_use_trash_checkbtn;
-
-       CLAWS_TIP_DECL();
        GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 #define PACK_HBOX(hbox) \
        { \
@@ -4602,7 +4598,7 @@ static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
 {
        gboolean auth;
 
-       if (!gtkut_widget_get_sensitive (GTK_WIDGET (button)))
+       if (!gtk_widget_get_sensitive (GTK_WIDGET (button)))
                return;
        auth = gtk_toggle_button_get_active (button);
        gtk_widget_set_sensitive(basic_page.uid_label,  auth);
index d95e38d..9513a84 100644 (file)
@@ -197,7 +197,6 @@ static void prefs_actions_create(MainWindow *mainwin)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
        static GdkGeometry geometry;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating actions configuration window...\n");
 
index 061ff79..1e18543 100644 (file)
@@ -82,7 +82,6 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *exteditor_entry;
        GtkWidget *astextviewer_label;
        GtkWidget *astextviewer_entry;
-       CLAWS_TIP_DECL();
        int i = 0;
        gchar *tmp;
 
index ccff282..25daf17 100644 (file)
@@ -330,7 +330,6 @@ static void prefs_filtering_create(void)
        GtkWidget *bottom_btn;
        GtkWidget *table;
        static GdkGeometry geometry;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating filtering configuration window...\n");
 
index 82a6e9f..287aad3 100644 (file)
@@ -249,7 +249,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *enable_processing_when_opening_rec_checkbtn;
        GtkWidget *newmailcheck_rec_checkbtn;
        GtkWidget *offlinesync_rec_checkbtn;
-       CLAWS_TIP_DECL();
 
        page->item         = item;
 
index 075d033..3df25b7 100644 (file)
@@ -58,7 +58,6 @@ static void imageviewer_create_widget_func(PrefsPage * _page,
        GtkWidget *resize_img;
        GtkWidget *inline_img;
        GtkWidget *print_imgs;
-       CLAWS_TIP_DECL();
 
        table = gtk_table_new(4, 1, FALSE);
        gtk_widget_show(table);
index e22d659..fe64d9e 100644 (file)
@@ -130,7 +130,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_log_error;
        GtkWidget *checkbtn_log_status;
        GtkSizeGroup *log_size_group;
-       CLAWS_TIP_DECL();
        
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index a152cee..df3e905 100644 (file)
@@ -133,7 +133,6 @@ static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        gint c;
        gchar *tooltip_btn_text = NULL;
        gchar *tooltip_entry_text = NULL;
-       CLAWS_TIP_DECL();
 
        notebook = gtk_notebook_new();
        gtk_widget_show(notebook);
index 50642d2..13176d1 100644 (file)
@@ -461,7 +461,6 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *flush_metadata_safer_radiobtn;
 
        gchar *shred_binary = NULL;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index de0c028..9c8df7c 100644 (file)
@@ -145,7 +145,6 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_confirm_send_queued_messages;
        GtkWidget *checkbtn_never_send_retrcpt;
        GtkWidget *table;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index d0d82da..ba70972 100644 (file)
@@ -116,8 +116,6 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
        GtkWidget *misspelled_hbox;
        GtkWidget *misspelled_colorbtn;
 
-       CLAWS_TIP_DECL();
-
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
index 44ce060..da6e032 100644 (file)
@@ -345,7 +345,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *button_edit_actions;
        GtkWidget *radio_mark_as_read_on_select;
        GtkWidget *radio_mark_as_read_on_new_win;
-       CLAWS_TIP_DECL();
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
index 9e71a8d..a5f52a2 100644 (file)
@@ -184,7 +184,6 @@ static void prefs_template_window_create(void)
        GtkWidget         *ok_btn;
        static GdkGeometry geometry;
        gint i;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating templates configuration window...\n");
 
index 7df939c..d8e9fd0 100644 (file)
@@ -193,7 +193,6 @@ GtkPageSetup *printing_get_page_setup(void)
 
                read_from_file = FALSE;
 
-#if GTK_CHECK_VERSION(2,14,0)
                /* try reading the page setup from file */
                page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, 
                                                  PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
@@ -212,11 +211,6 @@ GtkPageSetup *printing_get_page_setup(void)
                } else {
                        debug_print("Printing: Could not read page setup from key file\n");
                }
-#else
-               key_file_read = FALSE;
-               keyfile = NULL;
-               page_setup_filename = NULL;
-#endif
 
                /* if reading from file did not work, or has not been tried (GTK+ < 2.14), use prefs */
                if (!read_from_file) {
@@ -282,10 +276,8 @@ void printing_print_full(GtkWindow *parent, PrintRenderer *renderer, gpointer re
        /* Config for printing */
        gtk_print_operation_set_print_settings(op, settings);
        gtk_print_operation_set_default_page_setup(op, page_setup);
-#if GTK_CHECK_VERSION(2, 18, 0)
         /* enable Page Size and Orientation in the print dialog */
        gtk_print_operation_set_embed_page_setup(op, TRUE);
-#endif
 
        /* signals */
        g_signal_connect(op, "begin_print", G_CALLBACK(renderer->cb_begin_print), print_data);
@@ -387,7 +379,6 @@ void printing_page_setup(GtkWindow *parent)
        prefs_common.print_margin_right  = (int) (100*gtk_page_setup_get_right_margin(page_setup,
                                                                PAGE_MARGIN_STORAGE_UNIT));
 
-#if GTK_CHECK_VERSION(2,14,0)
        /* save to file */
        keyfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                              PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);
@@ -395,7 +386,6 @@ void printing_page_setup(GtkWindow *parent)
                debug_print("Printing: Could not store page setup in file `%s'\n", keyfile);
        }
        g_free(keyfile);
-#endif
 }
 
 static gboolean cb_preview(GtkPrintOperation        *operation,
@@ -416,7 +406,6 @@ static gboolean cb_preview(GtkPrintOperation        *operation,
        static GdkGeometry geometry;
        GtkWidget *dialog = NULL;
        GtkWidget *statusbar = gtk_hbox_new(2, FALSE);
-       CLAWS_TIP_DECL();
 
        debug_print("Creating internal print preview\n");
 
index 85c36ee..81b68c5 100644 (file)
@@ -176,8 +176,6 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
        gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
 
        if (override_from_format) {
-               CLAWS_TIP_DECL();
-
                hbox2_format = gtk_hbox_new (FALSE, 8);
                gtk_widget_show (hbox2_format);
                gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0);
@@ -302,8 +300,6 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
        gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
 
        if (override_from_format) {
-               CLAWS_TIP_DECL();
-
                hbox3 = gtk_hbox_new (FALSE, 8);
                gtk_widget_show (hbox3);
                gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
@@ -432,8 +428,6 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
        gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
 
        if (override_from_format) {
-               CLAWS_TIP_DECL();
-
                hbox3 = gtk_hbox_new (FALSE, 8);
                gtk_widget_show (hbox3);
                gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
index 3806e60..4b841aa 100644 (file)
@@ -509,7 +509,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
                (dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
 
        if (mainwin) {
-               if (!gtkut_widget_get_visible(mainwin->progressbar))    
+               if (!gtk_widget_get_visible(mainwin->progressbar))      
                        gtk_widget_show(mainwin->progressbar);
                gtk_progress_bar_set_fraction
                        (GTK_PROGRESS_BAR(mainwin->progressbar),
index 020031e..8700c43 100644 (file)
@@ -65,11 +65,7 @@ GtkWidget *statusbar_create(void)
                                          FALSE);
 #endif
        gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
-#if GTK_CHECK_VERSION (2, 19, 1)
        child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
-#else
-       child = GTK_STATUSBAR(statusbar)->label;
-#endif
        parent = gtk_widget_get_parent(child);
        gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
        hbox = gtk_hbox_new(FALSE, 0);
@@ -255,7 +251,7 @@ void statusbar_progress_all (gint done, gint total, gint step)
                gtk_progress_bar_set_text(progressbar, buf);
                gtk_progress_bar_set_fraction(progressbar,
                         (total == 0) ? 0 : (gfloat)done / (gfloat)total);
-               if (!gtkut_widget_get_visible(GTK_WIDGET(progressbar)))
+               if (!gtk_widget_get_visible(GTK_WIDGET(progressbar)))
                        gtk_widget_show(GTK_WIDGET(progressbar));
        } else if (total == 0) {
                gtk_progress_bar_set_text(progressbar, "");
index 762e72c..4019226 100644 (file)
@@ -222,7 +222,6 @@ static void summary_search_create(void)
        GtkWidget *close_btn;
        GtkWidget *stop_btn;
        gboolean is_searching = FALSE;
-       CLAWS_TIP_DECL();
 
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "summary_search");
        gtk_window_set_title(GTK_WINDOW (window), _("Search messages"));
index 7ebdedb..8cfab90 100644 (file)
@@ -512,7 +512,6 @@ SummaryView *summary_create(MainWindow *mainwin)
        GtkWidget *toggle_arrow;
        GtkWidget *toggle_search;
        QuickSearch *quicksearch;
-       CLAWS_TIP_DECL();
 
        debug_print("Creating summary view...\n");
        summaryview = g_new0(SummaryView, 1);
@@ -2450,9 +2449,7 @@ static void summary_status_show(SummaryView *summaryview)
        goffset sel_size = 0, n_size = 0;
        MsgInfo *msginfo;
        gchar *name;
-#if GTK_CHECK_VERSION(2, 12, 0)
        gchar *tooltip;
-#endif
        
        if (!summaryview->folder_item) {
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
@@ -2569,7 +2566,6 @@ static void summary_status_show(SummaryView *summaryview)
 
                gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
                g_free(str);
-#if GTK_CHECK_VERSION(2, 12, 0)
                tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
                                            "<b>New:</b> %d\n"
                                            "<b>Unread:</b> %d\n"
@@ -2589,7 +2585,6 @@ static void summary_status_show(SummaryView *summaryview)
                gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
                                            tooltip); 
                g_free(tooltip);
-#endif
        } else {
                gchar *ssize, *tsize;
                if (n_selected) {
@@ -3137,13 +3132,9 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
        gboolean should_swap = FALSE;
        gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-#if GTK_CHECK_VERSION(2,12,0)
        static const gchar *color_dim_rgb = NULL;
        if (!color_dim_rgb)
                color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
-#else
-       static const gchar *color_dim_rgb = "#888888";
-#endif
        text[col_pos[S_COL_FROM]]   = "";
        text[col_pos[S_COL_TO]]     = "";
        text[col_pos[S_COL_SUBJECT]]= "";
@@ -6122,7 +6113,7 @@ static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
        return TRUE;
 }
 
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
 static gchar *summaryview_get_tooltip_text(SummaryView *summaryview, MsgInfo *info, gint column)
 {
        MsgFlags flags;
@@ -6436,7 +6427,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                         G_CALLBACK(summary_drag_motion_cb),
                         summaryview);
 
-#if GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
+#if !GENERIC_UMPC
        g_object_set (G_OBJECT(ctree), "has-tooltip", TRUE, NULL);
        g_signal_connect(G_OBJECT(ctree), "query-tooltip", 
                         G_CALLBACK(tooltip_cb),
index c275e29..50ee77d 100644 (file)
@@ -1123,7 +1123,6 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        gchar *uri, *mount_path;
 #endif
        GtkWidget *hbox;
-       CLAWS_TIP_DECL();
 
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
@@ -1259,7 +1258,6 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        GtkWidget *smtp_cert_table;
 #endif
        gchar *text;
-       CLAWS_TIP_DECL();
        
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
@@ -1524,7 +1522,6 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        GtkTreeIter iter;
        gchar *text;
        gint index = 0;
-       CLAWS_TIP_DECL();
 
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);