Merge lp://qastaging/~midori/midori/clippyEditor into lp://qastaging/midori
Proposed by
Cris Dywan
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~midori/midori/clippyEditor |
| Merge into: | lp://qastaging/midori |
| Prerequisite: | lp://qastaging/~midori/midori/clippyBookmarks |
| Diff against target: |
1021 lines (+408/-453) 7 files modified
extensions/clippy.vala (+160/-1) midori/midori-bookmarks-db.c (+215/-0) midori/midori-bookmarks-db.h (+4/-0) midori/midori-browser.c (+21/-450) midori/midori.vapi (+6/-0) panels/midori-bookmarks.c (+1/-1) panels/midori-history.c (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~midori/midori/clippyEditor |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Midori Devs | Pending | ||
|
Review via email:
|
|||
Commit message
Move bookmark editor into clippy
Description of the change
This branch moves the bookmark editor into Clippy (and always uses a popover in all cases, no dialog, for consistency). The combo box created from the bookmarks database moves out of Browser into to BookmarksDb, which is where it should've been in the first place.
To post a comment you must log in.
Unmerged revisions
- 7175. By Cris Dywan
-
Move bookmark editor into clippy
- 7174. By Cris Dywan
-
Move bookmarkbar into clippy extension
- 7173. By Cris Dywan
-
Drop pass-through-
console flag - 7172. By Cris Dywan
-
Unconditionally include WebKit2 headers
- 7171. By Cris Dywan
-
Drop non-WebKit2 website saving code path
- 7170. By Cris Dywan
-
Non-conditional skipping of non-WebKit2 extensions
- 7169. By Cris Dywan
-
Drop non-WebKit2/ non-libnotify code paths
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
