Hello community, here is the log from the commit of package gtg for openSUSE:11.4 checked in at Fri Apr 1 00:42:00 CEST 2011. -------- --- old-versions/11.4/all/gtg/gtg.changes 2011-02-12 20:25:49.000000000 +0100 +++ 11.4/gtg/gtg.changes 2011-03-30 16:54:12.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 30 14:43:17 UTC 2011 - malcolmlewis@opensuse.org + +- Fix bug bnc#683748 malcolmlewis@opensuse.org -- After activiting + the Hamster (Time Tracking) plugin in GTG nothing happens. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/gtg Destination is old-versions/11.4/UPDATES/all/gtg calling whatdependson for 11.4-i586 New: ---- gtg-hamster-plugin-not-starting-tracking-tasks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtg.spec ++++++ --- /var/tmp/diff_new_pack.kd8eGu/_old 2011-04-01 00:41:19.000000000 +0200 +++ /var/tmp/diff_new_pack.kd8eGu/_new 2011-04-01 00:41:19.000000000 +0200 @@ -19,12 +19,14 @@ Name: gtg Version: 0.2.4 -Release: 2 +Release: 5.<RELEASE6> License: GPLv3+ Summary: Personal Organizer for GNOME Url: https://gtg.fritalk.com Group: Productivity/Office/Organizers Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gtg-hamster-plugin-not-starting-tracking-tasks.patch lp#620313 bnc#683748 malcolmlewis@opensuse.org -- Fix After activiting the Hamster (Time Tracking) plugin in GTG nothing happens. +Patch0: gtg-hamster-plugin-not-starting-tracking-tasks.patch BuildRequires: dbus-1 # dbus-1 is only required for file ownerships BuildRequires: fdupes @@ -59,6 +61,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build ++++++ gtg-hamster-plugin-not-starting-tracking-tasks.patch ++++++ diff --git a/GTG/plugins/hamster/hamster.py b/GTG/plugins/hamster/hamster.py index b4e2208..09f003b 100755 --- a/GTG/plugins/hamster/hamster.py +++ b/GTG/plugins/hamster/hamster.py @@ -65,15 +65,18 @@ class hamsterPlugin: hamster_activities=dict([(unicode(x[0]), unicode(x[1])) for x in self.hamster.GetActivities()]) if (gtg_title in hamster_activities or gtg_title.replace(",", "") in hamster_activities): - category = "@%s" % hamster_activities[gtg_title] + category = "%s" % hamster_activities[gtg_title] if (self.preferences['category'] == 'tag' or (self.preferences['category'] == 'auto_tag' and not category)): # See if any of the tags match existing categories - categories = dict([(unicode(x).lower(), unicode(x)) for x in self.hamster.GetCategories()]) + categories = dict([(unicode(x[1]).lower(), unicode(x[1])) for x in self.hamster.GetCategories()]) intersection = set(categories.keys()).intersection(set([x.lower() for x in gtg_tags])) if len(intersection) > 0: - category = "@%s" % categories[intersection.pop()] + category = "%s" % categories[intersection.pop()] + else: + # Force category if not found + category = gtg_tags[0] description = "" if self.preferences['description'] == 'title': @@ -91,11 +94,10 @@ class hamsterPlugin: except dbus.exceptions.DBusException: # old hamster version, doesn't support tags pass - tag_str = "".join([" #" + x for x in tag_candidates]) - + tag_str = "".join([", " + x for x in tag_candidates]) #print '%s%s,%s%s'%(activity, category, description, tag_str) - hamster_id=self.hamster.AddFact('%s%s,%s%s'%(activity, category, description, tag_str), 0, 0) - + hamster_id=self.hamster.AddFact(activity, tag_str, 0, 0, category, description, False) + ids=self.get_hamster_ids(task) ids.append(str(hamster_id)) self.set_hamster_ids(task, ids) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org