2008-08-09 [colin] 3.5.0cvs55

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index a4d382884680c93e17c02b66744795289522df49..681ff55abb5ed31299d73c45b6f45216fa029c6b 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -637,8 +637,8 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Mark/Lock",                   NULL, N_("Lock"), NULL, NULL, G_CALLBACK(lock_msgs_cb) },
        {"Message/Mark/Unlock",                 NULL, N_("Unlock"), NULL, NULL, G_CALLBACK(unlock_msgs_cb) },
 
-       {"Message/ColorLabel",                  NULL, "Color la_bel" },
-       {"Message/Tags",                        NULL, "Ta_gs" },
+       {"Message/ColorLabel",                  NULL, N_("Color la_bel") },
+       {"Message/Tags",                        NULL, N_("Ta_gs") },
        /*{"Message/---",                       NULL, "---" },*/
 
        {"Message/Reedit",                      NULL, N_("Re-_edit"), NULL, NULL, G_CALLBACK(reedit_cb) },
@@ -720,7 +720,7 @@ static GtkActionEntry mainwin_entries[] =
 
 static GtkToggleActionEntry mainwin_toggle_entries[] = {
        {"File/OfflineMode",                    NULL, N_("Offline _mode"), "<control>W", NULL, G_CALLBACK(toggle_work_offline_cb) }, /*toggle*/
-       {"View/ShowHide/MessageView",           NULL, N_("_Message view"), NULL, NULL, G_CALLBACK(toggle_message_cb) }, /* toggle */
+       {"View/ShowHide/MessageView",           NULL, N_("_Message view"), "V", NULL, G_CALLBACK(toggle_message_cb) }, /* toggle */
 #ifndef GENERIC_UMPC
        {"View/ShowHide/StatusBar",             NULL, N_("Status _bar"), NULL, NULL, G_CALLBACK(toggle_statusbar_cb) }, /* toggle */
 #endif
@@ -1266,6 +1266,7 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                app_exit_cb(NULL, mainwin);
                return FALSE;
        case GDK_space:
+               BREAK_ON_MODIFIER_KEY();
                if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) {
                        if (mainwin->folderview && mainwin->summaryview
                            && ((!mainwin->summaryview->displayed
@@ -1533,8 +1534,11 @@ MainWindow *main_window_create()
        gtk_action_group_add_radio_actions(mainwin->action_group, mainwin_radio_dec_entries,
                        G_N_ELEMENTS(mainwin_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)mainwin);
 
+#ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
-
+#else
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+#endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU)
@@ -1637,22 +1641,22 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Goto", "View/Goto", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Prev", "View/Goto/Prev", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Next", "View/Goto/Next", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator1", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator1", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevUnread", "View/Goto/PrevUnread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextUnread", "View/Goto/NextUnread", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator2", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator2", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevNew", "View/Goto/PrevNew", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextNew", "View/Goto/NextNew", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator3", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator3", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevMarked", "View/Goto/PrevMarked", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextMarked", "View/Goto/NextMarked", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator4", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator4", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevLabeled", "View/Goto/PrevLabeled", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextLabeled", "View/Goto/NextLabeled", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator5", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator5", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "LastRead", "View/Goto/LastRead", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "ParentMessage", "View/Goto/ParentMessage", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator6", "View/Goto/---", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator6", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "OtherFolder", "View/Goto/OtherFolder", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator4", "View/---", GTK_UI_MANAGER_SEPARATOR)
@@ -1780,7 +1784,7 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Mark", "Message/Mark", GTK_UI_MANAGER_MENU)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "---", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
@@ -1788,10 +1792,10 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "WatchThread", "Message/Mark/WatchThread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "UnwatchThread", "Message/Mark/UnwatchThread", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "---", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkSpam", "Message/Mark/MarkSpam", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "MarkHam", "Message/Mark/MarkHam", GTK_UI_MANAGER_MENUITEM)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "---", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Lock", "Message/Mark/Lock", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Mark", "Unlock", "Message/Mark/Unlock", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ColorLabel", "Message/ColorLabel", GTK_UI_MANAGER_MENUITEM)
@@ -1881,6 +1885,8 @@ MainWindow *main_window_create()
 
 #ifndef MAEMO
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+       hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
 #endif
 
 
@@ -2369,7 +2375,7 @@ void main_window_reflect_prefs_custom_colors(MainWindow *mainwin)
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
-               gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+               gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
        mainwindow_colorlabel_menu_create(mainwin, TRUE);
        summary_reflect_prefs_custom_colors(mainwin->summaryview);
@@ -2393,7 +2399,7 @@ static gboolean main_window_reflect_tags_changes_real(gpointer data)
 
        /* clear items. get item pointers. */
        for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
-               gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+               gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
        }
        mainwindow_tags_menu_create(mainwin, TRUE);
        summary_reflect_tags_changes(mainwin->summaryview);
@@ -2460,7 +2466,7 @@ static void main_window_set_account_selector_menu(MainWindow *mainwin,
                        (ac_prefs->account_name
                         ? ac_prefs->account_name : _("Untitled"));
                gtk_widget_show(menuitem);
-               gtk_menu_append(GTK_MENU(menu), menuitem);
+               gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
                g_signal_connect(G_OBJECT(menuitem), "activate",
                                 G_CALLBACK(account_selector_menu_cb),
                                 ac_prefs);
@@ -2509,7 +2515,7 @@ static void main_window_set_account_receive_menu(MainWindow *mainwin,
                        (ac_prefs->account_name ? ac_prefs->account_name
                         : _("Untitled"));
                gtk_widget_show(menuitem);
-               gtk_menu_append(GTK_MENU(menu), menuitem);
+               gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
                g_signal_connect(G_OBJECT(menuitem), "activate",
                                 G_CALLBACK(account_receive_menu_cb),
                                 ac_prefs);
@@ -2542,7 +2548,7 @@ static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
                        (ac_prefs->account_name
                         ? ac_prefs->account_name : _("Untitled"));
                gtk_widget_show(menuitem);
-               gtk_menu_append(GTK_MENU(menu), menuitem);
+               gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
                g_signal_connect(G_OBJECT(menuitem), "activate",
                                 G_CALLBACK(account_receive_menu_cb),
                                 ac_prefs);
@@ -2574,7 +2580,7 @@ static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
                        (ac_prefs->account_name
                         ? ac_prefs->account_name : _("Untitled"));
                gtk_widget_show(menuitem);
-               gtk_menu_append(GTK_MENU(menu), menuitem);
+               gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
                g_signal_connect(G_OBJECT(menuitem), "activate",
                                 G_CALLBACK(account_compose_menu_cb),
                                 ac_prefs);
@@ -2648,9 +2654,9 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
                    prefs_common.layout_mode, layout_mode);
 
        /* remove widgets from those containers */
-       gtk_widget_ref(folder_wid);
-       gtk_widget_ref(summary_wid);
-       gtk_widget_ref(message_wid);
+       g_object_ref(folder_wid);
+       g_object_ref(summary_wid);
+       g_object_ref(message_wid);
        gtkut_container_remove
                (GTK_CONTAINER(folder_wid->parent), folder_wid);
        gtkut_container_remove
@@ -2662,9 +2668,9 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
        main_window_set_widgets(mainwin, layout_mode);
        gtk_widget_show(mainwin->window);
 
-       gtk_widget_unref(folder_wid);
-       gtk_widget_unref(summary_wid);
-       gtk_widget_unref(message_wid);
+       g_object_unref(folder_wid);
+       g_object_unref(summary_wid);
+       g_object_unref(message_wid);
 }
 #endif
 void mainwindow_reset_paned(GtkPaned *paned)
@@ -2730,14 +2736,14 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                if (ppaned->parent != NULL) {
                        mainwin->messageview->visible = FALSE;
                        summaryview->displayed = NULL;
-                       gtk_widget_ref(ppaned);
+                       g_object_ref(ppaned);
                        gtkut_container_remove(GTK_CONTAINER(container), ppaned);
                        gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
                } else {
                        mainwin->messageview->visible = TRUE;
                        gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), ppaned);
                        gtk_container_add(GTK_CONTAINER(container), ppaned);
-                       gtk_widget_unref(ppaned);
+                       g_object_unref(ppaned);
                }
                break;
        case WIDE_LAYOUT:
