debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Escape and unescape for unique and never otherwise

Browse source 
Also don't bother to apply magic when receiving the command,
it was already applied before.
This commit is contained in:
Christian Dywan 2011-12-11 03:27:02 +01:00
parent c8b19b2eeb
commit b874009e00
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/main.c
View file

@ -1524,7 +1524,7 @@ midori_prepare_uri (const gchar *uri)
if (g_path_is_absolute (uri)) if (g_path_is_absolute (uri))
return g_filename_to_uri (uri, NULL, NULL); return g_filename_to_uri (uri, NULL, NULL);
else if (g_str_has_prefix(uri, "javascript:")) else if (g_str_has_prefix(uri, "javascript:"))
return g_strdup (uri); return NULL;
else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) else if (g_file_test (uri, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
{ {
gchar* current_dir = g_get_current_dir (); gchar* current_dir = g_get_current_dir ();
@ -1534,11 +1534,7 @@ midori_prepare_uri (const gchar *uri)
return uri_ready; return uri_ready;
} }
uri_ready = sokoke_magic_uri (uri); return sokoke_magic_uri (uri);
if (uri_ready)
return midori_uri_to_ascii (uri_ready);
return midori_uri_to_ascii (uri);
} }
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
@ -2237,7 +2233,7 @@ main (int argc,
{ {
gchar* tmp_uri = midori_prepare_uri (webapp); gchar* tmp_uri = midori_prepare_uri (webapp);
midori_browser_set_action_visible (browser, "Menubar", FALSE); midori_browser_set_action_visible (browser, "Menubar", FALSE);
midori_browser_add_uri (browser, tmp_uri); midori_browser_add_uri (browser, tmp_uri ? tmp_uri : webapp);
g_object_set (settings, "homepage", tmp_uri, NULL); g_object_set (settings, "homepage", tmp_uri, NULL);
g_free (tmp_uri); g_free (tmp_uri);
@ -2314,7 +2310,10 @@ main (int argc,
while (uris[i] != NULL) while (uris[i] != NULL)
{ {
gchar* new_uri = midori_prepare_uri (uris[i]); gchar* new_uri = midori_prepare_uri (uris[i]);
katze_assign (uris[i], new_uri); gchar* escaped_uri = g_uri_escape_string (
new_uri ? new_uri : uris[i], NULL, FALSE);
g_free (new_uri);
katze_assign (uris[i], escaped_uri);
i++; i++;
} }
result = midori_app_instance_send_uris (app, uris); result = midori_app_instance_send_uris (app, uris);
@ -2487,7 +2486,7 @@ main (int argc,
{ {
item = katze_item_new (); item = katze_item_new ();
uri_ready = midori_prepare_uri (uri); uri_ready = midori_prepare_uri (uri);
katze_item_set_uri (item, uri_ready); katze_item_set_uri (item, uri_ready ? uri_ready : uri);
g_free (uri_ready); g_free (uri_ready);
/* Never delay command line arguments */ /* Never delay command line arguments */
katze_item_set_meta_integer (item, "delay", 0); katze_item_set_meta_integer (item, "delay", 0);

4
midori/midori-app.c
View file

@ -506,9 +506,7 @@ midori_app_command_received (MidoriApp* app,
first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT); first = (open_external_pages_in == MIDORI_NEW_PAGE_CURRENT);
while (*uris) while (*uris)
{ {
gchar* fixed_uri = sokoke_magic_uri (*uris); gchar* fixed_uri = g_uri_unescape_string (*uris, NULL);
if (!fixed_uri)
fixed_uri = g_strdup (*uris);
if (sokoke_recursive_fork_protection (fixed_uri, FALSE)) if (sokoke_recursive_fork_protection (fixed_uri, FALSE))
{ {
if (first) if (first)