aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-01-20 04:20:33 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-01-20 04:20:33 +0800
commit67d23452025c9cb74756a649e3fdba905f3ab892 (patch)
tree62d4f7f37aa380ddb2f2cc4d86ea3b44a8c410e1
parent4ec8d9dbfb45562644cb7f1a193c403820259d29 (diff)
downloadgsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.tar
gsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.tar.gz
gsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.tar.bz2
gsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.tar.lz
gsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.tar.xz
gsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.tar.zst
gsoc2013-epiphany-67d23452025c9cb74756a649e3fdba905f3ab892.zip
Make uri canonical before passing it as launch argument to make vfs happy.
2004-01-19 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/ContentHandler.cpp: * embed/mozilla/MozDownload.cpp: Make uri canonical before passing it as launch argument to make vfs happy. * lib/eel-gconf-extensions.c: (eel_gconf_set_path): Do not mix utf8/locale. Thanks to chpe to notice it.
-rw-r--r--ChangeLog12
-rw-r--r--embed/mozilla/ContentHandler.cpp8
-rw-r--r--embed/mozilla/MozDownload.cpp2
-rw-r--r--lib/eel-gconf-extensions.c7
4 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 595d19072..949d99259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-01-19 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/mozilla/ContentHandler.cpp:
+ * embed/mozilla/MozDownload.cpp:
+
+ Make uri canonical before passing it as
+ launch argument to make vfs happy.
+
+ * lib/eel-gconf-extensions.c: (eel_gconf_set_path):
+
+ Do not mix utf8/locale. Thanks to chpe to notice it.
+
2004-01-19 Christian Persch <chpe@cvs.gnome.org>
* NEWS:
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index d4c1dc4f9..d7dd0f4d7 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -171,8 +171,10 @@ NS_METHOD GContentHandler::LaunchHelperApp (void)
NS_ENSURE_TRUE (appLauncher, NS_ERROR_FAILURE);
appLauncher->DeleteTemporaryFileOnExit(mTempFile);
- char *param = g_strdup (mUrl.get());
GList *params = NULL;
+ char *param;
+
+ param = gnome_vfs_make_uri_canonical (mUrl.get());
params = g_list_append (params, param);
gnome_vfs_mime_application_launch (mHelperApp, params);
g_free (param);
@@ -246,10 +248,10 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
dialog = gtk_dialog_new_with_buttons
("", NULL, GTK_DIALOG_NO_SEPARATOR,
- _("Save As..."), CONTENT_ACTION_SAVEAS,
+ _("_Save As..."), CONTENT_ACTION_SAVEAS,
GTK_STOCK_CANCEL, CONTENT_ACTION_NONE,
mAction == CONTENT_ACTION_OPEN ?
- _("Open") : _("Download"), mAction,
+ _("_Open") : _("_Download"), mAction,
NULL);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 003573402..38b06d064 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -331,7 +331,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
mDestination->GetNativePath (aDest);
- param = g_strdup (aDest.get ());
+ param = gnome_vfs_make_uri_canonical (aDest.get ());
params = g_list_append (params, param);
gnome_vfs_mime_application_launch (helperApp, params);
g_free (param);
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index a60372d45..6e0ca59dd 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -741,10 +741,9 @@ eel_gconf_set_path (const char *key,
char *tilde_path;
char *converted;
- converted = g_filename_to_utf8 (value, -1, NULL, NULL, NULL);
-
- tilde_path = tilde_compress (converted);
- eel_gconf_set_string (key, tilde_path);
+ tilde_path = tilde_compress (value);
+ converted = g_filename_to_utf8 (tilde_path, -1, NULL, NULL, NULL);
+ eel_gconf_set_string (key, converted);
g_free (tilde_path);
g_free (converted);