2007-02-11 [colin] 2.7.2cvs39

	* src/compose.c
		Fix code conversion when dragging a file

diff --git a/ChangeLog b/ChangeLog
index 9ee41ed4aa6934b675c312ad088cdf2e0a8bb2a0..a9d396a843aad36247a667f069a7eec0ff7e784e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-11 [colin]     2.7.2cvs39
+
+       * src/compose.c
+               Fix code conversion when dragging a file
+

 2007-02-09 [colin]     2.7.2cvs38
 
        * src/plugins/clamav/clamav_plugin.c
 2007-02-09 [colin]     2.7.2cvs38
 
        * src/plugins/clamav/clamav_plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index 99867f93a9d882b2795a890454b1f5f7290ddf36..6f6ace55d41e94d005ce49d0adbde119aa899843 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2356,3 +2356,4 @@
 ( cvs diff -u -r 1.115.2.135 -r 1.115.2.136 src/main.c;  cvs diff -u -r 1.274.2.172 -r 1.274.2.173 src/mainwindow.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_other.c;  cvs diff -u -r 1.150.2.91 -r 1.150.2.92 src/procmsg.c;  cvs diff -u -r 1.60.2.41 -r 1.60.2.42 src/procmsg.h;  ) > 2.7.2cvs36.patchset
 ( cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/plugins/clamav/clamav_plugin.c;  ) > 2.7.2cvs37.patchset
 ( cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/plugins/clamav/clamav_plugin.c;  ) > 2.7.2cvs38.patchset
 ( cvs diff -u -r 1.115.2.135 -r 1.115.2.136 src/main.c;  cvs diff -u -r 1.274.2.172 -r 1.274.2.173 src/mainwindow.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_other.c;  cvs diff -u -r 1.150.2.91 -r 1.150.2.92 src/procmsg.c;  cvs diff -u -r 1.60.2.41 -r 1.60.2.42 src/procmsg.h;  ) > 2.7.2cvs36.patchset
 ( cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/plugins/clamav/clamav_plugin.c;  ) > 2.7.2cvs37.patchset
 ( cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/plugins/clamav/clamav_plugin.c;  ) > 2.7.2cvs38.patchset

+( cvs diff -u -r 1.382.2.359 -r 1.382.2.360 src/compose.c;  ) > 2.7.2cvs39.patchset

diff --git a/configure.ac b/configure.ac
index bea03d2a0dab7773a23165c5b0a176964814127f..d13f161fc97fe717e145eccb5f9abd9291cc8693 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=38
+EXTRA_VERSION=39

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index c0d2966c71f7205c79e19465821c438456adfd1e..32dfab0596ed631d0a1868e38950e514968982e7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8972,10 +8972,13 @@ static void compose_attach_drag_received_cb (GtkWidget          *widget,
            && gtk_drag_get_source_widget(context) != 
                summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
                list = uri_list_extract_filenames((const gchar *)data->data);
            && gtk_drag_get_source_widget(context) != 
                summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
                list = uri_list_extract_filenames((const gchar *)data->data);

-               for (tmp = list; tmp != NULL; tmp = tmp->next)
+               for (tmp = list; tmp != NULL; tmp = tmp->next) {
+                       gchar *utf8_filename = conv_filename_to_utf8((const gchar *)tmp->data);

                        compose_attach_append
                                (compose, (const gchar *)tmp->data,
                        compose_attach_append
                                (compose, (const gchar *)tmp->data,

-                                (const gchar *)tmp->data, NULL);
+                                utf8_filename, NULL);
+                       g_free(utf8_filename);
+               }

                if (list) compose_changed_cb(NULL, compose);
                list_free_strings(list);
                g_list_free(list);
                if (list) compose_changed_cb(NULL, compose);
                list_free_strings(list);
                g_list_free(list);