← Back to branch summary

~ubuntu-branches/ubuntu/vivid/compiz/vivid

« back to all changes in this revision

Viewing changes to gtk/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Chris Townsend, Alberts Muktupāvels
  • Date: 2014-07-07 11:42:19 UTC
  • mfrom: (3248.176.40)
  • Revision ID: package-import@ubuntu.com-20140707114219-ipum407fkn7ed64h
Tags: 1:0.9.11+14.10.20140707-0ubuntu1
https://launchpad.net/bugs/1330198
[ Chris Townsend ]
* Release version 0.9.11
* Bump VERSION to 0.9.12
* Add more button ungrab keymasks, so unfocused Gtk window scrolling
  will work when NumLock is off and CapsLock is on and any combination
  thereof. (LP: #1330198)
* Remove the need to check the viewport we are painting the maximized
  window in while in Expo mode and only scale maximized windows that
  are not being dragged. Fixes a regression caused in r3868. (LP:
  #1333277)

[ Alberts Muktupāvels ]
* This is some preparation work to port gtk-window-decorator to gtk+-
  3.0. Changed gtk_object_destroy to gtk_widget_destory. Removed
  support for old metacity versions. Removed support for old wnck
  versions. .

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/CMakeLists.txt
21
21
          list (REMOVE_AT CMAKE_REQUIRED_FLAGS REENTRANT_INDEX)
22
22
          list (APPEND CMAKE_REQUIRED_FLAGS "-D_REENTRANT=1")
23
23
        endif (REENTRANT_INDEX)
24
 
        check_function_exists (wnck_window_has_name HAVE_WNCK_WINDOW_HAS_NAME)
25
24
        set (CMAKE_REQUIRED_FLAGS "")
26
25
        set (CMAKE_REQUIRED_LIBRARIES "")
27
26
 
28
 
        compiz_pkg_check_modules (HAVE_LIBWNCK_2_18_1 libwnck-1.0>=2.18.1)
29
 
        compiz_pkg_check_modules (HAVE_LIBWNCK_2_19_4 libwnck-1.0>=2.19.4)
30
 
 
31
27
        if (USE_METACITY)
32
28
            pkg_check_modules (METACITY libmetacity-private)
33
29
            if (METACITY_FOUND)
34
 
                compiz_pkg_check_modules (HAVE_METACITY_2_15_21 libmetacity-private>=2.15.21)
35
 
                compiz_pkg_check_modules (HAVE_METACITY_2_17_0 libmetacity-private>=2.17.0)
36
 
                compiz_pkg_check_modules (HAVE_METACITY_2_23_2 libmetacity-private>=2.23.2)
 
30
                pkg_check_modules (METACITY_3_12_0 libmetacity-private>=3.12.0)
 
31
                if (METACITY_3_12_0_FOUND)
 
32
                        compiz_set (USE_METACITY 0)
 
33
                endif (METACITY_3_12_0_FOUND)
37
34
            else (METACITY_FOUND)
38
35
                compiz_set (USE_METACITY 0)
39
36
            endif (METACITY_FOUND)