Merge lp://staging/~elementary-apps/eidete/fix-for-freya into lp://staging/eidete

Proposed by Tom Beckmann
Status: Merged
Approved by: PerfectCarl
Approved revision: 207
Merged at revision: 176
Proposed branch: lp://staging/~elementary-apps/eidete/fix-for-freya
Merge into: lp://staging/eidete
Diff against target: 1635 lines (+700/-415)
9 files modified
CMakeLists.txt (+32/-8)
README (+22/-0)
po/eidete.pot (+87/-72)
src/Widgets/end_dialog.vala (+192/-76)
src/Widgets/keyview.vala (+177/-167)
src/Widgets/selectionarea.vala (+14/-11)
src/eidete.vala (+136/-67)
src/keycapture.c (+6/-0)
src/videobin_uploader.vala (+34/-14)
To merge this branch: bzr merge lp://staging/~elementary-apps/eidete/fix-for-freya
Reviewer Review Type Date Requested Status
PerfectCarl (community) Approve
Review via email: mp+245513@code.staging.launchpad.net

Commit message

Make eidete work for elementary freya:
   - port it to gstreamer 1.0
   - fix contractors
   - fix video-bin (though videobin.org doesn't support webm files anymore)
   - update styling
   - update pot
   - fix misc issues

Note: the project is still compatible with gstreamer 0.10 and luna (see makefile for more info)

Description of the change

Make eidete work for elementary freya: fixing issues and port it to gstreamer 1.0.
The project is still compatible with gstreamer 0.10 (see makefile for more info)

(this is a more public (in terms of access rights) copy of the original 314 compatibility branch)

To post a comment you must log in.
205. By Tom Beckmann

fix a bunch of compiler warnings

206. By PerfectCarl

Fix the pause windows

207. By PerfectCarl

Fix size issues

Revision history for this message
PerfectCarl (name-is-carl) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: