Merge lp:~aauzi/midori/fix-1177553-2 into lp:midori
Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 6222 |
Merged at revision: | 6243 |
Proposed branch: | lp:~aauzi/midori/fix-1177553-2 |
Merge into: | lp:midori |
Diff against target: |
146 lines (+57/-11) 2 files modified
midori/midori-browser.c (+11/-6) panels/midori-bookmarks.c (+46/-5) |
To merge this branch: | bzr merge lp:~aauzi/midori/fix-1177553-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Approve | ||
Midori Devs | Pending | ||
Review via email:
|
Commit message
Take current selection into account for bookmark folders when adding/editing bookmark
Description of the change
in midori_
uses the current selection to find the folder a bookmark or folder is added into and passes it as a parameter of midori_
in midori_
when a new bookmark or folder is created initializes its "parentid" meta data with the id of the given bookmark_or_parent parameter.
call midori_
The parameter 'parentid' corresponds to the newly created or edited bookmarks "parentid" meta data.
in midori_
remove the case 'new_bookmark, ie. select the given parentid in any case
in _action_
call midori_
The parameter 'parentid' corresponds to the "Bookmarks" (root) folder
Looks sensible to me.