@@ -2746,12 +2752,12 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                if (mainwin->messageview->vbox->parent != NULL) {
                        mainwin->messageview->visible = FALSE;
                        summaryview->displayed = NULL;
-                       gtk_widget_ref(mainwin->messageview->vbox);
+                       g_object_ref(mainwin->messageview->vbox);
                        gtkut_container_remove(GTK_CONTAINER(container), mainwin->messageview->vbox);
                } else {
                        mainwin->messageview->visible = TRUE;
                        gtk_container_add(GTK_CONTAINER(container), mainwin->messageview->vbox);
-                       gtk_widget_unref(mainwin->messageview->vbox);
+                       g_object_unref(mainwin->messageview->vbox);
                }
                break;
        case WIDE_MSGLIST_LAYOUT:
@@ -3163,7 +3169,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 
        main_window_menu_callback_block(mainwin);
 
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ShowHide/MessageView",
+       cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ShowHide/MessageView",
                              messageview_is_visible(mainwin->messageview));
 
        summaryview = mainwin->summaryview;
@@ -3202,12 +3208,12 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        default:
                menu_path = "Menu/View/Sort/DontSort"; break;
        }
-       cm_menu_set_sensitive_full(mainwin->ui_manager, menu_path, TRUE);
+       cm_toggle_menu_set_active_full(mainwin->ui_manager, menu_path, TRUE);
 
        if (summaryview->sort_type == SORT_ASCENDING) {
-               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Sort/Ascending", TRUE);
+               cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Sort/Ascending", TRUE);
        } else {
-               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Sort/Descending", TRUE);
+               cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Sort/Descending", TRUE);
        }
 
        if (summaryview->sort_key != SORT_BY_NONE) {
@@ -3221,7 +3227,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        if (mainwin->messageview 
        &&  mainwin->messageview->mimeview
        &&  mainwin->messageview->mimeview->textview)
-               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/AllHeaders",
+               cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/AllHeaders",
                              mainwin->messageview->mimeview->textview->show_all_headers);
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & M_THREADED) != 0);
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/FoldAll", (prefs_common.hide_quotes == 1));
@@ -3303,7 +3309,7 @@ static gint mailing_list_populate_submenu (GtkWidget *menuitem, const gchar * li
        GList *amenu, *alist;
        gint menu_nb = 0;
        
-       menu = GTK_WIDGET(GTK_MENU_ITEM(menuitem)->submenu);
+       menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menuitem));
        
        /* First delete old submenu */
        /* FIXME: we can optimize this, and only change/add/delete necessary items */
