Fix bug #3055, "Claws segfaults when cancelling a sticky search
[claws.git] / src / summaryview.c
index 30d0568d55a8530380485bc8a0deb8a1eb5aa5f6..2e801783106899987193b8c640e6544676e51bbc 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
@@ -1378,7 +1379,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);
@@ -3050,8 +3050,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 small = (prefs_common.layout_mode == SMALL_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);
 
@@ -3077,7 +3077,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 || small) && 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
@@ -3100,8 +3100,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 small = (prefs_common.layout_mode == SMALL_LAYOUT);
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        START_TIMING("");
        
        if (!mlist) return;
@@ -3161,7 +3161,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                (ctree, NULL, node, text, 2,
                                 NULL, NULL,
                                 FALSE, FALSE);
-                       if ((vert || small) && 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);
@@ -3259,8 +3259,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 small = (prefs_common.layout_mode == SMALL_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);
@@ -3304,7 +3304,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 
        /* slow! */
        if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || 
-           ((vert || small) && 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),
@@ -3397,7 +3397,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 || small) && 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]],
@@ -3682,10 +3682,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)
@@ -4112,7 +4108,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)
@@ -4372,6 +4368,8 @@ void summary_delete(SummaryView *summaryview)
        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) {
@@ -4385,7 +4383,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;
+                       }
                }
        }
 
@@ -4402,7 +4403,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);
@@ -4682,8 +4682,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);
@@ -4695,23 +4695,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);
@@ -4720,8 +4711,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)
@@ -6343,8 +6333,8 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        gchar *formatted = NULL;
        MsgInfo *info = NULL;
        GdkRectangle rect;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-       gboolean small = (prefs_common.layout_mode == SMALL_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;
 
@@ -6382,7 +6372,7 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        formatted = g_strdup(text);
        g_strstrip(formatted);
 
-       if ((vert || small) && 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);
@@ -6405,8 +6395,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 small = (prefs_common.layout_mode == SMALL_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();
@@ -6421,10 +6411,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));
 
@@ -6482,7 +6468,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 || small) &&
+                    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);
@@ -6491,7 +6477,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||small);
+               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) \
@@ -6523,15 +6509,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);
@@ -6614,11 +6593,13 @@ void summary_set_column_order(SummaryView *summaryview)
        else
                summary_redisplay_msg(summaryview);
 
+       /* 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);         
        }
 }