From 9291c8e7bd1aa6bd943594bd9c058c59994d6fa0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 17 May 2006 16:37:41 +0000 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/main.c | 4 ++-- src/mimeview.c | 4 ++++ 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5a3eaebf..2db8a68fc 100644 --- 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 4d588f863..570296e2d 100644 --- 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 b106b4d54..36e61d58d 100644 --- 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 b14ac6aa8..057967c7d 100644 --- 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 a958d6044..f577c6e48 100644 --- 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); -- 2.25.1