@@ -3332,7 +3338,7 @@ static gint mailing_list_populate_submenu (GtkWidget *menuitem, const gchar * li
                                                 NULL);
                        } 
                        if (item) {
-                               gtk_menu_append (GTK_MENU(menu), item);
+                               gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
                                gtk_widget_show (item);
                                menu_nb++;
                        }
@@ -3409,19 +3415,21 @@ static void get_url_part (const gchar **buffer, gchar *url_decoded, gint maxlen)
        
 static void mailing_list_compose (GtkWidget *w, gpointer *data)
 {
-       gchar *mailto;
+       const gchar *mailto;
 
-       gtk_label_get (GTK_LABEL (GTK_BIN (w)->child), (gchar **) &mailto);
-       compose_new(NULL, mailto+7, NULL);
+       mailto = gtk_label_get_text(GTK_LABEL (gtk_bin_get_child(GTK_BIN((w)))));
+       if (mailto)
+               compose_new(NULL, mailto+7, NULL);
 }
  
  static void mailing_list_open_uri (GtkWidget *w, gpointer *data)
 {
  
-       gchar *mailto;
+       const gchar *mailto;
  
-       gtk_label_get (GTK_LABEL (GTK_BIN (w)->child), (gchar **) &mailto);
-       open_uri (mailto, prefs_common_get_uri_cmd());
+       mailto = gtk_label_get_text(GTK_LABEL (gtk_bin_get_child(GTK_BIN((w)))));
+       if (mailto)
+               open_uri (mailto, prefs_common_get_uri_cmd());
 } 
        
 static void fix_folderview_scroll(MainWindow *mainwin)
