Midori Web Browser

Merge lp:~tuxator/midori/win32-disable-webmedia into lp:midori

  1. win32-disable-webmedia
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6726
Merged at revision: 6730
Proposed branch: lp:~tuxator/midori/win32-disable-webmedia
Merge into: lp:midori
Diff against target: 16 lines (+6/-0)
1 file modified
extensions/CMakeLists.txt (+6/-0)
To merge this branch: bzr merge lp:~tuxator/midori/win32-disable-webmedia
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+224513@code.launchpad.net

Commit message

Skip compiling webmedia extension on windows

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt 2014-03-02 16:09:22 +0000
+++ extensions/CMakeLists.txt 2014-06-25 20:35:53 +0000
@@ -24,6 +24,12 @@
24 )24 )
25endif ()25endif ()
2626
27# FIXME: re-enable webmedia extension
28# once we have working notifications on win
29if (WIN32)
30 list(REMOVE_ITEM EXTENSIONS "webmedia-now-playing.vala")
31endif()
32
27foreach(UNIT_SRC ${EXTENSIONS})33foreach(UNIT_SRC ${EXTENSIONS})
28 string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)34 string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)
29 if (UNIT_EXTENSION GREATER -1)35 if (UNIT_EXTENSION GREATER -1)

Subscribers

People subscribed via source and target branches

to all changes: