ccsm: Changes to 'upstream-unstable'
VERSION | 2 +-
ccm/Pages.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 27380accf56c6ced62e5c0a3e9e0d3998f26dc4b
Author: Patrick Niklaus <marex@opencompositing.org>
Date: Mon Sep 17 15:48:52 2007 +0200
Fixed using missing profiles, closes bug 176
diff --git a/ccm/Pages.py b/ccm/Pages.py
index de45d53..ce5d399 100644
--- a/ccm/Pages.py
+++ b/ccm/Pages.py
@@ -843,13 +843,13 @@ class ProfileBackendPage:
self.ProfileComboBox.append_text(_("Default"))
for profile in self.Context.Profiles.values():
self.ProfileComboBox.append_text(profile.Name)
- if self.Context.CurrentProfile.Name == '' or self.Context.CurrentProfile.Name == 'Default':
- self.ProfileComboBox.set_active(0)
- else:
- name = self.Context.CurrentProfile.Name
+ self.ProfileComboBox.connect("changed", self.ProfileChanged)
+ name = self.Context.CurrentProfile.Name
+ if name in self.Context.Profiles:
index = self.Context.Profiles.values().index(self.Context.Profiles[name])
self.ProfileComboBox.set_active(index+1)
- self.ProfileComboBox.connect("changed", self.ProfileChanged)
+ else:
+ self.ProfileComboBox.set_active(0)
profileAdd.connect("clicked", self.AddProfile)
profileRemove.connect("clicked", self.RemoveProfile)
profileBox.pack_start(self.ProfileComboBox, True, True)
commit ba2f626c7a236f8f5125552a4eec3e607e92a280
Author: Guillaume Seguin <guillaume@segu.in>
Date: Sat Oct 20 22:03:44 2007 +0200
* Bump VERSION to 0.6.1
diff --git a/VERSION b/VERSION
index de3b1c2..161c807 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.6.0
+VERSION=0.6.1
Reply to: