Attachment #109889 for bug #150948

View | Details | Raw Unified | Return to bug 150948
Collapse All | Expand All

Lines 8-14 Link Here

(-)hamster-applet/Makefile (-1 / +1 lines)
8		8
9	PORTNAME= hamster-applet	9	PORTNAME= hamster-applet
10	PORTVERSION= 2.30.2	10	PORTVERSION= 2.30.2
11	PORTREVISION= 1	11	PORTREVISION= 2
12	CATEGORIES= deskutils gnome	12	CATEGORIES= deskutils gnome
13	MASTER_SITES= GNOME	13	MASTER_SITES= GNOME
14	DIST_SUBDIR= gnome2	14	DIST_SUBDIR= gnome2




--- src/hamster/widgets/activityentry.py	2010-06-22 13:59:09.000000000 +0400
+++ src/hamster/widgets/activityentry.py	2010-09-26 01:29:25.000000000 +0400
@@ -20,10 +20,10 @@
 import gtk, gobject
 import datetime as dt
 
-from .hamster.configuration import runtime
+from hamster.configuration import runtime
 
-from .hamster import stuff
-from .hamster.stuff import format_duration
+from hamster import stuff
+from hamster.stuff import format_duration
 
 class ActivityEntry(gtk.Entry):
     __gsignals__ = {

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_dateinput.py (+11 lines)
	1	--- src/hamster/widgets/dateinput.py 2010-06-04 20:53:24.000000000 +0400
	2	+++ src/hamster/widgets/dateinput.py 2010-09-26 01:30:30.000000000 +0400
	3	@@ -17,7 +17,7 @@
	4	# You should have received a copy of the GNU General Public License
	5	# along with Project Hamster. If not, see <http://www.gnu.org/licenses/>.
	6
	7	-from .hamster.stuff import format_duration
	8	+from hamster.stuff import format_duration
	9	import gtk
	10	import datetime as dt
	11	import calendar




--- src/hamster/widgets/dayline.py	2010-06-22 13:59:09.000000000 +0400
+++ src/hamster/widgets/dayline.py	2010-09-26 01:31:11.000000000 +0400
@@ -20,8 +20,8 @@
 import gtk
 import gobject
 
-from .hamster import stuff
-from .hamster import graphics
+from hamster import stuff
+from hamster import graphics
 
 import time
 import datetime as dt




--- src/hamster/widgets/facttree.py	2010-06-22 13:59:09.000000000 +0400
+++ src/hamster/widgets/facttree.py	2010-09-26 01:31:57.000000000 +0400
@@ -20,8 +20,8 @@
 import gtk, gobject
 import datetime as dt
 
-from .hamster import stuff
-from .hamster.stuff import format_duration, format_activity
+from hamster import stuff
+from hamster.stuff import format_duration, format_activity
 from tags import Tag
 
 import pango




--- src/hamster/widgets/tags.py	2010-06-22 13:59:09.000000000 +0400
+++ src/hamster/widgets/tags.py	2010-09-26 01:32:32.000000000 +0400
@@ -21,9 +21,9 @@
 import pango, cairo
 from math import pi
 
-from .hamster import graphics
+from hamster import graphics
 
-from .hamster.configuration import runtime
+from hamster.configuration import runtime
 
 class TagsEntry(gtk.Entry):
     __gsignals__ = {

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_timechart.py (+11 lines)
	1	--- src/hamster/widgets/timechart.py 2010-06-22 13:59:09.000000000 +0400
	2	+++ src/hamster/widgets/timechart.py 2010-09-26 01:33:04.000000000 +0400
	3	@@ -20,7 +20,7 @@
	4	import os # for locale
	5	import gtk, pango
	6
	7	-from .hamster import graphics
	8	+from hamster import graphics
	9
	10	import time, datetime as dt
	11	import calendar

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_timeinput.py (+11 lines)
	1	--- src/hamster/widgets/timeinput.py 2010-06-04 20:53:24.000000000 +0400
	2	+++ src/hamster/widgets/timeinput.py 2010-09-26 01:33:38.000000000 +0400
	3	@@ -17,7 +17,7 @@
	4	# You should have received a copy of the GNU General Public License
	5	# along with Project Hamster. If not, see <http://www.gnu.org/licenses/>.
	6
	7	-from .hamster.stuff import format_duration
	8	+from hamster.stuff import format_duration
	9	import gtk
	10	from gtk import keysyms
	11	import datetime as dt




--- src/gnome-time-tracker	2010-06-22 13:59:09.000000000 +0400
+++ src/gnome-time-tracker	2010-09-26 01:52:16.000000000 +0400
@@ -525,7 +525,7 @@
     from hamster import defs
 
     # Setup i18n
     locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-    for module in (gettext, locale):
+    for module in (gettext,):
         module.bindtextdomain('hamster-applet', locale_dir)
         module.textdomain('hamster-applet')
+#    for module in (gettext, locale):
+#        module.bindtextdomain('hamster-applet', locale_dir)
+#        module.textdomain('hamster-applet')
 
-        if hasattr(module, 'bind_textdomain_codeset'):
-            module.bind_textdomain_codeset('hamster-applet','UTF-8')
+#        if hasattr(module, 'bind_textdomain_codeset'):
+#            module.bind_textdomain_codeset('hamster-applet','UTF-8')
 
     gtk.gdk.threads_init()
     app = ProjectHamster()




--- src/hamster-applet.py	2010-06-22 13:59:09.000000000 +0400
+++ src/hamster-applet.py	2010-09-26 01:52:33.000000000 +0400
@@ -96,7 +96,7 @@
         from hamster.configuration import runtime, dialogs
 
         # Setup i18n
         locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-        for module in (gettext, locale):
+        for module in (gettext,):
             module.bindtextdomain('hamster-applet', locale_dir)
             module.textdomain('hamster-applet')
+#        for module in (gettext, locale):
+#            module.bindtextdomain('hamster-applet', locale_dir)
+#            module.textdomain('hamster-applet')
 
-            if hasattr(module, 'bind_textdomain_codeset'):
-                module.bind_textdomain_codeset('hamster-applet','UTF-8')
+#            if hasattr(module, 'bind_textdomain_codeset'):
+#                module.bind_textdomain_codeset('hamster-applet','UTF-8')
 
         gtk.window_set_default_icon_name("hamster-applet")
 




--- src/hamster-standalone	2010-06-22 13:59:09.000000000 +0400
+++ src/hamster-standalone	2010-09-26 01:52:50.000000000 +0400
@@ -525,7 +525,7 @@
     from hamster import defs
 
     # Setup i18n
     locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-    for module in (gettext, locale):
+    for module in (gettext,):
         module.bindtextdomain('hamster-applet', locale_dir)
         module.textdomain('hamster-applet')
+#    for module in (gettext, locale):
+#        module.bindtextdomain('hamster-applet', locale_dir)
+#        module.textdomain('hamster-applet')
 
-        if hasattr(module, 'bind_textdomain_codeset'):
-            module.bind_textdomain_codeset('hamster-applet','UTF-8')
+#        if hasattr(module, 'bind_textdomain_codeset'):
+#            module.bind_textdomain_codeset('hamster-applet','UTF-8')
 
     gtk.gdk.threads_init()
     app = ProjectHamster()

Return to bug 150948

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_activityentry.py (+16 lines)
	1	--- src/hamster/widgets/activityentry.py 2010-06-22 13:59:09.000000000 +0400
	2	+++ src/hamster/widgets/activityentry.py 2010-09-26 01:29:25.000000000 +0400
	3	@@ -20,10 +20,10 @@
	4	import gtk, gobject
	5	import datetime as dt
	6
	7	-from .hamster.configuration import runtime
	8	+from hamster.configuration import runtime
	9
	10	-from .hamster import stuff
	11	-from .hamster.stuff import format_duration
	12	+from hamster import stuff
	13	+from hamster.stuff import format_duration
	14
	15	class ActivityEntry(gtk.Entry):
	16	__gsignals__ = {

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_dayline.py (+13 lines)
	1	--- src/hamster/widgets/dayline.py 2010-06-22 13:59:09.000000000 +0400
	2	+++ src/hamster/widgets/dayline.py 2010-09-26 01:31:11.000000000 +0400
	3	@@ -20,8 +20,8 @@
	4	import gtk
	5	import gobject
	6
	7	-from .hamster import stuff
	8	-from .hamster import graphics
	9	+from hamster import stuff
	10	+from hamster import graphics
	11
	12	import time
	13	import datetime as dt

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_facttree.py (+13 lines)
	1	--- src/hamster/widgets/facttree.py 2010-06-22 13:59:09.000000000 +0400
	2	+++ src/hamster/widgets/facttree.py 2010-09-26 01:31:57.000000000 +0400
	3	@@ -20,8 +20,8 @@
	4	import gtk, gobject
	5	import datetime as dt
	6
	7	-from .hamster import stuff
	8	-from .hamster.stuff import format_duration, format_activity
	9	+from hamster import stuff
	10	+from hamster.stuff import format_duration, format_activity
	11	from tags import Tag
	12
	13	import pango

Line 0 Link Here

(-)hamster-applet/files/patch-src-hamster-widgets_tags.py (+14 lines)
	1	--- src/hamster/widgets/tags.py 2010-06-22 13:59:09.000000000 +0400
	2	+++ src/hamster/widgets/tags.py 2010-09-26 01:32:32.000000000 +0400
	3	@@ -21,9 +21,9 @@
	4	import pango, cairo
	5	from math import pi
	6
	7	-from .hamster import graphics
	8	+from hamster import graphics
	9
	10	-from .hamster.configuration import runtime
	11	+from hamster.configuration import runtime
	12
	13	class TagsEntry(gtk.Entry):
	14	__gsignals__ = {

Lines 1-22 Link Here

(-)hamster-applet/files/patch-src_gnome-time-tracker (-18 / +7 lines)
1	--- src/gnome-time-tracker.orig 2010-06-24 16:14:42.000000000 -0500	1	--- src/gnome-time-tracker 2010-06-22 13:59:09.000000000 +0400
2	+++ src/gnome-time-tracker 2010-06-24 16:15:22.000000000 -0500	2	+++ src/gnome-time-tracker 2010-09-26 01:52:16.000000000 +0400
3	@@ -524,13 +524,13 @@	3	@@ -525,7 +525,7 @@
4	from hamster import defs
5		4
6	# Setup i18n	5	# Setup i18n
7	- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))	6	locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
8	- for module in (gettext, locale):	7	- for module in (gettext, locale):
9	- module.bindtextdomain('hamster-applet', locale_dir)	8	+ for module in (gettext,):
10	- module.textdomain('hamster-applet')	9	module.bindtextdomain('hamster-applet', locale_dir)
11	+# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))	10	module.textdomain('hamster-applet')
12	+# for module in (gettext, locale):
13	+# module.bindtextdomain('hamster-applet', locale_dir)
14	+# module.textdomain('hamster-applet')
15		11
16	- if hasattr(module, 'bind_textdomain_codeset'):
17	- module.bind_textdomain_codeset('hamster-applet','UTF-8')
18	+# if hasattr(module, 'bind_textdomain_codeset'):
19	+# module.bind_textdomain_codeset('hamster-applet','UTF-8')
20
21	gtk.gdk.threads_init()
22	app = ProjectHamster()

Lines 1-22 Link Here

(-)hamster-applet/files/patch-src_hamster-applet.py (-18 / +7 lines)
1	--- src/hamster-applet.py.orig 2010-01-29 17:37:34.000000000 +0800	1	--- src/hamster-applet.py 2010-06-22 13:59:09.000000000 +0400
2	+++ src/hamster-applet.py 2010-01-29 17:38:21.000000000 +0800	2	+++ src/hamster-applet.py 2010-09-26 01:52:33.000000000 +0400
3	@@ -95,13 +95,13 @@ if __name__ == "__main__":	3	@@ -96,7 +96,7 @@
4	from hamster.configuration import runtime, dialogs
5		4
6	# Setup i18n	5	# Setup i18n
7	- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))	6	locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
8	- for module in (gettext, locale):	7	- for module in (gettext, locale):
9	- module.bindtextdomain('hamster-applet', locale_dir)	8	+ for module in (gettext,):
10	- module.textdomain('hamster-applet')	9	module.bindtextdomain('hamster-applet', locale_dir)
11	+# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))	10	module.textdomain('hamster-applet')
12	+# for module in (gettext, locale):
13	+# module.bindtextdomain('hamster-applet', locale_dir)
14	+# module.textdomain('hamster-applet')
15
16	- if hasattr(module, 'bind_textdomain_codeset'):
17	- module.bind_textdomain_codeset('hamster-applet','UTF-8')
18	+# if hasattr(module, 'bind_textdomain_codeset'):
19	+# module.bind_textdomain_codeset('hamster-applet','UTF-8')
20
21	gtk.window_set_default_icon_name("hamster-applet")
22		11

