fix return-receipt

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index de2ce30af2c3c0b02b2b1054f9d359281786dc74..306001f2a217704cf28ae6ed383be84b3bd660a5 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -52,15 +52,16 @@
 #include "procheader.h"
 #include "procmime.h"
 #include "account.h"
+#include "action.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "gtkutils.h"
 #include "utils.h"
 #include "rfc2015.h"
 #include "send_message.h"
-#include "pgptext.h"
 #include "stock_pixmap.h"
 
+static GList *messageview_list = NULL;
 
 static void messageview_change_view_type(MessageView   *messageview,
                                         MessageType     type);
@@ -272,6 +273,8 @@ static GtkItemFactoryEntry msgview_entries[] =
                                        NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                        NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
+       {N_("/_Tools/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/Actio_ns"),        NULL, NULL, 0, "<Branch>"},
 
        {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_About"),           NULL, about_cb, 0, NULL}
@@ -339,6 +342,7 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        GtkWidget *handlebox;
        GtkWidget *vbox;
        GtkWidget *menubar;
+       GtkItemFactory *ifactory;
        guint n_menu_entries;
 
        vbox = gtk_vbox_new(FALSE, 0);
@@ -360,6 +364,9 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        gtk_container_add(GTK_CONTAINER(vbox),
                          GTK_WIDGET_PTR(msgview));
 
+       ifactory = gtk_item_factory_from_widget(menubar);
+       action_update_msgview_menu(ifactory, msgview);
+
        msgview_list = g_list_append(msgview_list, msgview);
 }
 
@@ -431,7 +438,7 @@ static void notification_convert_header(gchar *dest, gint len,
                dest[len - 1] = '\0';
                return;
        } else
-               conv_encode_header(dest, len, src, header_len);
+               conv_encode_header(dest, len, src, header_len, FALSE);
 }
 
 static gint disposition_notification_queue(PrefsAccount * account,
@@ -661,6 +668,11 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        return ok;
 }
 
+GList *messageview_get_window_list(void)
+{
+       return messageview_list;
+}
+
 void messageview_show(MessageView *messageview, MsgInfo *msginfo,
                      gboolean all_headers)
 {
@@ -707,8 +719,8 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
                procmime_mimeinfo_free_all(mimeinfo);
        }
 
-       if (MSG_IS_RETRCPT_PENDING(msginfo->flags))
-               return_receipt_show(messageview->noticeview, msginfo);
+       if (MSG_IS_RETRCPT_PENDING(messageview->msginfo->flags))
+               return_receipt_show(messageview->noticeview, messageview->msginfo);
        else 
                noticeview_hide(messageview->noticeview);
 
@@ -775,6 +787,8 @@ void messageview_destroy(MessageView *messageview)
        GtkWidget *mimeview  = GTK_WIDGET_PTR(messageview->mimeview);
 
        debug_print("destroy messageview\n");
+       messageview_list = g_list_remove(messageview_list, messageview);
+
        headerview_destroy(messageview->headerview);
        textview_destroy(messageview->textview);
        mimeview_destroy(messageview->mimeview);
@@ -902,6 +916,14 @@ TextView *messageview_get_current_textview(MessageView *messageview)
        return text;
 }
 
+MimeInfo *messageview_get_selected_mime_part(MessageView *messageview)
+{
+       if (messageview->type == MVIEW_MIME)
+               return mimeview_get_selected_part(messageview->mimeview);
+
+       return NULL;
+}
+
 void messageview_copy_clipboard(MessageView *messageview)
 {
        TextView *text;