Coverity fixes
[claws.git] / src / summaryview.c
index 2320742f38b2120fe593f7ce78f23a3c3acfa76d..2c3e345a1d620e271bfe838e4314db10c8690565 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,6 +81,7 @@
 #include "edittags.h"
 #include "manual.h"
 #include "manage_window.h"
+#include "avatars.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
@@ -129,12 +130,9 @@ guint summary_get_msgnum           (SummaryView            *summaryview,
                                         GtkCMCTreeNode         *node);
 
 
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
-                                            guint action);
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
-                                            guint action);
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
-                                            guint action);
+static void summary_set_hide_menu (SummaryView *summaryview,
+                                  const gchar *menu_item,
+                                  guint action);
 
 static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,
@@ -527,9 +525,6 @@ SummaryView *summary_create(MainWindow *mainwin)
        debug_print("Creating summary view...\n");
        summaryview = g_new0(SummaryView, 1);
 
-#if !(GTK_CHECK_VERSION(2,12,0))
-       summaryview->tooltips = tips;
-#endif
 #define SUMMARY_VBOX_SPACING 3
        vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
        
@@ -1019,7 +1014,7 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        SummaryColumnState *col_state = summaryview->col_state;
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        
-       if (!item || (prefs_common.layout_mode == VERTICAL_LAYOUT && prefs_common.two_line_vert) )
+       if (!item || ((prefs_common.layout_mode == VERTICAL_LAYOUT || prefs_common.layout_mode == SMALL_LAYOUT) && prefs_common.two_line_vert) )
                return;
        if (FOLDER_SHOWS_TO_HDR(item))
                show_to = TRUE;
@@ -1323,9 +1318,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                (item && item->path)?item->path:"(null)",
                                item?folder_item_parent(item):0x0,
                                item?item->no_select:FALSE);
-               summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               summary_set_hide_del_msgs_menu(summaryview, FALSE);
-               summary_set_hide_read_threads_menu(summaryview, FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages", FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages", FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads", FALSE);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                summary_thaw(summaryview);
@@ -1378,7 +1373,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
                if (!quicksearch_has_sat_predicate(summaryview->quicksearch)) {
                        debug_print("search cancelled!\n");
-                       printf("search cancelled!\n");
                        summary_thaw(summaryview);
                        STATUSBAR_POP(summaryview->mainwin);
                        main_window_cursor_normal(summaryview->mainwin);
@@ -1397,9 +1391,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
            quicksearch_has_sat_predicate(summaryview->quicksearch) == FALSE) {
                GSList *not_killed;
                
-               summary_set_hide_read_msgs_menu(summaryview, summaryview->folder_item->hide_read_msgs);
-               summary_set_hide_del_msgs_menu(summaryview, summaryview->folder_item->hide_del_msgs);
-               summary_set_hide_read_threads_menu(summaryview, summaryview->folder_item->hide_read_threads);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+                                               summaryview->folder_item->hide_read_msgs);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+                                               summaryview->folder_item->hide_del_msgs);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+                                               summaryview->folder_item->hide_read_threads);
                not_killed = NULL;
                for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