@@ -3467,7 +3475,7 @@ void main_window_show(MainWindow *mainwin)
        gtk_widget_show(mainwin->window);
        gtk_widget_show(mainwin->vbox_body);
 #ifndef GENERIC_UMPC
-        gtk_widget_set_uposition(mainwin->window,
+        gtk_window_move(GTK_WINDOW(mainwin->window),
                                  prefs_common.mainwin_x,
                                  prefs_common.mainwin_y);
 
@@ -3558,7 +3566,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                } else {
                        gtk_paned_add2(GTK_PANED(hpaned),
                                       GTK_WIDGET_PTR(mainwin->summaryview));
-                       gtk_widget_ref(vpaned);
+                       g_object_ref(vpaned);
                }
                gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));
@@ -3586,7 +3594,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                        gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));   
                } else {
-                       gtk_widget_ref(GTK_WIDGET_PTR(mainwin->messageview));
+                       g_object_ref(GTK_WIDGET_PTR(mainwin->messageview));
                }
                gtk_widget_show(vpaned);
                gtk_widget_queue_resize(vpaned);
@@ -3608,7 +3616,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                        gtk_paned_add2(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));   
                } else {
-                       gtk_widget_ref(GTK_WIDGET_PTR(mainwin->messageview));
+                       g_object_ref(GTK_WIDGET_PTR(mainwin->messageview));
                }
                gtk_paned_add2(GTK_PANED(vpaned), hpaned);
 
@@ -3971,12 +3979,12 @@ static void toggle_col_headers_cb(GtkAction *gaction, gpointer data)
        SummaryView *summaryview = mainwin->summaryview;
 
        if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (gaction))) {
-               gtk_clist_column_titles_show(GTK_CLIST(folderview->ctree));
-               gtk_clist_column_titles_show(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_column_titles_show(GTK_CMCLIST(folderview->ctree));
+               gtk_cmclist_column_titles_show(GTK_CMCLIST(summaryview->ctree));
                prefs_common.show_col_headers = TRUE;
        } else {
-               gtk_clist_column_titles_hide(GTK_CLIST(folderview->ctree));
-               gtk_clist_column_titles_hide(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(folderview->ctree));
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(summaryview->ctree));
                prefs_common.show_col_headers = FALSE;
        }
 }
@@ -4531,7 +4539,7 @@ static void update_summary_cb(GtkAction *action, gpointer data)
 
        folder_update_op_count();
 
-       fitem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree),
+       fitem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
                                            folderview->opened);
        if (!fitem) return;
 
@@ -4839,8 +4847,8 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
        summary = ((MainWindow *)data)->summaryview;
        g_return_val_if_fail(summary, FALSE);
 
-       if (GTK_CLIST(summary->ctree)->selection && 
-           g_list_length(GTK_CLIST(summary->ctree)->selection) > 1)
+       if (GTK_CMCLIST(summary->ctree)->selection && 
+           g_list_length(GTK_CMCLIST(summary->ctree)->selection) > 1)
                return FALSE;
 
        return FALSE;