Hello community,
here is the log from the commit of package hamster-time-tracker for
openSUSE:Factory checked in at 2014-01-21 11:09:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hamster-time-tracker (Old)
and /work/SRC/openSUSE:Factory/.hamster-time-tracker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hamster-time-tracker"
Changes:
--------
---
/work/SRC/openSUSE:Factory/hamster-time-tracker/hamster-time-tracker.changes
2013-02-10 14:35:54.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.hamster-time-tracker.new/hamster-time-tracker.changes
2014-01-23 15:45:03.000000000 +0100
@@ -1,0 +2,9 @@
+Sun Jan 19 17:41:18 UTC 2014 - zai...@opensuse.org
+
+- Update to version 1.04:
+ + Bugfixes around talking to the notifications daemon.
+ + Updating tags list in prefs wasn't doing anything.
+ + In some cases activity updates were failing when tags where
+ provided.
+
+-------------------------------------------------------------------
Old:
----
hamster-time-tracker-1.03.3.tar.gz
New:
----
hamster-time-tracker-1.04.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hamster-time-tracker.spec ++++++
--- /var/tmp/diff_new_pack.BIbhJE/_old 2014-01-23 15:45:04.000000000 +0100
+++ /var/tmp/diff_new_pack.BIbhJE/_new 2014-01-23 15:45:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hamster-time-tracker
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: hamster-time-tracker
-Version: 1.03.3
+Version: 1.04
Release: 0
Summary: A time tracker for GNOME
License: GPL-3.0+ and CC-BY-SA-3.0
@@ -25,7 +25,7 @@
Url: http://projecthamster.wordpress.com/
# The download_files source verification script barks.. even though it should
be fine.
# Source0:
https://github.com/projecthamster/hamster/archive/%{name}-%{version}.tar.gz
-Source0: %{name}-%{version}.tar.gz
+Source0:
https://github.com/projecthamster/hamster/archive/%{name}-%{version}.tar.gz
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: glib2-devel
++++++ hamster-time-tracker-1.03.3.tar.gz -> hamster-time-tracker-1.04.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hamster-hamster-time-tracker-1.03.3/AUTHORS
new/hamster-hamster-time-tracker-1.04/AUTHORS
--- old/hamster-hamster-time-tracker-1.03.3/AUTHORS 2013-01-18
01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/AUTHORS 2014-01-10
19:05:26.000000000 +0100
@@ -1,2 +1,2 @@
-Toms Bauģis <toms.bau...@gmail.com>
-Patryk Zawadzki <pat...@pld-linux.org>
+Read the copylefts in files. Mainly it's code by Toms Bauģis and Patryk
+Zawadzki, but we also had some good contributions from other people.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hamster-hamster-time-tracker-1.03.3/MAINTAINERS
new/hamster-hamster-time-tracker-1.04/MAINTAINERS
--- old/hamster-hamster-time-tracker-1.03.3/MAINTAINERS 2013-01-18
01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/MAINTAINERS 2014-01-10
19:05:26.000000000 +0100
@@ -1,7 +1 @@
-Toms Baugis
-E-mail: toms.bau...@gmail.com
-Userid: tbaugis
-
-Patryk Zawadzki
-E-mail: pat...@pld-linux.org
-Userid: pzawadzki
+No maintainers for now.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hamster-hamster-time-tracker-1.03.3/NEWS
new/hamster-hamster-time-tracker-1.04/NEWS
--- old/hamster-hamster-time-tracker-1.03.3/NEWS 2013-01-18
01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/NEWS 2014-01-10 19:05:26.000000000
+0100
@@ -1,4 +1,15 @@
===============
+Version 1.04
+===============
+ This version just packs all the contributed bugfixes of last 12 month (there
+ were just a few)
+
+ * bugfixes around talking to the notifications daemon
+ * updating tags list in prefs wasn't doing anything
+ * in some cases activity updates were failing when tags where provided
+
+
+===============
Version 1.03.3
===============
* fix exporting entries to file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hamster-hamster-time-tracker-1.03.3/README.textile
new/hamster-hamster-time-tracker-1.04/README.textile
--- old/hamster-hamster-time-tracker-1.03.3/README.textile 2013-01-18
01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/README.textile 2014-01-10
19:05:26.000000000 +0100
@@ -1,18 +1,5 @@
-Hamster can be found packaged in most distributions. The instructions below
-are for installing from sources for testing and development purposes.
-
-The instructions are mix between Gnome 2 and Gnome 3, so, errm, just bear with
-us.
-
-h1. hamster-applet -> hamster-time-tracker clean up
-
-Previously hamster was installed everywhere under @hamster-applet@. As
-the applet is long gone, the paths and file names have changed to
-@hamster-time-tracker@. To clean up previous install follow these steps:
-
-pre. git checkout d140d45f105d4ca07d4e33bcec1fae30143959fe
-./waf configure build --prefix=/usr
-sudo ./waf uninstall
+NOTE: Hamster is kinda not being maintained at the moment.
+Details here:
http://projecthamster.wordpress.com/2013/05/13/hamster-is-looking-for-a-new-maintainer/
h1. Dependencies
@@ -29,3 +16,15 @@
pre. killall hamster-service && killall hamster-windows-service
Now restart your panels/dockies and you should be able to add hamster to your
panel!
+
+
+h1. hamster-applet -> hamster-time-tracker clean up
+
+Previously hamster was installed everywhere under @hamster-applet@. As
+the applet is long gone, the paths and file names have changed to
+@hamster-time-tracker@. To clean up previous install follow these steps:
+
+pre. git checkout d140d45f105d4ca07d4e33bcec1fae30143959fe
+./waf configure build --prefix=/usr
+sudo ./waf uninstall
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hamster-hamster-time-tracker-1.03.3/setup.py
new/hamster-hamster-time-tracker-1.04/setup.py
--- old/hamster-hamster-time-tracker-1.03.3/setup.py 2013-01-18
01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/setup.py 2014-01-10
19:05:26.000000000 +0100
@@ -7,8 +7,8 @@
data_dir = os.path.join(sysconfig.get_python_lib(), "hamster", "data")
setup(name='hamster-sqlite',
- version='0.2',
- description='The sqlite backend of hamster time tracker (can be used as
a good start for any front-end work)',
+ version='0.3',
+ description='Minimal dependency nicely abstracted sqlite backend of
hamster time tracker - lets you connect to your hamster db and do stuff in
python',
author='Toms Baugis',
author_email='toms.bau...@gmail.com',
url='https://github.com/projecthamster/hamster',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hamster-hamster-time-tracker-1.03.3/src/hamster/db.py
new/hamster-hamster-time-tracker-1.04/src/hamster/db.py
--- old/hamster-hamster-time-tracker-1.03.3/src/hamster/db.py 2013-01-18
01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/src/hamster/db.py 2014-01-10
19:05:26.000000000 +0100
@@ -563,7 +563,7 @@
if previous and previous['start_time'] <= start_time:
# check if maybe that is the same one, in that case no need to
restart
if previous["activity_id"] == activity_id \
- and set(previous["tags"]) == set([tag["name"] for tag in
tags]) \
+ and set(previous["tags"]) == set([tag[1] for tag in tags]) \
and (previous["description"] or "") == (fact.description or
""):
return None
@@ -579,7 +579,7 @@
if len(facts) > 1 and 60 >= (start_time -
facts[-2]['end_time']).seconds >= 0:
before = facts[-2]
if before["activity_id"] == activity_id \
- and set(before["tags"]) == set([tag["name"] for tag
in tags]):
+ and set(before["tags"]) == set([tag[1] for tag in
tags]):
# resume and return
update = """
UPDATE facts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hamster-hamster-time-tracker-1.03.3/src/hamster/edit_activity.py
new/hamster-hamster-time-tracker-1.04/src/hamster/edit_activity.py
--- old/hamster-hamster-time-tracker-1.03.3/src/hamster/edit_activity.py
2013-01-18 01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/src/hamster/edit_activity.py
2014-01-10 19:05:26.000000000 +0100
@@ -297,6 +297,8 @@
elif event_key.keyval in (gtk.keysyms.Return, gtk.keysyms.KP_Enter):
if popups:
return False
+ if self.get_widget('description').has_focus():
+ return False
self.on_save_button_clicked(None)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hamster-hamster-time-tracker-1.03.3/src/hamster/external.py
new/hamster-hamster-time-tracker-1.04/src/hamster/external.py
--- old/hamster-hamster-time-tracker-1.03.3/src/hamster/external.py
2013-01-18 01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/src/hamster/external.py
2014-01-10 19:05:26.000000000 +0100
@@ -58,7 +58,7 @@
tasks = []
try:
- tasks = conn.get_tasks()
+ tasks = conn.GetTasks()
except dbus.exceptions.DBusException: #TODO too lame to figure
out how to connect to the disconnect signal
self.__gtg_connection = None
return self.get_activities(query) # reconnect
@@ -77,12 +77,12 @@
def __get_gtg_connection(self):
bus = dbus.SessionBus()
- if self.__gtg_connection and bus.name_has_owner("org.GTG"):
+ if self.__gtg_connection and bus.name_has_owner("org.gnome.GTG"):
return self.__gtg_connection
- if bus.name_has_owner("org.GTG"):
- self.__gtg_connection = dbus.Interface(bus.get_object('org.GTG',
'/org/GTG'),
- dbus_interface='org.GTG')
+ if bus.name_has_owner("org.gnome.GTG"):
+ self.__gtg_connection =
dbus.Interface(bus.get_object('org.gnome.GTG', '/org/gnome/GTG'),
+
dbus_interface='org.gnome.GTG')
return self.__gtg_connection
else:
return None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hamster-hamster-time-tracker-1.03.3/src/hamster/lib/__init__.py
new/hamster-hamster-time-tracker-1.04/src/hamster/lib/__init__.py
--- old/hamster-hamster-time-tracker-1.03.3/src/hamster/lib/__init__.py
2013-01-18 01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/src/hamster/lib/__init__.py
2014-01-10 19:05:26.000000000 +0100
@@ -106,15 +106,15 @@
def __iter__(self):
keys = {
- 'id': int(self.id),
+ 'id': int(self.id) if self.id else "",
'activity': self.activity,
'category': self.category,
'description': self.description,
- 'tags': [tag.encode("utf-8").strip() for tag in
self.tags.split(",")],
- 'date': calendar.timegm(self.date.timetuple()),
+ 'tags': [tag.encode("utf-8").strip() for tag in self.tags],
+ 'date': calendar.timegm(self.date.timetuple()) if self.date else
"",
'start_time': self.start_time if isinstance(self.start_time,
basestring) else calendar.timegm(self.start_time.timetuple()),
'end_time': self.end_time if isinstance(self.end_time, basestring)
else calendar.timegm(self.end_time.timetuple()) if self.end_time else "",
- 'delta': self.delta.seconds + self.delta.days * 24 * 60 * 60
#duration in seconds
+ 'delta': self.delta.seconds + self.delta.days * 24 * 60 * 60 if
self.delta else "" #duration in seconds
}
return iter(keys.items())
@@ -133,7 +133,7 @@
def __str__(self):
time = ""
if self.start_time:
- self.start_time.strftime("%d-%m-%Y %H:%M")
+ time = self.start_time.strftime("%d-%m-%Y %H:%M")
if self.end_time:
time = "%s - %s" % (time, self.end_time.strftime("%H:%M"))
return "%s %s" % (time, self.serialized_name())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hamster-hamster-time-tracker-1.03.3/src/hamster/lib/desktop.py
new/hamster-hamster-time-tracker-1.04/src/hamster/lib/desktop.py
--- old/hamster-hamster-time-tracker-1.03.3/src/hamster/lib/desktop.py
2013-01-18 01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/src/hamster/lib/desktop.py
2014-01-10 19:05:26.000000000 +0100
@@ -32,6 +32,7 @@
class DesktopIntegrations(object):
def __init__(self, storage):
self.storage = storage # can't use client as then we get in a dbus loop
+ self._last_notification = None
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
self.bus = dbus.SessionBus()
@@ -88,15 +89,22 @@
def notify_user(self, summary="", details=""):
- if not hasattr(self, "notification_conn"):
- self._notification_conn =
dbus.Interface(self.bus.get_object('org.freedesktop.Notifications',
-
'/org/freedesktop/Notifications'),
-
dbus_interface='org.freedesktop.Notifications')
+ if not hasattr(self, "_notification_conn"):
+ self._notification_conn = dbus.Interface(self.bus.get_object(
'org.freedesktop.Notifications',
+
'/org/freedesktop/Notifications',
+
follow_name_owner_changes=True),
+
dbus_interface='org.freedesktop.Notifications')
conn = self._notification_conn
- conn.Notify("Project Hamster", 5, "hamster-time-tracker",
- summary, details,
- [], {"urgency": 0}, -1)
+ notification = conn.Notify("Project Hamster",
+ self._last_notification or 0,
+ "hamster-time-tracker",
+ summary,
+ details,
+ [],
+ {"urgency": dbus.Byte(0), "transient" :
True},
+ -1)
+ self._last_notification = notification
def on_idle_changed(self, event, state):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hamster-hamster-time-tracker-1.03.3/src/hamster/storage.py
new/hamster-hamster-time-tracker-1.04/src/hamster/storage.py
--- old/hamster-hamster-time-tracker-1.03.3/src/hamster/storage.py
2013-01-18 01:19:38.000000000 +0100
+++ new/hamster-hamster-time-tracker-1.04/src/hamster/storage.py
2014-01-10 19:05:26.000000000 +0100
@@ -158,7 +158,7 @@
self.tags_changed()
return tags
- def set_tags_autocomplete(self, tags):
+ def update_autocomplete_tags(self, tags):
changes = self.__update_autocomplete_tags(tags)
if changes:
self.tags_changed()
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