@@ -1432,9 +1429,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_slist_free(mlist);
                mlist = not_killed;
        } else {
-               summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               summary_set_hide_del_msgs_menu(summaryview, FALSE);
-               summary_set_hide_read_threads_menu(summaryview, FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+                                               FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+                                               FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+                                               FALSE);
        }
 
        if (!hidden_removed) {
@@ -1587,6 +1587,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 #undef CURRENTLY_DISPLAYED
 
+static void summary_cancel_mark_read_timeout(SummaryView *summaryview) {
+       if (summaryview->mark_as_read_timeout_tag != 0) {
+               g_source_remove(summaryview->mark_as_read_timeout_tag);
+               summaryview->mark_as_read_timeout_tag = 0;
+       }
+}
 
 void summary_clear_list(SummaryView *summaryview)
 {
@@ -1603,6 +1609,8 @@ void summary_clear_list(SummaryView *summaryview)
                summaryview->folder_item = NULL;
        }
 
+       summary_cancel_mark_read_timeout(summaryview);
+
        summaryview->display_msg = FALSE;
 
        summaryview->selected = NULL;
@@ -1781,7 +1789,7 @@ do { \
 #ifndef GENERIC_UMPC
        FILL_TABLE("Menus/SummaryViewPopup/Print", M_TARGET_EXIST);
 #endif
-       FILL_TABLE(NULL, 0);
+       FILL_TABLE(NULL, -1);
 #undef FILL_TABLE
        if (i != N_ENTRIES)
                g_error("summaryview menu entry table size mismatch (%d/%d)", i, N_ENTRIES);
@@ -1894,15 +1902,11 @@ void summary_select_next_unread(SummaryView *summaryview)
                                                _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                        }
 
-                       if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_unread(summaryview->folderview, TRUE);
-                               return;
-                       } 
-                       else
-                               return;
-               } else
+                       if (val == G_ALERTALTERNATE)
+                               folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD, TRUE);
+               } else {
                        summary_select_node(summaryview, node, TRUE, FALSE);
-
+               }
        }
 }
 
@@ -1994,7 +1998,7 @@ void summary_select_next_new(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_new(summaryview->folderview);
+                               folderview_select_next_with_flag(summaryview->folderview, MSG_NEW, TRUE);
                                return;
                        } 
                        else
@@ -2073,7 +2077,7 @@ void summary_select_next_marked(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_marked(summaryview->folderview);
+                               folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED, TRUE);
                                return;
                        } 
                        else
