Merge lp://staging/~gero-bare/midori/midori-bug-1259705 into lp://staging/midori
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~gero-bare/midori/midori-bug-1259705 |
| Merge into: | lp://staging/midori |
| Diff against target: |
1375 lines (+209/-170) 29 files modified
extensions/adblock/widgets.vala (+1/-1) extensions/addons.c (+12/-8) extensions/apps.vala (+7/-7) extensions/cookie-manager/cookie-manager-page.c (+22/-14) extensions/cookie-permissions/cookie-permission-manager-preferences-window.c (+3/-3) extensions/devpet.vala (+1/-1) extensions/feed-panel/feed-panel.c (+4/-4) extensions/nojs/nojs-preferences.c (+3/-3) extensions/nojs/nojs-view.c (+10/-4) extensions/notes.vala (+4/-5) extensions/open-with.vala (+1/-1) extensions/statusbar-features.c (+3/-3) extensions/toolbar-editor.c (+2/-2) extensions/transfers.vala (+6/-7) katze/katze-http-auth.c (+1/-1) katze/katze-preferences.c (+1/-1) midori/midori-app.c (+4/-4) midori/midori-browser.c (+35/-32) midori/midori-dialog.vala (+8/-6) midori/midori-panel.c (+3/-2) midori/midori-preferences.c (+6/-6) midori/midori-privatedata.c (+3/-3) midori/midori-searchaction.c (+23/-11) midori/midori-stock.h (+0/-3) midori/midori-view.c (+6/-6) midori/sokoke.c (+1/-1) panels/midori-bookmarks.c (+14/-11) panels/midori-history.c (+12/-9) toolbars/midori-findbar.c (+13/-11) |
| To merge this branch: | bzr merge lp://staging/~gero-bare/midori/midori-bug-1259705 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Danielle Foré (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This is a work to replace the "stock" facilities(
The work includes:
*A replacement of "from_stock" with appropriated functions: status (working on it)
*Remove midori-stock.h: status (starting)
*Add missing icons: status (discussing)
*Move Gtk.Action to GAction implementation: status (discussing/
NOTICE To the reviewers.
Please check every FIXME added and if necessary comment, notify me about problems/
| Danielle Foré (danrabbit) wrote | # |
Unmerged revisions
- 6863. By Gero.Bare
-
Merge current midori.
- 6862. By Gero.Bare
-
Add some FIXME notices.
Start cleaning midori-stock.h file. - 6861. By Gero.Bare
-
Fix varoius mistakes.
- 6860. By Gero.Bare
-
Replace preferences-system with preferences-desktop to ensure consistency. My bad.
- 6859. By Gero.Bare
-
Fix typo.
- 6858. By Gero.Bare
-
Fix edit-clear-all again.
- 6857. By Gero.Bare
-
Change icon name from help-browser to help-contents.
- 6856. By Gero.Bare
-
Fix edit-clear-all again.
- 6855. By Gero.Bare
-
Fix "edit-clear-all"
- 6854. By Gero.Bare
-
Fix the creation of gtk_tool_button_new in feed_panel extension.
* for the cookies extension, I don't think list-add/remove are appropriate for expanding items. It's pretty misleading, imo. In fact, I would use "list-remove-
* Anything opposite "list-add" should be "list-remove" and not "edit-delete". This happens quite a lot in the side panel and extensions preferences.
* I don't think "edit-clear-all" is a thing. At least GNOME and elementary have only "edit-clear".
* "help-browser" should be "help-contents" for the same reason as above.
* Typo in diffline 1547 "go-uo" should be "go-up"