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

Fix uri matching for addon infobar on userstyles.org

Browse source 
We want to match a style, with a number in the URI, but not when
browsing styles.
This commit is contained in:
Paweł Forysiuk 2011-04-01 16:10:16 +02:00 committed by Christian Dywan
parent 2771eee995
commit 61d6da99ed
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
extensions/addons.c
View file

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2008 Christian Dywan <christian@twotoasts.de> Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
Copyright (C) 2008-2010 Arno Renevier <arno@renevier.net> Copyright (C) 2008-2010 Arno Renevier <arno@renevier.net>
Copyright (C) 2010 Paweł Forysiuk <tuxator@o2.pl> Copyright (C) 2010-2011 Paweł Forysiuk <tuxator@o2.pl>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -152,15 +152,10 @@ addons_install_response (GtkWidget* infobar,
} }
else if (!g_strcmp0 (hostname, "userstyles.org")) else if (!g_strcmp0 (hostname, "userstyles.org"))
{ {
gchar* subpage; gchar* subpage = split_uri[4];
folder = "styles"; folder = "styles";
if (g_str_has_suffix (uri, "/")) if ((subpage && *subpage) && g_ascii_isdigit (subpage[0]))
subpage = split_uri[6];
else
subpage = split_uri[5];
if (!subpage)
{ {
gchar* style_id; gchar* style_id;
const gchar* js_script; const gchar* js_script;
@ -278,14 +273,10 @@ addons_notify_load_status_cb (MidoriView* view,
else if (g_str_has_prefix (uri, "http://userstyles.org/styles/")) else if (g_str_has_prefix (uri, "http://userstyles.org/styles/"))
{ {
gchar** split_uri = g_strsplit (uri, "/", -1); gchar** split_uri = g_strsplit (uri, "/", -1);
gchar* subpage; gchar* subpage = split_uri[4];
if (g_str_has_suffix (uri, "/"))
subpage = split_uri[6];
else
subpage = split_uri[5];
/* userstyles.org style main page with style description */ /* userstyles.org style main page with style description */
if (!subpage) if ((subpage && *subpage) && g_ascii_isdigit (subpage[0]))
addons_uri_install (view, ADDONS_USER_STYLES); addons_uri_install (view, ADDONS_USER_STYLES);
g_strfreev (split_uri); g_strfreev (split_uri);