Specialize alertpanel icons

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index 49a81545e751e5b8946f6917ce57025e8481e84d..5736966d07b482fcba70c781acee8f2c29924162 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -630,7 +630,7 @@ static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
 static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
 {
        gchar *text = NULL, *button_text = NULL;
-       GtkSignalFunc func = NULL;
+       void  *func = NULL;
        StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
 
        g_return_if_fail(mimeview != NULL);
@@ -670,7 +670,7 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
        noticeview_set_button_text(mimeview->siginfoview, button_text);
        noticeview_set_button_press_callback(
                mimeview->siginfoview,
-               func,
+               GTK_SIGNAL_FUNC(func),
                (gpointer) mimeview);
        noticeview_set_icon(mimeview->siginfoview, icon);
 }
@@ -868,6 +868,11 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (!event) return FALSE;
        if (!mimeview->opened) return FALSE;
 
+       summaryview = mimeview->messageview->mainwin->summaryview;
+       
+       if (summaryview && quicksearch_has_focus(summaryview->quicksearch))
+               return FALSE;
+               
        switch (event->keyval) {
        case GDK_space:
                if (textview_scroll_page(mimeview->textview, FALSE))
@@ -928,7 +933,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        if (!mimeview->messageview->mainwin) return FALSE;
-       summaryview = mimeview->messageview->mainwin->summaryview;
+
        summary_pass_key_press_event(summaryview, event);
        return TRUE;
 }
@@ -940,7 +945,7 @@ static void mimeview_drag_data_get(GtkWidget            *widget,
                                   guint             time,
                                   MimeView         *mimeview)
 {
-       gchar *filename, *uriname;
+       gchar *filename, *uriname, *tmp;
        MimeInfo *partinfo;
 
        if (!mimeview->opened) return;
@@ -949,12 +954,16 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) return;
 
-       filename = g_basename(get_part_name(partinfo));
+       filename = g_path_get_basename(get_part_name(partinfo));
        if (*filename == '\0') return;
 
+       tmp = filename;
+       
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
                               filename, NULL);
 
+       g_free(tmp);
+       
        if (procmime_get_part(filename, partinfo) < 0)
                alertpanel_error
                        (_("Can't save the part of multipart message."));
@@ -1050,7 +1059,7 @@ static void mimeview_save_all(MimeView *mimeview)
                startdir = g_strconcat(prefs_common.attach_save_dir,
                                       G_DIR_SEPARATOR_S, NULL);
 
-       dirname = filesel_select_file(_("Select destination folder"), startdir);
+       dirname = filesel_select_file_open(_("Select destination folder"), startdir);
        if (!dirname) {
                if (startdir) g_free(startdir);
                return;
@@ -1124,7 +1133,7 @@ static void mimeview_save_as(MimeView *mimeview)
        else
                filepath = g_strdup(defname);
 
-       filename = filesel_select_file(_("Save as"), filepath);
+       filename = filesel_select_file_save(_("Save as"), filepath);
        if (!filename) {
                g_free(filepath);
                return;
@@ -1616,7 +1625,6 @@ static void icon_list_clear (MimeView *mimeview)
        mimeview->icon_count = 0;
        adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
        adj->value = adj->lower;
-       g_signal_stop_emission_by_name(G_OBJECT (adj), "value_changed");
 }
 
 static void icon_list_toggle_by_mime_info(MimeView     *mimeview,
@@ -1689,21 +1697,23 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
 static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
 {
        GtkRequisition size;
-       gint           width;
+
        g_return_if_fail(mimeinfo != NULL);
 
        while (mimeinfo != NULL) {
                if (mimeinfo->type != MIMETYPE_MULTIPART)
                        icon_list_append_icon(mimeview, mimeinfo);
                if (mimeinfo->node->children != NULL)
-                       icon_list_create(mimeview, (MimeInfo *) mimeinfo->node->children->data);
-               mimeinfo = mimeinfo->node->next != NULL ? (MimeInfo *) mimeinfo->node->next->data : NULL;
+                       icon_list_create(mimeview, 
+                               (MimeInfo *) mimeinfo->node->children->data);
+               mimeinfo = mimeinfo->node->next != NULL 
+                        ? (MimeInfo *) mimeinfo->node->next->data 
+                        : NULL;
        }
        gtk_widget_size_request(mimeview->icon_vbox, &size);
-       width = size.width + 4;
-       if (width > mimeview->icon_mainbox->requisition.width) {
+       if (size.width > mimeview->icon_mainbox->requisition.width) {
                gtk_widget_set_size_request(mimeview->icon_mainbox, 
-                                           width, -1);
+                                           size.width, -1);
        }
 
 }