2006-06-20 [colin] 2.3.0cvs26
authorColin Leroy <colin@colino.net>
Tue, 20 Jun 2006 06:55:27 +0000 (06:55 +0000)
committerColin Leroy <colin@colino.net>
Tue, 20 Jun 2006 06:55:27 +0000 (06:55 +0000)
* src/compose.c
When dragging a file to the text of the compose
window, ask whether we want to insert or attach
(I know lots of people who do that to attach)

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 4d9b66cc85f07b0d2c4b632bca57b8ddc939c26b..62b3561be799a9c9daf3ec8526e875b7269b5af0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-20 [colin]     2.3.0cvs26
+
+       * src/compose.c
+               When dragging a file to the text of the compose
+               window, ask whether we want to insert or attach
+               (I know lots of people who do that to attach)
+
 2006-06-20 [colin]     2.3.0cvs25
 
        * src/etpan/imap-thread.c
index c4f596fef6fe157c15aa6286ad21b3d336bb40c4..11c93c5df9571c88b8864605d3770f0ab8f88480 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.279 -r 1.382.2.280 src/compose.c;  cvs diff -u -r 1.179.2.120 -r 1.179.2.121 src/imap.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/common/defs.h;  cvs diff -u -r 1.1.4.40 -r 1.1.4.41 src/etpan/imap-thread.c;  ) > 2.3.0cvs23.patchset
 ( cvs diff -u -r 1.179.2.121 -r 1.179.2.122 src/imap.c;  cvs diff -u -r 1.1.4.41 -r 1.1.4.42 src/etpan/imap-thread.c;  ) > 2.3.0cvs24.patchset
 ( cvs diff -u -r 1.1.4.42 -r 1.1.4.43 src/etpan/imap-thread.c;  ) > 2.3.0cvs25.patchset
+( cvs diff -u -r 1.382.2.280 -r 1.382.2.281 src/compose.c;  ) > 2.3.0cvs26.patchset
index 7a9b111178a5214805aa632a1df5cea5b555697e..366e04cf0369e128f2bf0e0b6e4e6d560e45b205 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 723d22886f5e5da6f1aa94e3c724003953e83984..dd58e1192706846a74f55efd754cfc216a884712 100644 (file)
@@ -8508,6 +8508,18 @@ static void compose_insert_drag_received_cb (GtkWidget           *widget,
 {
        Compose *compose = (Compose *)user_data;
        GList *list, *tmp;
+       AlertValue val = alertpanel(_("Insert or attach?"),
+                                _("Do you want to insert the contents of this file in the email body,"
+                                  "or rather attach it to the email?"),
+                                 GTK_STOCK_CANCEL, _("+_Insert"), _("_Attach"));
+       
+       if (val == G_ALERTDEFAULT) {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               return;
+       } else if (val == G_ALERTOTHER) {
+               compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
+               return;
+       } 
 
        /* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
         * does not work */