@@ -2249,6 +2253,7 @@ void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
        if (!summaryview->folder_item)
                return;
        if (node) {
+               summary_cancel_mark_read_timeout(summaryview);
                gtkut_ctree_expand_parent_all(ctree, node);
                if (do_refresh) {
                        summary_lock(summaryview);
@@ -2500,6 +2505,8 @@ static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
+       cm_return_if_fail(msginfo != NULL);
+
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
 
@@ -3050,7 +3057,8 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
        gint *col_pos = summaryview->col_pos;
        const gchar *msgid = msginfo->msgid;
        GHashTable *msgid_table = summaryview->msgid_table;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 
        summary_set_header(summaryview, text, msginfo);
 
@@ -3076,7 +3084,7 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
        if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
                SET_TEXT(S_COL_TAGS);
 
-       if (vert && prefs_common.two_line_vert)
+       if ((vert_layout || small_layout) && prefs_common.two_line_vert)
                g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
 #undef SET_TEXT
@@ -3099,8 +3107,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        GHashTable *msgid_table;
        GHashTable *subject_table = NULL;
        GSList * cur;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        START_TIMING("");
        
        if (!mlist) return;
@@ -3160,7 +3168,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                (ctree, NULL, node, text, 2,
                                 NULL, NULL,
                                 FALSE, FALSE);
-                       if (vert && prefs_common.two_line_vert)
+                       if ((vert_layout || small_layout) && prefs_common.two_line_vert)
                                g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
@@ -3258,7 +3266,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        gint *col_pos = summaryview->col_pos;
        gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
        gboolean should_swap = FALSE;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        static const gchar *color_dim_rgb = NULL;
        if (!color_dim_rgb)
                color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
@@ -3302,7 +3311,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 
        /* slow! */
        if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || 
-           (vert && prefs_common.two_line_vert)) {
+           ((vert_layout || small_layout) && prefs_common.two_line_vert)) {
                if (msginfo->date_t && msginfo->date_t > 0) {
                        procheader_date_get_localtime(date_modified,
                                                      sizeof(date_modified),
@@ -3353,7 +3362,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
                                from_text = msginfo->from;
                        else {
                                from_text = msginfo->from;
-                               extract_address(from_text);
+                               if (from_text)
+                                       extract_address(from_text);
                        }
                        if (!from_text)
                                _("(No From)");         
@@ -3395,7 +3405,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 #endif
                text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
                        _("(No Subject)");
-       if (vert && prefs_common.two_line_vert) {
+       if ((vert_layout || small_layout) && prefs_common.two_line_vert) {
                if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) {
                        gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
                                        text[col_pos[S_COL_SUBJECT]],
@@ -3534,14 +3544,16 @@ static int msginfo_mark_as_read_timeout(void *data)
        MarkAsReadData *mdata = (MarkAsReadData *)data;
        if (!mdata)
                return FALSE;
-       
+
        if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
                msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
-                                    mdata->summaryview->selected); 
+                                    mdata->summaryview->selected);
+       procmsg_msginfo_free(mdata->msginfo);
 
-       g_free(mdata);
+       mdata->summaryview->mark_as_read_timeout_tag = 0;
 
-       return FALSE;   
+       g_free(mdata);
+       return FALSE;
 }
 
 static void summary_display_msg_full(SummaryView *summaryview,
@@ -3617,14 +3629,12 @@ static void summary_display_msg_full(SummaryView *summaryview,
                    prefs_common.mark_as_read_delay) {
                        MarkAsReadData *data = g_new0(MarkAsReadData, 1);
                        data->summaryview = summaryview;
-                       data->msginfo = msginfo;
-#if GLIB_CHECK_VERSION(2,14,0)
-                       g_timeout_add_seconds(prefs_common.mark_as_read_delay,
-                               msginfo_mark_as_read_timeout, data);
-#else
-                       g_timeout_add(prefs_common.mark_as_read_delay * 1000,
-                               msginfo_mark_as_read_timeout, data);
-#endif
+                       data->msginfo = procmsg_msginfo_new_ref(msginfo);
+                       if (summaryview->mark_as_read_timeout_tag != 0)
+                               g_source_remove(summaryview->mark_as_read_timeout_tag);
+                       summaryview->mark_as_read_timeout_tag = 
+                               g_timeout_add_seconds(prefs_common.mark_as_read_delay,
+                                       msginfo_mark_as_read_timeout, data);
                } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
                        msginfo_mark_as_read(summaryview, msginfo, row);
                }
@@ -3680,10 +3690,6 @@ void summary_view_source(SummaryView * summaryview)
        msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
        source_window_show_msg(srcwin, msginfo);
        source_window_show(srcwin);
-#ifdef MAEMO
-       maemo_window_full_screen_if_needed(GTK_WINDOW(srcwin->window));
-       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(srcwin->window));
-#endif
 }
 
 void summary_reedit(SummaryView *summaryview)
@@ -4110,7 +4116,7 @@ void summary_mark_all_read(SummaryView *summaryview)
        if (prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
-                         "folder as read ?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+                         "folder as read?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4364,13 +4370,14 @@ void summary_delete(SummaryView *summaryview)
        AlertValue aval;
        MsgInfo *msginfo;
        gboolean froze = FALSE;
-       gboolean show = FALSE;
 
        if (!item) return;
 
        if (summary_is_locked(summaryview)) return;
 
        if (!summaryview->folder_item) return;
+       
+       START_LONG_OPERATION(summaryview, FALSE);
 
        if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
                if (!prefs_common.live_dangerously) {
@@ -4384,7 +4391,10 @@ void summary_delete(SummaryView *summaryview)
                                          buf,
                                          GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
                        g_free(buf);
-                       if (aval != G_ALERTALTERNATE) return;
+                       if (aval != G_ALERTALTERNATE) {
+                               END_LONG_OPERATION(summaryview);
+                               return;
+                       }
                }
        }
 
@@ -4401,7 +4411,6 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
-       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                sel_last = GTK_CMCTREE_NODE(cur->data);
@@ -4414,11 +4423,7 @@ void summary_delete(SummaryView *summaryview)
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
-       show = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
-               ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
-                               messageview_is_visible(summaryview->messageview)));
-
-       summary_select_node(summaryview, node, show, TRUE);
+       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        
        if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
                summary_execute(summaryview);
