summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2008-04-27 11:03:47 +0800
committerSam Spilsbury <smspillaz@gmail.com>2008-04-27 11:03:47 +0800
commitb353e199bd2890d1b5946eebf868b73b3fbb7a85 (patch)
treefb9583194633dd731fa3a9272de6119a26b26cd2
parenta56b475fb0531c192c7717d73909b3ba728bfe06 (diff)
parente4c5ce46cf62d272ad0454c74210b935696e0008 (diff)
downloadcompiz-tools-b353e199bd2890d1b5946eebf868b73b3fbb7a85.tar.gz
compiz-tools-b353e199bd2890d1b5946eebf868b73b3fbb7a85.tar.bz2
Merge branch 'master' of git+ssh://smspillaz@git.compiz-fusion.org/git/users/smspillaz/compiz-toolsHEADmaster
-rwxr-xr-xCompiz-Fusion-Preferences/compiz-fusion-settings2
-rwxr-xr-xCompiz-Fusion-Troubleshooter/fusion-trouble2
-rwxr-xr-xCompiz-Fusion-Troubleshooter/fusion-trouble.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/Compiz-Fusion-Preferences/compiz-fusion-settings b/Compiz-Fusion-Preferences/compiz-fusion-settings
index 3104696..231e67b 100755
--- a/Compiz-Fusion-Preferences/compiz-fusion-settings
+++ b/Compiz-Fusion-Preferences/compiz-fusion-settings
@@ -845,7 +845,7 @@ class Base:
# Enable the plugin
Conflict = ccm.EdgeConflict(Setting, Edge, autoResolve = True)
if Conflict.Resolve(self.GlobalUpdater):
- self.context.Plugins[Option[0]].Display[Option[1]].Value = Edge
+ self.context.Plugins[Option[0]].Display[Option[1]].Value[2] = Edge
self.context.Plugins[Option[0]].Enabled = True
self.context.Write()
break
diff --git a/Compiz-Fusion-Troubleshooter/fusion-trouble b/Compiz-Fusion-Troubleshooter/fusion-trouble
index 83c7652..206ba66 100755
--- a/Compiz-Fusion-Troubleshooter/fusion-trouble
+++ b/Compiz-Fusion-Troubleshooter/fusion-trouble
@@ -124,7 +124,7 @@ class fusionWelcome(threading.Thread):
print cancel
self.Welcome.show_all()
- self.Welcome.set_icon("fusion-trouble-icon")
+ self.Welcome.set_icon_from_file("/usr/local/share/icons/hicolor/scalable/apps/fusion-trouble-icon.svg")
self.wait = GladeXML.get_widget("wait")
self.bar = GladeXML.get_widget('StartProgress')
diff --git a/Compiz-Fusion-Troubleshooter/fusion-trouble.in b/Compiz-Fusion-Troubleshooter/fusion-trouble.in
index 89460a6..dec86c8 100755
--- a/Compiz-Fusion-Troubleshooter/fusion-trouble.in
+++ b/Compiz-Fusion-Troubleshooter/fusion-trouble.in
@@ -124,7 +124,7 @@ class fusionWelcome(threading.Thread):
print cancel
self.Welcome.show_all()
- self.Welcome.set_icon("fusion-trouble-icon")
+ self.Welcome.set_icon_from_file("@prefix@/share/icons/hicolor/scalable/apps/fusion-trouble-icon.svg")
self.wait = GladeXML.get_widget("wait")
self.bar = GladeXML.get_widget('StartProgress')