From 5d2470815f533e3626e8f029c0a2f14ea517d3f2 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 22 Jun 2005 20:06:03 +0000 Subject: [PATCH] 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...) --- ChangeLog-gtk2.claws | 10 ++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 1 + src/messageview.c | 3 ++- src/toolbar.c | 2 +- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index b4903941c..d63f13e4c 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index 521662639..b12200143 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -578,3 +578,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index 40f9673e3..a28194b3d 100644 --- a/configure.ac +++ b/configure.ac @@ -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= diff --git a/src/compose.c b/src/compose.c index ddb626218..bb0d0d52b 100644 --- a/src/compose.c +++ b/src/compose.c @@ -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); diff --git a/src/messageview.c b/src/messageview.c index e438e04a6..54beb0221 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -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; diff --git a/src/toolbar.c b/src/toolbar.c index dceb13e83..e6ff75175 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -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"); -- 2.25.1