@@ -4685,8 +4690,8 @@ void summary_add_address(SummaryView *summaryview)
 {
        MsgInfo *msginfo, *full_msginfo;
        gchar *from;
-       GtkWidget *image = NULL;
        GdkPixbuf *picture = NULL;
+       AvatarRender *avatarr;
 
        msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
@@ -4698,23 +4703,14 @@ void summary_add_address(SummaryView *summaryview)
        extract_address(from);
        
        full_msginfo = procmsg_msginfo_get_full_info(msginfo);
-       if (full_msginfo &&
-           full_msginfo->extradata &&
-           full_msginfo->extradata->face) {
-               image = face_get_from_header(full_msginfo->extradata->face);
-       } 
-#if HAVE_LIBCOMPFACE
-       else if (full_msginfo &&
-                full_msginfo->extradata &&
-                full_msginfo->extradata->xface) {
-               image = xface_get_from_header(full_msginfo->extradata->xface,
-                               &summaryview->ctree->style->white,
-                               summaryview->mainwin->window->window);  
-       }
-#endif
+
+       avatarr = avatars_avatarrender_new(full_msginfo);
+       hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
+
        procmsg_msginfo_free(full_msginfo);
-       if (image)
-               picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
+
+       if (avatarr->image)
+               picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
 
 #ifndef USE_NEW_ADDRBOOK
        addressbook_add_contact(msginfo->fromname, from, NULL, picture);
@@ -4723,8 +4719,7 @@ void summary_add_address(SummaryView *summaryview)
                debug_print( "addressbook_add_contact - added\n" );
        }
 #endif
-       if (image)
-               gtk_widget_destroy(image);
+       avatars_avatarrender_free(avatarr);
 }
 
 void summary_select_all(SummaryView *summaryview)
@@ -4924,6 +4919,7 @@ gboolean summary_execute(SummaryView *summaryview)
 
                if (node == summaryview->displayed) {
                        messageview_clear(summaryview->messageview);
+                       summary_cancel_mark_read_timeout(summaryview);
                        summaryview->displayed = NULL;
                }
                if (GTK_CMCTREE_ROW(node)->children != NULL) {
@@ -5024,6 +5020,7 @@ gboolean summary_expunge(SummaryView *summaryview)
 
                if (node == summaryview->displayed) {
                        messageview_clear(summaryview->messageview);
+                       summary_cancel_mark_read_timeout(summaryview);
                        summaryview->displayed = NULL;
                }
                if (GTK_CMCTREE_ROW(node)->children != NULL) {
@@ -5456,6 +5453,8 @@ static void summary_unthread_for_exec_func(GtkCMCTree *ctree, GtkCMCTreeNode *no
        if (node == summaryview->displayed)
                summaryview->displayed = NULL;
 
+       summary_cancel_mark_read_timeout(summaryview);
+       
        for (top_parent = node;
             GTK_CMCTREE_ROW(top_parent)->parent != NULL;
             top_parent = GTK_CMCTREE_ROW(top_parent)->parent)
@@ -6017,11 +6016,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
        accel_path = g_strdup_printf("<ClawsColorLabels>/None");
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
-       gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
-#else
        gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-#endif
 
        item = gtk_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -6041,11 +6036,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
                accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
                gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
                if (i < 9)
-#if !GTK_CHECK_VERSION(2, 24, 0)
-                       gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
-#else
                        gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-#endif
                g_free(accel_path);
                g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager), 
                        "accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
@@ -6187,7 +6178,7 @@ static gint summary_tag_cmp_list(gconstpointer a, gconstpointer b)
                return tag_b == NULL ? 0:1;
        
        if (tag_b == NULL)
-               return tag_a == NULL ? 0:1;
+               return 1;
 
        return g_utf8_collate(tag_a, tag_b);
 }
@@ -6354,8 +6345,8 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        gchar *formatted = NULL;
        MsgInfo *info = NULL;
        GdkRectangle rect;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        if (!prefs_common.show_tooltips)
                return FALSE;
 
@@ -6393,10 +6384,10 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        formatted = g_strdup(text);
        g_strstrip(formatted);
 
-       if (!vert)      
-               gtk_tooltip_set_text (tooltip, formatted);
-       else if (prefs_common.two_line_vert)
+       if ((vert_layout || small_layout) && prefs_common.two_line_vert)
                gtk_tooltip_set_markup (tooltip, formatted);
+       else 
+                       gtk_tooltip_set_text (tooltip, formatted);
        g_free(formatted);
        
        rect.x = x - 2;
@@ -6416,8 +6407,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gchar *titles[N_SUMMARY_COLS];
        SummaryColumnType type;
        gint pos;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        memset(titles, 0, sizeof(titles));
 
        col_state = prefs_summary_column_get_config();
@@ -6432,10 +6423,6 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        ctree = gtk_sctree_new_with_titles
                (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
-       /* get normal row height */
-       gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
-       normal_row_height = GTK_CMCLIST(ctree)->row_height;
-
        if (prefs_common.show_col_headers == FALSE)
                gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
 
@@ -6493,7 +6480,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                       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 &&
+                    pos == summaryview->col_pos[S_COL_DATE]) && (vert_layout || small_layout) &&
                            prefs_common.two_line_vert)
                        gtk_cmclist_set_column_visibility
                                (GTK_CMCLIST(ctree), pos, FALSE);
