2011-10-31 [pawel] 3.7.10cvs66

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index fcc4dc68d1032da178e59c5fcd85f473f89108f1..6e94f5e8d0bcc3994d07d194f58c1765a6b450b3 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1066,7 +1066,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 
        /* send it */
        path = folder_item_fetch_msg(queue, num);
-       ok = procmsg_send_message_queue(path, &foo, queue, num, &queued_removed);
+       ok = procmsg_send_message_queue_with_lock(path, &foo, queue, num, &queued_removed);
        g_free(path);
        g_free(foo);
        if (ok == 0 && !queued_removed)
@@ -1727,10 +1727,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space) 
                return FALSE;
 
-       g_signal_stop_emission_by_name(G_OBJECT(widget),
-                                       "key_press_event");
-       mimeview_pass_key_press_event(messageview->mimeview, event);
-       return FALSE;
+       return mimeview_pass_key_press_event(messageview->mimeview, event);
 }
 #endif
 
@@ -2668,8 +2665,8 @@ static void add_address_cb(GtkAction *action, gpointer data)
                 full_msginfo->extradata &&
                 full_msginfo->extradata->xface) {
                image = xface_get_from_header(full_msginfo->extradata->xface,
-                               &messageview->mainwin->summaryview->ctree->style->white,
-                               messageview->window->window);   
+                               &(gtk_widget_get_style(messageview->mainwin->summaryview->ctree)->white),
+                               gtk_widget_get_window(messageview->window));
        }
 #endif
        procmsg_msginfo_free(full_msginfo);