summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <Sam@ACER-SUSE.SUSE>2007-12-31 02:15:03 +0900
committerSam Spilsbury <Sam@ACER-SUSE.SUSE>2007-12-31 02:15:03 +0900
commit3151167a597675dc88ad2f8f368832a788c1ce86 (patch)
tree8db56f8b614b615c468507f0035a47b5e7c25114
parent31fd559a1f697d1a324346be33363e05257f2b65 (diff)
downloadcompiz-tools-3151167a597675dc88ad2f8f368832a788c1ce86.tar.gz
compiz-tools-3151167a597675dc88ad2f8f368832a788c1ce86.tar.bz2
* Fix possible 0.6 conflict
-rwxr-xr-xCompiz-Fusion-Preferences/compiz-fusion-settings32
1 files changed, 12 insertions, 20 deletions
diff --git a/Compiz-Fusion-Preferences/compiz-fusion-settings b/Compiz-Fusion-Preferences/compiz-fusion-settings
index 03a05fd..791d012 100755
--- a/Compiz-Fusion-Preferences/compiz-fusion-settings
+++ b/Compiz-Fusion-Preferences/compiz-fusion-settings
@@ -832,7 +832,7 @@ class Base:
if Option[0] != None:
# First Disable the Old Option
if self.context.Plugins[Option[0]].Display[Option[1]].Value == Edge:
- self.context.Plugins[Option[0]].Display[Option[1]].Value[2] = "Disabled"
+ self.context.Plugins[Option[0]].Display[Option[1]].Value = "Disabled"
self.context.Write()
OldOptionDisabled = True
else:
@@ -845,7 +845,7 @@ class Base:
# Enable the plugin
Conflict = ccm.ActionConflict(Setting, edges = Edge)
if Conflict.Resolve(self.GlobalUpdater):
- self.context.Plugins[Option[0]].Display[Option[1]].Value[2] = Edge
+ self.context.Plugins[Option[0]].Display[Option[1]].Value = Edge
self.context.Plugins[Option[0]].Enabled = True
self.context.Write()
break
@@ -965,8 +965,8 @@ class Base:
NewDecrValue = CurValue + "Button5"
for i in self.OBSModifiers:
if i[0] == NameOfWidget:
- self.plugins[self.pluginnames.index(pluginName)].Display[OptionName] = NewIncrValue
- self.plugins[self.pluginnames.index(pluginName)].Display[OptionName.replace("_increase", "_decrease")].Value[1] = NewDecrValue
+ self.plugins[self.pluginnames.index(pluginName)].Display[OptionName].Value = NewIncrValue
+ self.plugins[self.pluginnames.index(pluginName)].Display[OptionName.replace("_increase", "_decrease")].Value = NewDecrValue
self.context.Write()
@@ -1117,15 +1117,15 @@ class Base:
self.context.Write()
else:
- Value = i.Value
+ Value = i.Value[0]
Val = (4000 - (CurrentSpeed * 800))
- Value[0] = int(Val)
+ Value = int(Val)
# We dont want it to be too slow
- Value[0] = Value[0] - 2000
+ Value = Value - 2000
# Leave it if it hits 100
- if Value[0] < 100:
- Value[0] = 100
- i.Value = Value
+ if Value < 100:
+ Value = 100
+ i.Value[0] = Value
self.context.Write()
def PluginEnableDisable(self, widget, name, name2=None):
@@ -1162,14 +1162,6 @@ class Base:
self.context.Write()
- def SettingButtonChanged(self, signal, name, settingName, settingType, widget):
- if settingType == "Screen":
- self.plugins[self.pluginnames.index(name)].Screens[0][settingName].Value[1] = widget.get_text()
- else:
- plugin.Display[settingName].Value = widget.get_text()
-
- self.context.Write()
-
def CreatePluginSetting(self, widgetName, name, sensitive, name2=None):
self.Widget = self.gladefile.get_widget(widgetName)
self.Widget.set_sensitive(sensitive)
@@ -1233,14 +1225,14 @@ class Base:
def ActionKeyEdited(self, cell, path, text):
keyIter = self.KeyBindingsStore.get_iter(path)
settingObject = self.KeyBindingsStore.get_value(keyIter, 3)
- settingObject.Value[0] = text
+ settingObject.Value = text
self.context.Write()
self.KeyBindingsStore.set_value(keyIter, 2, settingObject.Value)
def ActionButtonEdited(self, cell, path, text):
mouseIter = self.KeyBindingsStore.get_iter(path)
settingObject = self.KeyBindingsStore.get_value(mouseIter, 6)
- settingObject.Value[1] = text
+ settingObject.Value = text
self.context.Write()
self.KeyBindingsStore.set_value(mouseIter, 5, settingObject.Value)