@@ -6502,7 +6489,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                (GTK_CMCLIST(ctree), pos, col_state[pos].visible);
        }
        if (prefs_common.two_line_vert)
-               gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
+               gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert_layout||small_layout);
 
        /* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
@@ -6534,15 +6521,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        g_signal_connect(G_OBJECT(ctree), "button_press_event",
                         G_CALLBACK(summary_button_pressed),
                         summaryview);
-#ifndef MAEMO
        g_signal_connect(G_OBJECT(ctree), "popup-menu",
                         G_CALLBACK(summary_popup_menu), summaryview);
-#else
-       gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
-                       GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
-       g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
-                        G_CALLBACK(summary_popup_menu), summaryview);
-#endif
        g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(summary_button_released),
                         summaryview);
@@ -6625,11 +6605,13 @@ void summary_set_column_order(SummaryView *summaryview)
        else
                summary_redisplay_msg(summaryview);
 
-       if (prefs_common.layout_mode == VERTICAL_LAYOUT &&
+       /* get normal row height */
+       gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+       normal_row_height = GTK_CMCLIST(ctree)->row_height;             
+               
+       if ((prefs_common.layout_mode == SMALL_LAYOUT || prefs_common.layout_mode == VERTICAL_LAYOUT) &&
            prefs_common.two_line_vert) {
                gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);           
-       } else {
-               gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);         
        }
 }
 
@@ -6909,7 +6891,7 @@ static void summary_unselected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
 static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                             gint column, SummaryView *summaryview)
 {
-       GList *list, *cur;
+       const GList *list, *cur;
        MessageView *msgview;
        MsgInfo *msginfo;
        gboolean marked_unread = FALSE;
@@ -7822,38 +7804,15 @@ void summary_toggle_show_read_threads(SummaryView *summaryview)
        summary_show(summaryview, summaryview->folder_item);
 }
  
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
-                                            guint action)
-{
-       GtkWidget *widget;
-
-       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadMessages");
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(1));
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
-                                            guint action)
+static void summary_set_hide_menu (SummaryView *summaryview,
+                                  const gchar *menu_item,
+                                  guint action)
 {
        GtkWidget *widget;
 
-       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadThreads");
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(1));
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(0));
-}
+       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, menu_item);
+       cm_return_if_fail(widget != NULL);
 
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
-                                            guint action)
-{
-       GtkWidget *widget;
-
-       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideDelMessages");
        g_object_set_data(G_OBJECT(widget), "dont_toggle",
                          GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
@@ -8049,9 +8008,6 @@ void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
        guint new, unread, unreadmarked, marked, total;
        guint replied, forwarded, locked, ignored, watched;
        static gboolean tips_initialized = FALSE;
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = summaryview->tooltips;
-#endif
 
        if (prefs_common.layout_mode != SMALL_LAYOUT) {
                if (tips_initialized) {