Factorize if

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index 64bbdd9d8efdfb8eae2d3f3f66d081fc7cfcbc21..9326e47dee53ea91b98902f071d829a8fbf7b876 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1119,13 +1119,14 @@ static void mimeview_check_data_reset(MimeView *mimeview)
                pthread_cancel(mimeview->check_data->cancel_th);
        }
 
-       g_free(mimeview->check_data);
-       mimeview->check_data = NULL;
-
        if (must_free) {
                debug_print("freeing deferred mimeinfo\n");
                procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
        }
+
+       g_free(mimeview->check_data);
+       mimeview->check_data = NULL;
+
        if (must_destroy) {
                debug_print("freeing deferred mimeview\n");
                mimeview_free_mimeinfo(mimeview);
@@ -1134,7 +1135,6 @@ static void mimeview_check_data_reset(MimeView *mimeview)
                g_free(mimeview);
                mimeviews = g_slist_remove(mimeviews, mimeview);
        }
-
 }
 
 /* GUI update once the checker thread is done or killed */
@@ -2535,19 +2535,22 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                          to_human_readable((goffset)mimeinfo->length), NULL);
        g_free(content_type);
        if (desc && *desc) {
-               gchar *tmp = NULL;
+               gchar *tmp = NULL, *escaped = NULL;
                if (!g_utf8_validate(desc, -1, NULL)) {
                        tmp = conv_filename_to_utf8(desc);
                } else {
                        tmp = g_strdup(desc);
                }
+               escaped = g_markup_escape_text(tmp,-1);
+               
                tiptmp = g_strconcat(tip, "\n<b>",
                                prefs_common.attach_desc && mimeinfo->description ?
                                _("Description:") : _("Filename:"),
-                               " </b>", g_markup_escape_text(tmp,-1), NULL);
+                               " </b>", escaped, NULL);
                g_free(tip);
                tip = tiptmp;
                g_free(tmp);
+               g_free(escaped);
        }
        if (sigshort && *sigshort) {
                tiptmp = g_strjoin("\n", tip, g_markup_escape_text(sigshort, -1), NULL);
@@ -2644,32 +2647,31 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
                gtk_widget_set_size_request(mimeview->icon_mainbox, 
                                            size.width, -1);
        }
+       if (mimeview->opened)
+               icon_list_toggle_by_mime_info(mimeview,
+                       mimeview_get_node_part(mimeview, mimeview->opened));
 }
 
 static void icon_list_toggle_by_mime_info (MimeView    *mimeview,
                                           MimeInfo     *mimeinfo)
 {
-       GList *child;
+       GList *children, *child;
        
-       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
+       children = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (child = children; child != NULL; child = g_list_next(child)) {
+               gboolean *highlight = NULL;
+               GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
+
                if (!GTK_IS_EVENT_BOX(child->data))
                        continue;
-               if(g_object_get_data(G_OBJECT(child->data),
-                                     "partinfo") == (gpointer)mimeinfo) {
-                       gboolean *highlight = NULL;
-                       GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
-                       highlight = g_object_get_data(G_OBJECT(icon), "highlight");
-                       *highlight = TRUE;
-                       gtk_widget_queue_draw(icon);
-               } else {
-                       gint *highlight = NULL;
-                       GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
-                       highlight = g_object_get_data(G_OBJECT(icon), "highlight");
-                       *highlight = FALSE;
-                       gtk_widget_queue_draw(icon);
-               }                        
+
+               highlight = g_object_get_data(G_OBJECT(icon), "highlight");
+               *highlight = (g_object_get_data(G_OBJECT(child->data),
+                                     "partinfo") == (gpointer)mimeinfo);
+
+               gtk_widget_queue_draw(icon);
        }
+       g_list_free(children);
 }
 
 static void ctree_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation,