2006-05-17 [colin] 2.2.0cvs29

	* src/main.c
		Don't initialize g_thread subsystem if it's
		already done (thanks to Hiro)
	* src/mimeview.c
		Fix saving of parts when there name can't be
		converted from UTF-8.

diff --git a/ChangeLog b/ChangeLog
index c5a3eaebf68b4b207647553db1efb138661233f7..2db8a68fc6c87e5ccdadca6147e4782bbeb4a32e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-17 [colin]     2.2.0cvs29
+
+       * src/main.c
+               Don't initialize g_thread subsystem if it's 
+               already done (thanks to Hiro)
+       * src/mimeview.c
+               Fix saving of parts when there name can't be
+               converted from UTF-8.
+
 2006-05-17 [paul]      2.2.0cvs28
 
        * po/Makefile.in.in

diff --git a/PATCHSETS b/PATCHSETS
index 4d588f863d03a075805a02a4b074b3d5d44acd9e..570296e2d4dc9fe8fb41cf11184b3aa312ab23d0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1498,3 +1498,4 @@
 ( cvs diff -u -r 1.274.2.114 -r 1.274.2.115 src/mainwindow.c;  ) > 2.2.0cvs26.patchset
 ( cvs diff -u -r 1.53.2.17 -r 1.53.2.18 po/POTFILES.in;  ) > 2.2.0cvs27.patchset
 ( cvs diff -u -r 1.6.2.7 -r 1.6.2.8 po/Makefile.in.in;  ) > 2.2.0cvs28.patchset
+( cvs diff -u -r 1.115.2.86 -r 1.115.2.87 src/main.c;  cvs diff -u -r 1.83.2.68 -r 1.83.2.69 src/mimeview.c;  ) > 2.2.0cvs29.patchset

diff --git a/configure.ac b/configure.ac
index b106b4d540fcca06f213f7cd4c59368dc1a01d4d..36e61d58d6384d897692292b1cca377d31974f23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index b14ac6aa8aa708ac34267db9e1e546319acbc3c6..057967c7d4070bce1931e812bec7506a695f13f9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -334,8 +334,8 @@ int main(int argc, char *argv[])
        if (cmd.exit)
                return 0;
 #endif
-       g_thread_init(NULL);
-       /* gdk_threads_init(); */
+       if (!g_thread_supported())
+               g_thread_init(NULL);
 
        gtk_set_locale();
        gtk_init(&argc, &argv);

diff --git a/src/mimeview.c b/src/mimeview.c
index a958d6044f960ed3315c85888288f7e166bc56bb..f577c6e4828becac236d7cc4adce2c35f70b656d 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1292,6 +1292,10 @@ static void mimeview_drag_data_get(GtkWidget         *widget,
 
        tmp = g_filename_from_utf8(filename, -1, NULL, NULL, NULL);
        
+       if (tmp == NULL) {
+               g_warning("filename not in UTF-8");
+               tmp = g_strdup("Unnamed part");
+       }
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
                               tmp, NULL);