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

Handle addon install in view specific callbacks

Browse source 
Connect on the view rather than the browser and use
MIDORI_LOAD_COMMITTED which is only emitted once.
This commit is contained in:
Paweł Forysiuk 2011-02-18 02:05:51 +01:00 committed by Christian Dywan
parent 663a82d873
commit 846a7f7088
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
extensions/addons.c
View file

@ -215,8 +215,7 @@ addons_install_response (GtkWidget* infobar,
} }
static void static void
addons_uri_install (MidoriBrowser* browser, addons_uri_install (MidoriView* view,
MidoriView* view,
AddonsKind kind) AddonsKind kind)
{ {
const gchar* message; const gchar* message;
@ -244,23 +243,21 @@ addons_uri_install (MidoriBrowser* browser,
} }
static void static void
addons_notify_load_status_cb (MidoriBrowser* browser, addons_notify_load_status_cb (MidoriView* view,
GParamSpec* pspec, GParamSpec* pspec,
MidoriExtension* extension) MidoriExtension* extension)
{ {
const gchar* uri = midori_browser_get_current_uri (browser); const gchar* uri = midori_view_get_display_uri (view);
if (uri && *uri) if (uri && *uri)
{ {
/* FIXME: addons_notify_load_status_cb should pass MidoriView* pointer */ if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
GtkWidget* view = midori_browser_get_current_tab (browser);
if (midori_view_get_load_status (MIDORI_VIEW (view)) == MIDORI_LOAD_FINISHED)
{ {
/* casual sites goes by uri suffix */ /* casual sites goes by uri suffix */
if (g_str_has_suffix (uri, ".user.js")) if (g_str_has_suffix (uri, ".user.js"))
addons_uri_install (browser, MIDORI_VIEW (view), ADDONS_USER_SCRIPTS); addons_uri_install (view, ADDONS_USER_SCRIPTS);
else if (g_str_has_suffix (uri, ".user.css")) else if (g_str_has_suffix (uri, ".user.css"))
addons_uri_install (browser, MIDORI_VIEW (view), ADDONS_USER_STYLES); addons_uri_install (view, ADDONS_USER_STYLES);
else if (g_str_has_prefix (uri, "http://userscripts.org/scripts/")) else if (g_str_has_prefix (uri, "http://userscripts.org/scripts/"))
{ {
gchar** split_uri = g_strsplit (uri, "/", -1); gchar** split_uri = g_strsplit (uri, "/", -1);
@ -268,7 +265,7 @@ addons_notify_load_status_cb (MidoriBrowser* browser,
/* userscripts.org script main (with desc) and "source view" pages */ /* userscripts.org script main (with desc) and "source view" pages */
if (!g_strcmp0 (subpage, "show") || !g_strcmp0 (subpage, "review")) if (!g_strcmp0 (subpage, "show") || !g_strcmp0 (subpage, "review"))
addons_uri_install (browser, MIDORI_VIEW (view), ADDONS_USER_SCRIPTS); addons_uri_install (view, ADDONS_USER_SCRIPTS);
g_strfreev (split_uri); g_strfreev (split_uri);
} }
@ -283,7 +280,7 @@ addons_notify_load_status_cb (MidoriBrowser* browser,
subpage = split_uri[5]; subpage = split_uri[5];
/* userstyles.org style main page with style description */ /* userstyles.org style main page with style description */
if (!subpage) if (!subpage)
addons_uri_install (browser, MIDORI_VIEW (view), ADDONS_USER_STYLES); addons_uri_install (view, ADDONS_USER_STYLES);
g_strfreev (split_uri); g_strfreev (split_uri);
} }
@ -1514,6 +1511,8 @@ addons_add_tab_cb (MidoriBrowser* browser,
GtkWidget* web_view = midori_view_get_web_view (view); GtkWidget* web_view = midori_view_get_web_view (view);
g_signal_connect (web_view, "window-object-cleared", g_signal_connect (web_view, "window-object-cleared",
G_CALLBACK (addons_context_ready_cb), extension); G_CALLBACK (addons_context_ready_cb), extension);
g_signal_connect (view, "notify::load-status",
G_CALLBACK (addons_notify_load_status_cb), extension);
} }
static void static void
@ -1585,8 +1584,6 @@ addons_app_add_browser_cb (MidoriApp* app,
(GtkCallback)addons_add_tab_foreach_cb, extension); (GtkCallback)addons_add_tab_foreach_cb, extension);
g_signal_connect (browser, "add-tab", g_signal_connect (browser, "add-tab",
G_CALLBACK (addons_add_tab_cb), extension); G_CALLBACK (addons_add_tab_cb), extension);
g_signal_connect (browser, "notify::load-status",
G_CALLBACK (addons_notify_load_status_cb), extension);
panel = katze_object_get_object (browser, "panel"); panel = katze_object_get_object (browser, "panel");
scripts = addons_new (ADDONS_USER_SCRIPTS, extension); scripts = addons_new (ADDONS_USER_SCRIPTS, extension);