From: Colin Leroy Date: Thu, 31 Jan 2008 16:50:31 +0000 (+0000) Subject: 2008-01-31 [colin] 3.2.0cvs72 X-Git-Tag: rel_3_3_0~7 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=26fb220233eb5b13542cec2664801d3861da4d32 2008-01-31 [colin] 3.2.0cvs72 * src/exphtmldlg.c * src/mimeview.c * src/summaryview.c Fix building of URIs from filenames --- diff --git a/ChangeLog b/ChangeLog index d5cbd956b..3f4244b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-31 [colin] 3.2.0cvs72 + + * src/exphtmldlg.c + * src/mimeview.c + * src/summaryview.c + Fix building of URIs from filenames + 2008-01-31 [wwp] 3.2.0cvs71 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index c2efbc86f..2ffd88725 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3208,3 +3208,4 @@ ( cvs diff -u -r 1.382.2.433 -r 1.382.2.434 src/compose.c; cvs diff -u -r 1.12.2.55 -r 1.12.2.56 src/prefs_template.c; cvs diff -u -r 1.1.16.7 -r 1.1.16.8 src/prefs_template.h; cvs diff -u -r 1.8.2.26 -r 1.8.2.27 src/quote_fmt.c; cvs diff -u -r 1.5.12.13 -r 1.5.12.14 src/quote_fmt.h; cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.38 -r 1.22.2.39 src/quote_fmt_parse.y; ) > 3.2.0cvs69.patchset ( cvs diff -u -r 1.654.2.3265 -r 1.654.2.3266 configure.ac; cvs diff -u -r 1.53.2.33 -r 1.53.2.34 po/POTFILES.in; cvs diff -u -r 1.382.2.434 -r 1.382.2.435 src/compose.c; cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/plugins/Makefile.am; cvs diff -u -r -1.1 -r -1.2 src/plugins/clamav/.cvsignore; cvs diff -u -r -1.4.2.9 -r -1.4.2.10 src/plugins/clamav/Makefile.am; cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/clamav/README; cvs diff -u -r -1.13.2.36 -r -1.13.2.37 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r -1.3.2.9 -r -1.3.2.10 src/plugins/clamav/clamav_plugin.h; cvs diff -u -r -1.9.2.27 -r -1.9.2.28 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/clamav/clamav_plugin_gtk.deps; ) > 3.2.0cvs70.patchset ( cvs diff -u -r 1.115.2.183 -r 1.115.2.184 src/main.c; ) > 3.2.0cvs71.patchset +( cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/exphtmldlg.c; cvs diff -u -r 1.83.2.125 -r 1.83.2.126 src/mimeview.c; cvs diff -u -r 1.395.2.353 -r 1.395.2.354 src/summaryview.c; ) > 3.2.0cvs72.patchset diff --git a/configure.ac b/configure.ac index 033ef4be9..0a8aad9f1 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=71 +EXTRA_VERSION=72 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c index fb8d00e02..8a7830c4a 100644 --- a/src/exphtmldlg.c +++ b/src/exphtmldlg.c @@ -310,7 +310,7 @@ static void export_html_next( GtkWidget *widget ) { static void export_html_browse( GtkWidget *widget, gpointer data ) { gchar *uri; - uri = g_strconcat( "file://", _exportCtl_->path, NULL ); + uri = g_filename_to_uri(_exportCtl_->path, NULL, NULL); open_uri( uri, prefs_common_get_uri_cmd() ); g_free( uri ); } diff --git a/src/mimeview.c b/src/mimeview.c index 2bb05367e..81c82a855 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -1486,7 +1486,9 @@ static void mimeview_drag_data_get(GtkWidget *widget, (_("Couldn't save the part of multipart message: %s"), strerror(-err)); - uriname = g_strconcat("file://", filename, "\r\n", NULL); + tmp = g_filename_to_uri(filename, NULL, NULL); + uriname = g_strconcat(tmp, "\r\n", NULL); + g_free(tmp); gtk_selection_data_set(selection_data, selection_data->target, 8, (guchar *)uriname, strlen(uriname)); @@ -1819,7 +1821,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo #ifdef MAEMO if (content_type != NULL) { - uri = g_strconcat ("file://", filename, NULL); + uri = g_filename_to_uri(filename, NULL, NULL); dbusconn = osso_get_dbus_connection (get_osso_context()); #ifdef CHINOOK r = hildon_mime_open_file_with_mime_type (dbusconn, uri, content_type); diff --git a/src/summaryview.c b/src/summaryview.c index 612c25f31..c9486c48b 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -6719,8 +6719,11 @@ static void summary_drag_data_get(GtkWidget *widget, tmp2 = dest; } } - tmp1 = g_strconcat("file://", tmp2, "\r\n", NULL); + tmp1 = g_filename_to_uri(tmp2, NULL, NULL); g_free(tmp2); + tmp2 = g_strconcat(tmp1, "\r\n", NULL); + g_free(tmp1); + tmp1 = tmp2; if (!mail_list) { mail_list = tmp1;