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

compizconfig-python: Changes to 'upstream-unstable'



 VERSION |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c8a8382c2c7caba0ed844797311c1c44b4eb63a
Author: Guillaume Seguin <guillaume@segu.in>
Date:   Wed Oct 14 04:09:12 2009 +0200

    * Bump version to 0.8.4

diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4

commit f96a45a3527409ea47b4001c9e7dfd4e06bebffd
Author: Erkin Bahceci <erkinbah@gmail.com>
Date:   Thu Mar 26 23:11:08 2009 -0500

    Revert "Remove display-related stuff from extensions."
    
    This reverts commit 7563ade4d96d4502eb0172423a89f7808f73ed52,
    which belongs in the compiz++ branch.

diff --git a/src/compizconfig.pyx b/src/compizconfig.pyx
index 66060b6..f8ab652 100644
--- a/src/compizconfig.pyx
+++ b/src/compizconfig.pyx
@@ -228,6 +228,7 @@ cdef struct CCSStrExtension:
     char *                  basePlugin
     CCSSettingList *        baseSettings
     CCSStrRestrictionList * restriction
+    Bool                    isScreen
 
 cdef struct CCSPlugin:
     char * name
@@ -879,9 +880,12 @@ cdef class Plugin:
             while baseSettingList:
                 baseSettingName = <char *> baseSettingList.data
 
-                settings = []
-                for x in xrange (self.context.nScreens):
-                    settings.append (basePlugin.Screens[x][baseSettingName])
+                if ext.isScreen:
+                    settings = []
+                    for x in xrange (self.context.nScreens):
+                        settings.append (basePlugin.Screens[x][baseSettingName])
+                else:
+                    settings = [basePlugin.Display[baseSettingName]]
 
                 for settingItem in settings:
                     setting = settingItem

commit 7563ade4d96d4502eb0172423a89f7808f73ed52
Author: Erkin Bahceci <erkinbah@gmail.com>
Date:   Thu Mar 26 22:56:10 2009 -0500

    Remove display-related stuff from extensions.

diff --git a/src/compizconfig.pyx b/src/compizconfig.pyx
index f8ab652..66060b6 100644
--- a/src/compizconfig.pyx
+++ b/src/compizconfig.pyx
@@ -228,7 +228,6 @@ cdef struct CCSStrExtension:
     char *                  basePlugin
     CCSSettingList *        baseSettings
     CCSStrRestrictionList * restriction
-    Bool                    isScreen
 
 cdef struct CCSPlugin:
     char * name
@@ -880,12 +879,9 @@ cdef class Plugin:
             while baseSettingList:
                 baseSettingName = <char *> baseSettingList.data
 
-                if ext.isScreen:
-                    settings = []
-                    for x in xrange (self.context.nScreens):
-                        settings.append (basePlugin.Screens[x][baseSettingName])
-                else:
-                    settings = [basePlugin.Display[baseSettingName]]
+                settings = []
+                for x in xrange (self.context.nScreens):
+                    settings.append (basePlugin.Screens[x][baseSettingName])
 
                 for settingItem in settings:
                     setting = settingItem

commit b869a33e6913fb77870b4d15d0e7b0e5ef46c74f
Author: Guillaume Seguin <guillaume@segu.in>
Date:   Mon Mar 9 15:43:53 2009 +0100

    * Bump version to 0.8.3

diff --git a/VERSION b/VERSION
index 2dcc312..9b265c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.2
+VERSION=0.8.3


Reply to: