2010-10-02 [colin] 3.7.6cvs44
authorColin Leroy <colin@colino.net>
Sat, 2 Oct 2010 15:02:54 +0000 (15:02 +0000)
committerColin Leroy <colin@colino.net>
Sat, 2 Oct 2010 15:02:54 +0000 (15:02 +0000)
* src/action.c
* src/addr_compl.c
* src/addressbook.c
* src/addrgather.c
* src/alertpanel.c
* src/editaddress.c
* src/editaddress_other_attributes_ldap.c
* src/editgroup.c
* src/folderview.c
* src/grouplistdialog.c
* src/headerview.c
* src/image_viewer.c
* src/importldif.c
* src/main.c
* src/mainwindow.c
* src/message_search.c
* src/mimeview.c
* src/prefs_themes.c
* src/summary_search.c
* src/summaryview.c
* src/toolbar.c
* src/etpan/imap-thread.c
* src/gtk/authors.h
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/plugins/pgpcore/select-keys.c
* src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
Undeprecate for GTK+2.22. Patch by Reed Loden.
Fixes bug #2276, 'Compile in maintainer mode
fails on GTK+ 2.22'.

33 files changed:
ChangeLog
PATCHSETS
configure.ac
src/action.c
src/addr_compl.c
src/addressbook.c
src/addrgather.c
src/alertpanel.c
src/editaddress.c
src/editaddress_other_attributes_ldap.c
src/editgroup.c
src/etpan/imap-thread.c
src/folderview.c
src/grouplistdialog.c
src/gtk/authors.h
src/gtk/gtkcmclist.c
src/gtk/gtkcmoptionmenu.c
src/gtk/gtkutils.c
src/gtk/gtkutils.h
src/gtk/gtkvscrollbutton.c
src/headerview.c
src/image_viewer.c
src/importldif.c
src/main.c
src/mainwindow.c
src/message_search.c
src/mimeview.c
src/plugins/pgpcore/select-keys.c
src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
src/prefs_themes.c
src/summary_search.c
src/summaryview.c
src/toolbar.c

index 7b62a6023185f9f3a47988da537e9d0719808b14..d23571c03984c3e4d5d3d15f9955fd73cfda4819 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2010-10-02 [colin]     3.7.6cvs44
+
+       * src/action.c
+       * src/addr_compl.c
+       * src/addressbook.c
+       * src/addrgather.c
+       * src/alertpanel.c
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.c
+       * src/editgroup.c
+       * src/folderview.c
+       * src/grouplistdialog.c
+       * src/headerview.c
+       * src/image_viewer.c
+       * src/importldif.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/message_search.c
+       * src/mimeview.c
+       * src/prefs_themes.c
+       * src/summary_search.c
+       * src/summaryview.c
+       * src/toolbar.c
+       * src/etpan/imap-thread.c
+       * src/gtk/authors.h
+       * src/gtk/gtkcmclist.c
+       * src/gtk/gtkcmoptionmenu.c
+       * src/gtk/gtkutils.c
+       * src/gtk/gtkutils.h
+       * src/gtk/gtkvscrollbutton.c
+       * src/plugins/pgpcore/select-keys.c
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
+               Undeprecate for GTK+2.22. Patch by Reed Loden.
+               Fixes bug #2276, 'Compile in maintainer mode
+               fails on GTK+ 2.22'.
+
 2010-10-02 [colin]     3.7.6cvs43
 
        * configure.ac
index 37ef373aa67b8cefd2de97617b2279ca2572d54e..56eedb2673850c4e3374b2a478ead67dd0abc59b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.559 -r 1.382.2.560 src/compose.c;  cvs diff -u -r 1.274.2.316 -r 1.274.2.317 src/mainwindow.c;  cvs diff -u -r 1.395.2.423 -r 1.395.2.424 src/summaryview.c;  ) > 3.7.6cvs41.patchset
 ( cvs diff -u -r 1.105.2.160 -r 1.105.2.161 src/prefs_account.c;  cvs diff -u -r 1.1.4.63 -r 1.1.4.64 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.84 -r 1.43.2.85 src/prefs_matcher.c;  ) > 3.7.6cvs42.patchset
 ( cvs diff -u -r 1.654.2.4111 -r 1.654.2.4112 configure.ac;  ) > 3.7.6cvs43.patchset
