2004-09-06 [colin] 0.9.12cvs95.1

	* src/summaryview.c
	* src/mimeview.c
		Sync with HEAD (fix dropped URIs)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ceaffc0493c4c26c2fcf69ceef245f0348ac1e63..f1b165a4ad5f305d1c04051af0f62c790ea88789 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-09-06 [colin]     0.9.12cvs95.1
+
+       * src/summaryview.c
+       * src/mimeview.c
+               Sync with HEAD (fix dropped URIs)
+

 2004-09-06 [colin]     0.9.12cvs94.1
 
        * src/addressbook.c
 2004-09-06 [colin]     0.9.12cvs94.1
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index a57ad08f4a612573b7eb8f4418a9761bd445fd8a..64800b04598c2cee3710517b1f3dacd815e2da5b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -160,3 +160,4 @@
 ( cvs diff -u -r 1.204.2.19 -r 1.204.2.20 src/prefs_common.c; cvs diff -u -r 1.103.2.8 -r 1.103.2.9 src/prefs_common.h; cvs diff -u -r 1.395.2.29 -r 1.395.2.30 src/summaryview.c; ) > 0.9.12cvs92.1.patchset
 ( cvs diff -u -r 1.395.2.30 -r 1.395.2.31 src/summaryview.c; ) > 0.9.12cvs93.1.patchset
 ( cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/addressbook.c; cvs diff -u -r 1.5 -r 1.6 src/addressitem.h; cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/addritem.c; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 src/addritem.h; ) > 0.9.12cvs94.1.patchset
 ( cvs diff -u -r 1.204.2.19 -r 1.204.2.20 src/prefs_common.c; cvs diff -u -r 1.103.2.8 -r 1.103.2.9 src/prefs_common.h; cvs diff -u -r 1.395.2.29 -r 1.395.2.30 src/summaryview.c; ) > 0.9.12cvs92.1.patchset
 ( cvs diff -u -r 1.395.2.30 -r 1.395.2.31 src/summaryview.c; ) > 0.9.12cvs93.1.patchset
 ( cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/addressbook.c; cvs diff -u -r 1.5 -r 1.6 src/addressitem.h; cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/addritem.c; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 src/addritem.h; ) > 0.9.12cvs94.1.patchset

+( cvs diff -u -r 1.395.2.31 -r 1.395.2.32 src/summaryview.c; cvs diff -u -r 1.83.2.18 -r 1.83.2.19 src/mimeview.c; ) > 0.9.12cvs95.1.patchset

diff --git a/configure.ac b/configure.ac
index 876e3b035fa628cc0a4161b58df4144f51652c49..446446f08b124116ddb877ac002cba7dee2a7989 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=94
+EXTRA_VERSION=95

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 42fc4e29495bf7ba10371d76a3e9e2753914d02c..649698a8fee86275c6854a082e04d9b3fe80d84a 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -967,7 +967,7 @@ static void mimeview_drag_data_get(GtkWidget            *widget,
                alertpanel_error
                        (_("Can't save the part of multipart message."));
 
                alertpanel_error
                        (_("Can't save the part of multipart message."));
 

-       uriname = g_strconcat("file:/", filename, NULL);
+       uriname = g_strconcat("file://", filename, NULL);

        gtk_selection_data_set(selection_data, selection_data->target, 8,
                               uriname, strlen(uriname));
 
        gtk_selection_data_set(selection_data, selection_data->target, 8,
                               uriname, strlen(uriname));
 

diff --git a/src/summaryview.c b/src/summaryview.c
index f5e883ca9010e4df8746420dc93615e80740e49f..d5b2811077d778fba11d2c54467f7a7538dc8948 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4757,7 +4757,7 @@ static void summary_drag_data_get(GtkWidget        *widget,
                                (ctree, GTK_CTREE_NODE(cur->data));
                        tmp2 = procmsg_get_message_file(msginfo);
                        if (!tmp2) continue;
                                (ctree, GTK_CTREE_NODE(cur->data));
                        tmp2 = procmsg_get_message_file(msginfo);
                        if (!tmp2) continue;

-                       tmp1 = g_strconcat("file:/", tmp2, NULL);
+                       tmp1 = g_strconcat("file://", tmp2, NULL);

                        g_free(tmp2);
 
                        if (!mail_list) {
                        g_free(tmp2);
 
                        if (!mail_list) {