Lines 1-22 Link Here

(-)hamster-applet/files/patch-src_hamster-standalone (-18 / +7 lines)
1	--- src/hamster-standalone.orig 2010-06-24 16:14:54.000000000 -0500	1	--- src/hamster-standalone 2010-06-22 13:59:09.000000000 +0400
2	+++ src/hamster-standalone 2010-06-24 16:15:43.000000000 -0500	2	+++ src/hamster-standalone 2010-09-26 01:52:50.000000000 +0400
3	@@ -524,13 +524,13 @@	3	@@ -525,7 +525,7 @@
4	from hamster import defs
5		4
6	# Setup i18n	5	# Setup i18n
7	- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))	6	locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
8	- for module in (gettext, locale):	7	- for module in (gettext, locale):
9	- module.bindtextdomain('hamster-applet', locale_dir)	8	+ for module in (gettext,):
10	- module.textdomain('hamster-applet')	9	module.bindtextdomain('hamster-applet', locale_dir)
11	+# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))	10	module.textdomain('hamster-applet')
12	+# for module in (gettext, locale):
13	+# module.bindtextdomain('hamster-applet', locale_dir)
14	+# module.textdomain('hamster-applet')
15		11
16	- if hasattr(module, 'bind_textdomain_codeset'):
17	- module.bind_textdomain_codeset('hamster-applet','UTF-8')
18	+# if hasattr(module, 'bind_textdomain_codeset'):
19	+# module.bind_textdomain_codeset('hamster-applet','UTF-8')
20
21	gtk.gdk.threads_init()
22	app = ProjectHamster()