Merge lp:~ivaldi/midori/hidden-extension-api into lp:midori

Proposed by André Stösel
Status: Merged
Approved by: Cris Dywan
Approved revision: 6400
Merged at revision: 6466
Proposed branch: lp:~ivaldi/midori/hidden-extension-api
Merge into: lp:midori
Diff against target: 22 lines (+5/-6)
1 file modified
midori/midori-extension.c (+5/-6)
To merge this branch: bzr merge lp:~ivaldi/midori/hidden-extension-api
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+186006@code.launchpad.net

Commit message

bugfix: it should be possible to use exension.set_.. api within hidden extensions

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Won't this make the extension visible? Which brings us to another problem: if it doesn't, how do you change settings then?

review: Needs Information
Revision history for this message
André Stösel (ivaldi) wrote :

No, the extension is still invisible.
And the .set_ - api isn't just for extension settings - it's a easy way to store some information.
(In fact, the api is older than the preferences signal.)

And if the extension is hidden and wants to use this for settings, it can use about:... or something else.

Revision history for this message
Cris Dywan (kalikiana) wrote :

I suppose my concerns in terms of UI would really be the same if you used others ways to store settings, what we need longterm is a solid API for the preferences dialog.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-extension.c'
2--- midori/midori-extension.c 2013-09-08 00:50:33 +0000
3+++ midori/midori-extension.c 2013-09-17 11:27:00 +0000
4@@ -674,13 +674,12 @@
5 if (katze_array_get_item_index (extensions, extension) >= 0)
6 return;
7 /* FIXME need proper stock extension mechanism */
8- if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX)
9- || !strcmp (filename, "libapps." G_MODULE_SUFFIX)
10- || !strcmp (filename, "libdelayed-load." G_MODULE_SUFFIX)
11- || !strcmp (filename, "libtabby." G_MODULE_SUFFIX))
12- return;
13+ if (strcmp (filename, "libtransfers." G_MODULE_SUFFIX)
14+ && strcmp (filename, "libapps." G_MODULE_SUFFIX)
15+ && strcmp (filename, "libdelayed-load." G_MODULE_SUFFIX)
16+ && strcmp (filename, "libtabby." G_MODULE_SUFFIX))
17+ katze_array_add_item (extensions, extension);
18
19- katze_array_add_item (extensions, extension);
20 g_object_unref (extensions);
21
22 if (midori_paths_is_readonly ())

Subscribers

People subscribed via source and target branches

to all changes: