Midori Web Browser

Merge lp://staging/~kalikiana/midori/dialoglauncher into lp://staging/midori

dialoglauncher
Merge into trunk

Proposed by Cris Dywan on 2013-05-29

Status:

Merged

Approved by:

Cris Dywan on 2013-08-06

Approved revision:

6182

Merged at revision:

6322

Proposed branch:

lp://staging/~kalikiana/midori/dialoglauncher

Merge into:

lp://staging/midori

Diff against target:

174 lines (+53/-33)

3 files modified

extensions/apps.vala (+17/-9)
midori/midori-browser.c (+32/-21)
midori/midori-extension.c (+4/-3)

To merge this branch:

bzr merge lp://staging/~kalikiana/midori/dialoglauncher

Related bugs:

Bug #1017317: Remove "Create Launcher" from appmenu	Low	Fix Released
Bug #1018056: Create App Launcher from bookmark dialog	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
André Stösel		2013-05-29	Approve on 2013-08-04
Review via email: mp+166327@code.staging.launchpad.net

Commit message

Replace 'Run as app' in bookmark dialog with 'Create launcher'

Description of the change

Replace 'Run as app' in bookmark dialog with 'Create launcher'

Revision history for this message

Cris Dywan (kalikiana) wrote on 2013-06-19:

Let's introduce a trigger mechanism instead of hard-coding it. We whitelist extensions that are allowed to be automatically through a button or menu item. In this case the bookmark dialog requests a trigger (the same mechanism will be usable for the toolbar context menu). The extension registers the trigger in extension_init.

Revision history for this message

Cris Dywan (kalikiana) wrote on 2013-07-07:

I gave this more thought. I'm now concerned that a trigger has to both activate an extension and call the action. And the browser needs to get a hold of the label which is tricky since it cannot get a MidoriApp easily.

I'd prefer to consider apps as a stock extension for now. For consistency I'm really eager to solve the UI bit but as it seems the triggers won't be ready for a while.

Revision history for this message

André Stösel (ivaldi) wrote on 2013-08-04:

Looks good!

review: Approve

Revision history for this message

RabbitBot (rabbitbot-a) wrote on 2013-08-04:

Attempt to merge into lp:midori failed due to conflicts:

text conflict in extensions/apps.vala

lp://staging/~kalikiana/midori/dialoglauncher updated on 2013-08-06