+( cvs diff -u -r 1.12.2.59 -r 1.12.2.60 src/action.c;  cvs diff -u -r 1.27.2.47 -r 1.27.2.48 src/addr_compl.c;  cvs diff -u -r 1.60.2.137 -r 1.60.2.138 src/addressbook.c;  cvs diff -u -r 1.5.10.31 -r 1.5.10.32 src/addrgather.c;  cvs diff -u -r 1.17.2.40 -r 1.17.2.41 src/alertpanel.c;  cvs diff -u -r 1.14.2.56 -r 1.14.2.57 src/editaddress.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.11.2.24 -r 1.11.2.25 src/editgroup.c;  cvs diff -u -r 1.207.2.216 -r 1.207.2.217 src/folderview.c;  cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/headerview.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/image_viewer.c;  cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/importldif.c;  cvs diff -u -r 1.115.2.229 -r 1.115.2.230 src/main.c;  cvs diff -u -r 1.274.2.317 -r 1.274.2.318 src/mainwindow.c;  cvs diff -u -r 1.3.12.33 -r 1.3.12.34 src/message_search.c;  cvs diff -u -r 1.83.2.163 -r 1.83.2.164 src/mimeview.c;  cvs diff -u -r 1.3.2.64 -r 1.3.2.65 src/prefs_themes.c;  cvs diff -u -r 1.15.2.58 -r 1.15.2.59 src/summary_search.c;  cvs diff -u -r 1.395.2.424 -r 1.395.2.425 src/summaryview.c;  cvs diff -u -r 1.43.2.119 -r 1.43.2.120 src/toolbar.c;  cvs diff -u -r 1.1.4.111 -r 1.1.4.112 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/gtk/authors.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.5.2.90 -r 1.5.2.91 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.7.6cvs44.patchset
index d160a69147d61bf7b4022350c7ca84eb2182bf8b..1597079a55c39292a868d22b0a51e0cba19e2143 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 81e28fa06ee583005f147b9691341a28b55f53dc..60655d7cbd91ad06e811180f854ff3e7608b53a3 100644 (file)
@@ -951,7 +951,7 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
                        perror("setpgid");
 
 #ifdef GDK_WINDOWING_X11
-               (void)close(ConnectionNumber(gdk_display));
+               (void)close(ConnectionNumber(gdk_display_get_default()));
 #endif /* GDK_WINDOWING_X11 */
 
                gch_pid = fork();
index 41107c5f86cdd1f6cb0cd643a4bb5a8227ffa1fc..7ff56ec15def91fdcd1bd2fdce0e4672d25f7213 100644 (file)
@@ -1373,7 +1373,7 @@ static void address_completion_create_completion_window( GtkEntry *entry_ )
         *
         * GTK1: this gets rid of the irritating focus rectangle that doesn't
         * follow the selection */
-       GTK_WIDGET_UNSET_FLAGS(list_view, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(list_view, FALSE);
 }
 
 /**
index d4b07d0a93b090f45e2b7a07e820fc0322798c0a..f608e7984646668aaf2595f6c04f4d079f896da8 100644 (file)
@@ -1012,8 +1012,7 @@ static void addressbook_create(void)
 
        /* Address index */
        ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
-       GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[0].button,
-                              GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
 
        gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
        gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
@@ -1103,8 +1102,8 @@ static void addressbook_create(void)
                G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
 
        for (i = 0; i < N_LIST_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button,
-                                      GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
+                                        FALSE);
 
        g_signal_connect(G_OBJECT(clist), "tree_select_row",
                         G_CALLBACK(addressbook_list_row_selected), NULL);
@@ -1172,18 +1171,18 @@ static void addressbook_create(void)
        gtkut_stock_button_add_help(hbbox, &help_btn);
 
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
-       GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(edit_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
-       GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(del_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
        reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
-       GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(reg_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
 
 
        lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
-       GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(lup_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
 
        g_signal_connect(G_OBJECT(help_btn), "clicked",
@@ -1201,19 +1200,19 @@ static void addressbook_create(void)
 
        to_btn = gtk_button_new_with_label
                (prefs_common_translated_header_name("To:"));
-       GTK_WIDGET_SET_FLAGS(to_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(to_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
        cc_btn = gtk_button_new_with_label
                (prefs_common_translated_header_name("Cc:"));
-       GTK_WIDGET_SET_FLAGS(cc_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(cc_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
        bcc_btn = gtk_button_new_with_label
                (prefs_common_translated_header_name("Bcc:"));
-       GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(bcc_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
 
        close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-       GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(close_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
 
        g_signal_connect(G_OBJECT(to_btn), "clicked",
index 44c5ed2a67e0da4d0fb83ed36f9734039e883ac4..82d982293a39df17883d616c35f455a67830e371 100644 (file)
@@ -408,7 +408,7 @@ static void addrgather_page_finish( gint pageNum, gchar *pageLbl ) {
                        GTK_CMCLIST(clistCount), FIELD_COL_COUNT, FIELDS_COL_WIDTH_COUNT );
 
        for( i = 0; i < FIELDS_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clistCount)->column[i].button, GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clistCount)->column[i].button, FALSE);
 
        addrgather_dlg.clistCount = clistCount;
 }
index be852d8478ab4a5709847dc09f96fe396ee9daa9..a30884f1a0fd7803a8b343ba0ef797eaf47139f9 100644 (file)
@@ -326,7 +326,7 @@ static void alertpanel_create(const gchar *title,
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-       GTK_WIDGET_UNSET_FLAGS(label, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(label, FALSE);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
                
index b5e8e3ceafff3808737397ac7cac74139aa03ff6..77db4c37d482d4c45f4fe5acfd483c0626f4cd3b 100644 (file)
@@ -280,7 +280,7 @@ static void edit_person_attrib_clear( gpointer data ) {
        }
 }
 
-static void edit_person_switch_page( GtkNotebook *notebook, GtkNotebookPage *page,
+static void edit_person_switch_page( GtkNotebook *notebook, gpointer page,
                                        gint pageNum, gpointer user_data)
 {
        edit_person_set_window_title( pageNum );
@@ -1093,7 +1093,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gtk_cmclist_set_column_width( GTK_CMCLIST(clist), EMAIL_COL_ALIAS, EMAIL_COL_WIDTH_ALIAS );
 
        for( i = 0; i < EMAIL_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
 
        /* Data entry area */
        table = gtk_table_new( 4, 2, FALSE);
@@ -1303,7 +1303,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        gtk_cmclist_set_column_width( GTK_CMCLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
 
        for( i = 0; i < ATTRIB_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
 
        /* Data entry area */
 #ifndef GENERIC_UMPC
index bd316248edd7e2c28dd46c90363890ee61461cac..8742bbb63a17b88aed7fd1b2a02a4add137d2f69 100644 (file)
@@ -335,7 +335,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
        gtk_cmclist_set_auto_sort(GTK_CMCLIST(clist), TRUE);
 
        for (i = 0; i < ATTRIB_N_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button, FALSE);
 
        /* Data entry area */
        table = gtk_table_new(4, 2, FALSE);
index d3cd3abb0637079ea7910f0452635693aeb736a3..3ec4c2096a549e8e5338688d5b83b7d2972c830c 100644 (file)
@@ -368,7 +368,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist_group), TRUE );
 
        for( i = 0; i < GROUP_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist_group)->column[i].button, GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clist_group)->column[i].button, FALSE);
 
        /* Available list */
        vboxl = gtk_vbox_new( FALSE, 0 );
@@ -406,7 +406,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist_avail), TRUE );
 
        for( i = 0; i < GROUP_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist_avail)->column[i].button, GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(clist_avail)->column[i].button, FALSE);
 
        /* Status line */
        hsbox = gtk_hbox_new(FALSE, 0);
index 8cb700d0ab44e2c17b9e0b6efb9de47293dd8099..0ab660a05fba8fe760e2948d3da6f041c25d3f16 100644 (file)
@@ -1203,7 +1203,7 @@ int imap_threaded_starttls(Folder * folder, const gchar *host, int port)
        struct connect_param param;
        struct starttls_result result;
        int cert_len;
-       unsigned char *certificate;
+       unsigned char *certificate = NULL;
        
        debug_print("imap starttls - begin\n");
        
index 6b73fb1d382b20f7575e67ba738fa4af2287bf43..09b3d8819461ff9a0c8faa9d4c00cb90e19bc112 100644 (file)
@@ -463,8 +463,7 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
 
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++) {
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
-                                      GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
                gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[i],
                                   prefs_common.folder_col_size[i]);
                gtk_cmclist_set_column_visibility
index 3bddf372693fafc16410bd73d28add2bcb81a79f..7181655ad7e1eed8fe53ae4c1eca06d020a2219c 100644 (file)
@@ -221,8 +221,7 @@ static void grouplist_dialog_create(void)
        }
 
        for (i = 0; i < 3; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
-                                      GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
        g_signal_connect(G_OBJECT(ctree), "button-press-event",
                         G_CALLBACK(button_press_cb), NULL);
 
index facf084c318c2a133c6c66242c241f5e88795a97..fb826e97c28985308f42bda6756acdb1da28493b 100644 (file)
@@ -167,6 +167,7 @@ static char *CONTRIBS_LIST[] = {
 "Jérôme Lelong",
 "Eric Limpens",
 "Thomas Link",
+"Reed Loden",
 "David Looney",
 "Alessandro Maestri",
 "Maki",
index cc15b0e001c6089767a4c0651670d0499fd14502..bc2118f5627295f6615ec52d0132f928f594df23 100644 (file)
@@ -1052,8 +1052,8 @@ gtk_cmclist_init (GtkCMCList *clist)
 {
   clist->flags = 0;
 
-  GTK_WIDGET_UNSET_FLAGS (clist, GTK_NO_WINDOW);
-  GTK_WIDGET_SET_FLAGS (clist, GTK_CAN_FOCUS);
+  gtkut_widget_set_has_window (GTK_WIDGET(clist), TRUE);
+  gtkut_widget_set_can_focus (GTK_WIDGET(clist), TRUE);
   GTK_CMCLIST_SET_FLAG (clist, CMCLIST_DRAW_DRAG_LINE);
   GTK_CMCLIST_SET_FLAG (clist, CMCLIST_USE_DRAG_ICONS);
 
@@ -1454,7 +1454,7 @@ gtk_cmclist_column_title_active (GtkCMCList *clist,
   g_signal_handlers_disconnect_matched(G_OBJECT (clist->column[column].button), G_SIGNAL_MATCH_FUNC,
                    0, 0, 0, column_title_passive_func, 0);
 
-  GTK_WIDGET_SET_FLAGS (clist->column[column].button, GTK_CAN_FOCUS);
+  gtkut_widget_set_can_focus (clist->column[column].button, TRUE);
   if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
     gtk_widget_queue_draw (clist->column[column].button);
 }
@@ -1490,7 +1490,7 @@ gtk_cmclist_column_title_passive (GtkCMCList *clist,
   g_signal_connect (G_OBJECT (clist->column[column].button), "event",
                      G_CALLBACK(column_title_passive_func), NULL);
 
-  GTK_WIDGET_UNSET_FLAGS (clist->column[column].button, GTK_CAN_FOCUS);
+  gtkut_widget_set_can_focus (clist->column[column].button, FALSE);
   if (gtkut_widget_get_visible (GTK_WIDGET(clist)))
     gtk_widget_queue_draw (clist->column[column].button);
 }
@@ -4521,7 +4521,7 @@ gtk_cmclist_realize (GtkWidget *widget)
 
   clist = GTK_CMCLIST (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtkut_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
   
@@ -4679,7 +4679,7 @@ gtk_cmclist_unrealize (GtkWidget *widget)
   if (gtkut_widget_get_mapped (widget))
     gtk_cmclist_unmap (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtkut_widget_set_mapped (widget, FALSE);
 
   /* detach optional row/cell styles */
   if (gtkut_widget_get_realized (widget))
@@ -4748,7 +4748,7 @@ gtk_cmclist_map (GtkWidget *widget)
 
   if (!gtkut_widget_get_mapped (widget))
     {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+      gtkut_widget_set_mapped (widget, TRUE);
 
       /* map column buttons */
       for (i = 0; i < clist->columns; i++)
@@ -4787,7 +4787,7 @@ gtk_cmclist_unmap (GtkWidget *widget)
 
   if (gtkut_widget_get_mapped (widget))
     {
-      GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+      gtkut_widget_set_mapped (widget, FALSE);
 
       if (clist_has_grab (clist))
        {
index 868554c7e0c65cd566f3150b7940cfdf107cff04..dd6d8e2b56730388f6a660a651f196c1f9f7f165 100644 (file)
@@ -183,8 +183,9 @@ gtk_cmoption_menu_child_type (GtkContainer       *container)
 static void
 gtk_cmoption_menu_init (GtkCMOptionMenu *option_menu)
 {
-  GTK_WIDGET_SET_FLAGS (option_menu, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (option_menu, GTK_CAN_DEFAULT | GTK_RECEIVES_DEFAULT);
+  gtkut_widget_set_can_focus (GTK_WIDGET(option_menu), TRUE);
+  gtkut_widget_set_can_default (GTK_WIDGET(option_menu), FALSE);
+  gtkut_widget_set_receives_default (GTK_WIDGET(option_menu), FALSE);
 
   option_menu->menu = NULL;
   option_menu->menu_item = NULL;
index 341c05da597d395ac6646806b2aa08c86e09348a..71cb1f7e42aa78df7c9d1270795b63a286d5f5ee 100644 (file)
@@ -126,7 +126,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
 
        *help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
 
-       GTK_WIDGET_SET_FLAGS(*help_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*help_btn, TRUE);
        gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);
        gtk_button_box_set_child_secondary(GTK_BUTTON_BOX (bbox),
                        *help_btn, TRUE);
@@ -163,20 +163,20 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
        gtk_box_set_spacing(GTK_BOX(*bbox), 5);
 
        *button1 = gtk_button_new_from_stock(label1);
-       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*button1, TRUE);
        gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
        gtk_widget_show(*button1);
 
        if (button2) {
                *button2 = gtk_button_new_from_stock(label2);
-               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button2, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
 
        if (button3) {
                *button3 = gtk_button_new_from_stock(label3);
-               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button3, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }
@@ -197,7 +197,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
        *button1 = gtk_button_new_with_mnemonic(text1);
        gtk_button_set_image(GTK_BUTTON(*button1),
                gtk_image_new_from_stock(label1, GTK_ICON_SIZE_BUTTON));
-       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(*button1, TRUE);
        gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
        gtk_widget_show(*button1);
 
@@ -205,7 +205,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                *button2 = gtk_button_new_with_mnemonic(text2);
                gtk_button_set_image(GTK_BUTTON(*button2),
                        gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
-               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button2, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
@@ -214,7 +214,7 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
                *button3 = gtk_button_new_with_mnemonic(text3);
                gtk_button_set_image(GTK_BUTTON(*button3),
                        gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
-               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
+               gtkut_widget_set_can_default(*button3, TRUE);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }
@@ -1797,3 +1797,75 @@ gboolean gtkut_widget_get_app_paintable(GtkWidget *widget)
        return GTK_WIDGET_APP_PAINTABLE(widget);
 #endif
 }
+
+void gtkut_widget_set_mapped(GtkWidget *widget, gboolean mapped)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_mapped(widget, mapped);
+#else
+       if (mapped)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_MAPPED);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_MAPPED);
+#endif
+}
+
+void gtkut_widget_set_realized(GtkWidget *widget, gboolean realized)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_realized(widget, realized);
+#else
+       if (realized)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_REALIZED);
+#endif
+}
+
+void gtkut_widget_set_can_default(GtkWidget *widget, gboolean can_default)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_can_default(widget, can_default);
+#else
+       if (can_default)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT);
+#endif
+}
+
+void gtkut_widget_set_receives_default(GtkWidget *widget, gboolean receives_default)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_receives_default(widget, receives_default);
+#else
+       if (receives_default)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_RECEIVES_DEFAULT);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_RECEIVES_DEFAULT);
+#endif
+}
+
+void gtkut_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_can_focus(widget, can_focus);
+#else
+       if (can_focus)
+               GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
+       else
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS);
+#endif
+}
+
+void gtkut_widget_set_has_window(GtkWidget *widget, gboolean has_window)
+{
+#if GTK_CHECK_VERSION(2,20,0)
+       gtk_widget_set_has_window(widget, has_window);
+#else
+       if (has_window) /* Inverted logic there */
+               GTK_WIDGET_UNSET_FLAGS(widget, GTK_NO_WINDOW);
+       else
+               GTK_WIDGET_SET_FLAGS(widget, GTK_NO_WINDOW);
+#endif
+}
index aabc4b338656e3e7b6a6236223540948b7d24bed..80123b52d4e1fe49190f2f0199c9aee0fc146e05 100644 (file)
@@ -176,6 +176,13 @@ 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);
+void gtkut_widget_set_receives_default  (GtkWidget *widget, gboolean receives_default);
+void gtkut_widget_set_can_focus         (GtkWidget *widget, gboolean can_focus);
+void gtkut_widget_set_has_window        (GtkWidget *widget, gboolean has_window);
+
 
 GtkWidget *gtkut_account_menu_new      (GList                  *ac_list,
                                         GCallback               callback,
index 3d896e92414b85c8cb8b627a16b6e5e9a375d603..471e0605a3aba0bd909d74e6f43f9cbedb7bae77 100644 (file)
@@ -157,8 +157,8 @@ static void gtk_vscrollbutton_init(GtkVScrollbutton *scrollbutton)
     gtk_widget_show(arrow);
     gtk_container_add(GTK_CONTAINER(scrollbutton->downbutton), arrow);
     gtk_widget_set_size_request(scrollbutton->downbutton, -1, 16);
-    GTK_WIDGET_UNSET_FLAGS(scrollbutton->upbutton, GTK_CAN_FOCUS);
-    GTK_WIDGET_UNSET_FLAGS(scrollbutton->downbutton, GTK_CAN_FOCUS);
+    gtkut_widget_set_can_focus(scrollbutton->upbutton, FALSE);
+    gtkut_widget_set_can_focus(scrollbutton->downbutton, FALSE);
     gtk_widget_show(scrollbutton->downbutton);
     gtk_widget_show(scrollbutton->upbutton);
 
index d57f3a87a66478869ec678299c3de573055feb7e..3656d7438f8bc173f0b79020a5b01d41a93ed5b0 100644 (file)
@@ -112,11 +112,11 @@ HeaderView *headerview_create(void)
        gtk_label_set_selectable(GTK_LABEL(subject_body_label), TRUE);
        gtk_label_set_selectable(GTK_LABEL(tags_body_label), TRUE);
 
-       GTK_WIDGET_UNSET_FLAGS(from_body_label, GTK_CAN_FOCUS);
-       GTK_WIDGET_UNSET_FLAGS(to_body_label, GTK_CAN_FOCUS);
-       GTK_WIDGET_UNSET_FLAGS(ng_body_label, GTK_CAN_FOCUS);
-       GTK_WIDGET_UNSET_FLAGS(subject_body_label, GTK_CAN_FOCUS);
-       GTK_WIDGET_UNSET_FLAGS(tags_body_label, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(from_body_label, FALSE);
+       gtkut_widget_set_can_focus(to_body_label, FALSE);
+       gtkut_widget_set_can_focus(ng_body_label, FALSE);
+       gtkut_widget_set_can_focus(subject_body_label, FALSE);
+       gtkut_widget_set_can_focus(tags_body_label, FALSE);
 
        gtk_box_pack_start(GTK_BOX(hbox1), from_header_label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox1), from_body_label, FALSE, FALSE, 0);
index 67d30688c9e01dcba54634392ff66db7f26afdb0..883ef5100eaf58931b902be473dbeb70db19097d 100644 (file)
@@ -284,7 +284,7 @@ static MimeViewer *image_viewer_create(void)
 
        notebook = gtk_notebook_new();
        gtk_widget_show(notebook);
-       GTK_WIDGET_UNSET_FLAGS(notebook, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(notebook, FALSE);
        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
        gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
 
index fc03fcaced3f97612bedf978408c2b7eb3c3e3dd..318ef482cbb6562ad045e46b6b7027354f38f98b 100644 (file)
@@ -764,9 +764,9 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
 
        /* Remove focus capability for column headers */
        for( i = 0; i < FIELDS_N_COLS; i++ ) {
-               GTK_WIDGET_UNSET_FLAGS(
+               gtkut_widget_set_can_focus(
                        GTK_CMCLIST(clist_field)->column[i].button,
-                       GTK_CAN_FOCUS);
+                       FALSE);
        }
 
        /* Lower area - Edit area */
@@ -981,7 +981,7 @@ static void imp_ldif_dialog_create() {
        btnProceed = gtk_button_new_with_mnemonic(_("Proceed"));
        gtk_button_set_image(GTK_BUTTON(btnProceed),
                        gtk_image_new_from_stock(GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
-       GTK_WIDGET_SET_FLAGS(btnProceed, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(btnProceed, TRUE);
        gtk_box_pack_start(GTK_BOX(hbbox), btnProceed, TRUE, TRUE, 0);
        gtk_widget_hide(btnProceed);
 
index 80569c22dac3b1bbbfa239c58270318f45045b06..30c26faa117bd92d94b20c4f8f6e4cd38e8a5ad5 100644 (file)
@@ -321,7 +321,7 @@ static void startup_notification_complete(gboolean with_window)
                gtk_widget_show(hack);
        }
 
-       xdisplay = GDK_DISPLAY();
+       xdisplay = gdk_display_get_default();
        sn_display = sn_display_new(xdisplay,
                                sn_error_trap_push,
                                sn_error_trap_pop);
index 784c13d018a65d3c2d7b576b2491dd7bfce68020..a7b0381fb46f24f66e437a7c5a86d552e220b08e 100644 (file)
@@ -2035,7 +2035,7 @@ MainWindow *main_window_create()
        online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
        offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
        online_switch = gtk_button_new ();
-       GTK_WIDGET_UNSET_FLAGS(online_switch, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(online_switch, FALSE);
        CLAWS_SET_TIP(online_switch, 
                             _("You are online. Click the icon to go offline"));
        offline_switch = gtk_button_new ();
@@ -2055,7 +2055,7 @@ MainWindow *main_window_create()
 
        ac_button = gtk_button_new();
        CLAWS_SET_TIP(ac_button, _("Select account"));
-       GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(ac_button, FALSE);
        gtk_widget_set_size_request(ac_button, -1, 0);
        gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(ac_button), "button_press_event",
index 49ed50edb9078d862238929a32ebe2212caec146..a8ae1e2d02f2fd7c66c7d38bb6bac3b3472db4fc 100644 (file)
@@ -219,23 +219,23 @@ static void message_search_create(void)
        gtkut_stock_button_add_help(confirm_area, &help_btn);
 
        prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
-       GTK_WIDGET_SET_FLAGS(prev_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(prev_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
        gtk_widget_show(prev_btn);
 
        next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
-       GTK_WIDGET_SET_FLAGS(next_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(next_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
        gtk_widget_show(next_btn);
 
        close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-       GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(close_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
        gtk_widget_show(close_btn);
 
        /* stop button hidden */
        stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
-       GTK_WIDGET_SET_FLAGS(stop_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(stop_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
 
        gtk_widget_show (confirm_area);
index 66959276589098b3bc50da709377c947a88b6a40..c7d6116de874826ed61e9fd540aad2059b490a72 100644 (file)
@@ -291,8 +291,8 @@ MimeView *mimeview_create(MainWindow *mainwin)
        gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_MIMETYPE, TRUE);
        gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_NAME, TRUE); 
        for (i = 0; i < N_MIMEVIEW_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
-                                      GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button,
+                                      FALSE);
        gtk_widget_show(ctree);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
@@ -309,7 +309,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        mime_notebook = gtk_notebook_new();
         gtk_widget_show(mime_notebook);
-        GTK_WIDGET_UNSET_FLAGS(mime_notebook, GTK_CAN_FOCUS);
+        gtkut_widget_set_can_focus(mime_notebook, FALSE);
         gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
         gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
        
index 99a49dcdc8af6ca8337d76f8647a454749eb6ea9..e7dd5b4ab2447f09e489948c625b3c894c838664 100644 (file)
@@ -424,7 +424,7 @@ create_dialog (struct select_keys_s *sk)
                                   &dont_encrypt_btn, _("Do_n't encrypt"));
     
     cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-    GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
+    gtkut_widget_set_can_default(cancel_btn, TRUE);
     gtk_box_pack_start(GTK_BOX(bbox), cancel_btn, TRUE, TRUE, 0);
     gtk_widget_show(cancel_btn);
     gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
index 1f7506982f9aaba7863d13874a01f34cdd8facfa..e91e483920c3b0f845655e5b8f4385dc14749613 100644 (file)
@@ -162,7 +162,7 @@ egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
   g_return_if_fail (icon->manager_window != None);
  
 #ifndef GDK_MULTIHEAD_SAFE
-  xdisplay = gdk_display;
+  xdisplay = gdk_display_get_default();
 #else
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #endif
@@ -279,7 +279,7 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon,
   ev.data.l[4] = data3;
 
 #ifndef GDK_MULTIHEAD_SAFE
-  display = gdk_display;
+  display = gdk_display_get_default();
 #else
   display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #endif
@@ -307,7 +307,7 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon, gboolean dock_if_realize
   Display *xdisplay;
   
 #ifndef GDK_MULTIHEAD_SAFE
-  xdisplay = gdk_display;
+  xdisplay = gdk_display_get_default();
 #else
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #endif
@@ -505,7 +505,7 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
       Display *xdisplay;
 
 #ifndef GDK_MULTIHEAD_SAFE
-      xdisplay = gdk_display;
+      xdisplay = gdk_display_get_default();
 #else
       xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #endif
index 2fc724dccddff1bd011feb07918cae14f6affe36..2abf466e155b8418db012c0c1feb3351e06f19b6 100644 (file)
@@ -873,7 +873,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        btn_install = gtk_button_new_with_label (_("Install new..."));
        gtk_widget_show (btn_install);
        gtk_box_pack_start (GTK_BOX (hbox3), btn_install, FALSE, FALSE, 0);
-       GTK_WIDGET_SET_FLAGS (btn_install, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default (btn_install, TRUE);
 
        btn_more = gtkut_get_link_btn((GtkWidget *)window, THEMES_URI, _("Get more..."));
        gtk_widget_show (btn_more);
@@ -1003,12 +1003,12 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        btn_use = gtk_button_new_with_label (_("Use this"));
        gtk_widget_show (btn_use);
        gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_use);
-       GTK_WIDGET_SET_FLAGS (btn_use, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default (btn_use, TRUE);
 
        btn_remove = gtk_button_new_with_label (_("Remove"));
        gtk_widget_show (btn_remove);
        gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
-       GTK_WIDGET_SET_FLAGS (btn_remove, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default (btn_remove, TRUE);
 
        g_signal_connect(G_OBJECT(btn_use), "clicked",
                         G_CALLBACK(prefs_themes_btn_use_clicked_cb),
index 6079fcdebe62704fbbee61a0fbb3079e91c00ab5..82a2b58ba4ab7bf0d0f79cda2105708d404cbad8 100644 (file)
@@ -408,28 +408,28 @@ static void summary_search_create(void)
        gtkut_stock_button_add_help(confirm_area, &help_btn);
 
        all_btn = gtk_button_new_with_mnemonic(_("Find _all"));
-       GTK_WIDGET_SET_FLAGS(all_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(all_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
        gtk_widget_show(all_btn);
 
        prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
-       GTK_WIDGET_SET_FLAGS(prev_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(prev_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
        gtk_widget_show(prev_btn);
 
        next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
-       GTK_WIDGET_SET_FLAGS(next_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(next_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
        gtk_widget_show(next_btn);
 
        close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-       GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(close_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
        gtk_widget_show(close_btn);
 
        /* stop button hidden */
        stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
-       GTK_WIDGET_SET_FLAGS(stop_btn, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(stop_btn, TRUE);
        gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
 
        gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
index 7efd189d5580a510a90feb0eeae1f5a7bab2925d..79fb17d9fab8438c9a2ce96f1a23d41e3675fb86 100644 (file)
@@ -539,7 +539,7 @@ SummaryView *summary_create(MainWindow *mainwin)
        toggle_search = gtk_toggle_button_new();
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
                                     prefs_common.show_searchbar);
-       GTK_WIDGET_UNSET_FLAGS(toggle_search, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(toggle_search, FALSE);
        gtk_widget_show(toggle_search);
 
        CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
@@ -6320,8 +6320,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
-               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[pos].button,
-                                      GTK_CAN_FOCUS);
+               gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[pos].button,
+                                      FALSE);
                if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
                     (pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
                     pos == summaryview->col_pos[S_COL_DATE]) && vert &&
index ef9bb389bbf4c526e2e6a2b303ea465a5da140fa..a5d1275da819a2864a5a5c038ad7334c4930a293 100644 (file)
@@ -1737,7 +1737,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 #ifndef GENERIC_UMPC
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
-       GTK_WIDGET_UNSET_FLAGS(gtk_bin_get_child(GTK_BIN(item)), GTK_CAN_FOCUS);                        \
+       gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                            \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -1761,9 +1761,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gchild = gtk_container_get_children(                                                            \
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
-       GTK_WIDGET_UNSET_FLAGS(btn, GTK_CAN_FOCUS);                                                     \
+       gtkut_widget_set_can_focus(btn, FALSE);                                                         \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
-       GTK_WIDGET_UNSET_FLAGS(arr, GTK_CAN_FOCUS);                                                     \
+       gtkut_widget_set_can_focus(arr, FALSE);                                                         \
        g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
@@ -1772,7 +1772,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 #else
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
-       GTK_WIDGET_UNSET_FLAGS(gtk_bin_get_child(GTK_BIN(item)), GTK_CAN_FOCUS);                        \
+       gtkut_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                            \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -1791,9 +1791,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gchild = gtk_container_get_children(                                                            \
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
-       GTK_WIDGET_UNSET_FLAGS(btn, GTK_CAN_FOCUS);                                                     \
+       gtkut_widget_set_can_focus(btn, FALSE);                                                         \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
-       GTK_WIDGET_UNSET_FLAGS(arr, GTK_CAN_FOCUS);                                                             \
+       gtkut_widget_set_can_focus(arr, FALSE);                                                         \
        g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \