[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

compizconfig-python: Changes to 'upstream-unstable'



 VERSION              |    2 +-
 src/compizconfig.pyx |   12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 573f90f5493d16e131b49890fc2a3978cb7be05d
Author: Guillaume Seguin <guillaume@segu.in>
Date:   Sat May 31 14:09:02 2008 +0200

    * Bump version to 0.7.6

diff --git a/VERSION b/VERSION
index 130f2d5..6410fd5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.5
+VERSION=0.7.6

commit 751f8550b8094c688be136098555db37ef0a4907
Author: Christopher Williams <crdlb@compiz-fusion.org>
Date:   Fri Apr 25 02:41:56 2008 -0400

    Add action info support

diff --git a/src/compizconfig.pyx b/src/compizconfig.pyx
index 3a7a3fa..d306a88 100644
--- a/src/compizconfig.pyx
+++ b/src/compizconfig.pyx
@@ -143,10 +143,14 @@ cdef struct CCSSettingListInfo:
     CCSSettingType listType
     void *         listInfo # actually CCSSettingInfo *, works around pyrex
 
+cdef struct CCSSettingActionInfo:
+    Bool internal
+
 cdef union CCSSettingInfo:
-    CCSSettingIntInfo   forInt
-    CCSSettingFloatInfo forFloat
-    CCSSettingListInfo  forList
+    CCSSettingIntInfo    forInt
+    CCSSettingFloatInfo  forFloat
+    CCSSettingListInfo   forList
+    CCSSettingActionInfo forAction
 
 cdef struct CCSSettingValue:
     CCSSettingValueUnion value
@@ -559,6 +563,8 @@ cdef class Setting:
         elif t == TypeFloat:
             info = (i.forFloat.min, i.forFloat.max,
                     i.forFloat.precision)
+        elif t in (TypeKey, TypeButton, TypeEdge, TypeBell):
+            info = (bool (i.forAction.internal),)
         if self.ccsSetting.type == TypeList:
             info = (SettingTypeString[t], info)
         self.info = info

commit 622170e6a2c649aa4aa9147fdd97c6b39f981022
Author: Guillaume Seguin <guillaume@segu.in>
Date:   Fri Apr 4 00:17:32 2008 +0200

    * Bump version to 0.7.5

diff --git a/VERSION b/VERSION
index 8eafcce..130f2d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.4
+VERSION=0.7.5


Reply to: