Merge lp://staging/~elementary-apps/midori/browser-vala into lp://staging/midori
Proposed by
Tom Beckmann
| Status: | Work in progress | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~elementary-apps/midori/browser-vala | ||||
| Merge into: | lp://staging/midori | ||||
| Diff against target: |
7009 lines (+5330/-1305) (has conflicts) 17 files modified
CMakeLists.txt (+25/-6) katze/midori-paths.vala (+0/-1) midori/CMakeLists.txt (+5/-2) midori/midori-app.h (+1/-1) midori/midori-browser.h (+0/-199) midori/midori-browser.vala (+5053/-1002) midori/midori-download.vala (+1/-5) midori/midori-privatedata.h (+1/-1) midori/midori-speeddial.vala (+0/-4) midori/midori-view.c (+1/-1) midori/midori.h (+0/-1) vapi/gobject-fixes.vapi (+23/-0) vapi/gtk-fixes.vapi (+27/-0) vapi/katze.vapi (+44/-4) vapi/midori.vapi (+147/-77) vapi/webkit2gtk-3.0.vapi (+1/-1) vapi/webkitgtk-3.0.vapi (+1/-0) Text conflict in midori/midori-browser.vala |
||||
| To merge this branch: | bzr merge lp://staging/~elementary-apps/midori/browser-vala | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Pending | ||
|
Review via email:
|
|||
Description of the change
This is a port of midori/
To post a comment you must log in.
Unmerged revisions
- 6779. By Tom Beckmann
-
Removed copies of gobject and gtk vapis in favor of minimal fixes vapis. Moved all vapis
to a vapi directory - 6778. By Tom Beckmann
-
Fix some errors, copy gtk and gobject vapis to local source to override faults in
GtkActionCallback and ParamSpec* type id bindings - 6777. By Tom Beckmann
-
Fix all errors, one valac crash remaining
- 6776. By Tom Beckmann
-
Start porting midori-browser.c to vala
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
