2005-06-22 [colin] 1.9.11cvs90
authorColin Leroy <colin@colino.net>
Wed, 22 Jun 2005 20:06:03 +0000 (20:06 +0000)
committerColin Leroy <colin@colino.net>
Wed, 22 Jun 2005 20:06:03 +0000 (20:06 +0000)
* src/compose.c
* src/messageview.c
* src/toolbar.c
Make toolbar's delete use the move to trash stuff;
Add gtk_widget_realize to be sure pixmaps can get
created (that may fix an old worksforme bug which
I can't find back...)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c
src/messageview.c
src/toolbar.c

index b490394..d63f13e 100644 (file)
@@ -1,3 +1,13 @@
+2005-06-22 [colin]     1.9.11cvs90
+
+       * src/compose.c
+       * src/messageview.c
+       * src/toolbar.c
+               Make toolbar's delete use the move to trash stuff;
+               Add gtk_widget_realize to be sure pixmaps can get
+               created (that may fix an old worksforme bug which
+               I can't find back...)
+
 2005-06-22 [colin]     1.9.11cvs89
 
        * src/summaryview.c
index 5216626..b122001 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/foldersort.c;  ) > 1.9.11cvs87.patchset
 ( cvs diff -u -r 1.179.2.37 -r 1.179.2.38 src/imap.c;  ) > 1.9.11cvs88.patchset
 ( cvs diff -u -r 1.395.2.83 -r 1.395.2.84 src/summaryview.c;  cvs diff -u -r 1.68.2.8 -r 1.68.2.9 src/summaryview.h;  cvs diff -u -r 1.274.2.42 -r 1.274.2.43 src/mainwindow.c;  ) > 1.9.11cvs89.patchset
+( cvs diff -u -r 1.382.2.133 -r 1.382.2.134 src/compose.c;  cvs diff -u -r 1.94.2.54 -r 1.94.2.55 src/messageview.c;  cvs diff -u -r 1.43.2.17 -r 1.43.2.18 src/toolbar.c;  ) > 1.9.11cvs90.patchset
index 40f9673..a28194b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=89
+EXTRA_VERSION=90
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index ddb6262..bb0d0d5 100644 (file)
@@ -4807,6 +4807,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        handlebox = gtk_handle_box_new();
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
 
+       gtk_widget_realize(handlebox);
        compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
                                          (gpointer)compose);
 
index e438e04..54beb02 100644 (file)
@@ -400,6 +400,7 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
 
        handlebox = gtk_handle_box_new();
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+       gtk_widget_realize(handlebox);
        msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
                                          (gpointer)msgview);
 
@@ -855,7 +856,7 @@ void messageview_delete(MessageView *msgview)
        if (msginfo && msgview->msginfo && 
            msginfo->msgnum == msgview->msginfo->msgnum && 
            msginfo->folder == msgview->msginfo->folder) {
-               summary_delete(msgview->mainwin->summaryview);
+               summary_delete_trash(msgview->mainwin->summaryview);
        } else {                
                msginfo = msgview->msginfo;
 
index dceb13e..e6ff751 100644 (file)
@@ -898,7 +898,7 @@ static void toolbar_delete_cb(GtkWidget *widget, gpointer data)
                break;
         case TOOLBAR_MAIN:
                mainwin = (MainWindow *)toolbar_item->parent;
-               summary_delete(mainwin->summaryview);
+               summary_delete_trash(mainwin->summaryview);
                break;
         default: 
                debug_print("toolbar event not supported\n");