lp://staging/~gero-bare/midori/midori-bug-1259705

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/midori

Danielle Foré (community): Needs Fixing on 2014-12-20

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6863. By Gero.Bare on 2015-02-08

Merge current midori.

6862. By Gero.Bare on 2015-01-03

Add some FIXME notices.
Start cleaning midori-stock.h file.

6861. By Gero.Bare on 2014-12-24

Fix varoius mistakes.

6860. By Gero.Bare on 2014-12-23

Replace preferences-system with preferences-desktop to ensure consistency. My bad.

6859. By Gero.Bare on 2014-12-23

Fix typo.

6858. By Gero.Bare on 2014-12-23

Fix edit-clear-all again.

6857. By Gero.Bare on 2014-12-23

Change icon name from help-browser to help-contents.

6856. By Gero.Bare on 2014-12-23

Fix edit-clear-all again.

6855. By Gero.Bare on 2014-12-20

Fix "edit-clear-all"

6854. By Gero.Bare on 2014-12-20

Fix the creation of gtk_tool_button_new in feed_panel extension.