From fd31ecc0bf3c39cb572ced91afb853adfa84f8f0 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 26 Oct 2009 11:19:44 -0400 Subject: [PATCH 1/5] Minor problem with rogue merge info in HHC.py. --- pyfpdb/HandHistoryConverter.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 7e10e66a..0642d845 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -1,8 +1,5 @@ #!/usr/bin/python -<<<<<<< HEAD:pyfpdb/HandHistoryConverter.py # -*- coding: utf-8 -*- -======= ->>>>>>> 1efdd7fc68d3c9ce013f4d42730bece8075e2272:pyfpdb/HandHistoryConverter.py #Copyright 2008 Carl Gherardi #This program is free software: you can redistribute it and/or modify From 3435cb106e5861a560de5f73c9f3636d4a3bd50b Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Mon, 26 Oct 2009 17:49:37 +0200 Subject: [PATCH 2/5] Bump version to 0.12 in packaging --- packaging/debian/changelog | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index ce102bf5..ec66f4a7 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +free-poker-tools (0.12-1) unstable; urgency=low + + * New release + + -- Mika Bostrom Mon, 26 Oct 2009 17:49:07 +0200 + free-poker-tools (0.11.3+git20091023) unstable; urgency=low * Snapshot release diff --git a/setup.py b/setup.py index 0ba21bf0..689191bd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from distutils.core import setup setup(name = 'fpdb', description = 'Free Poker Database', - version = '0.11.3', + version = '0.12', author = 'FPDB team', author_email = 'fpdb-main@lists.sourceforge.net', packages = ['fpdb'], From 0ac559a2db1f6475f4d0414b1d524dd323d1d3be Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 26 Oct 2009 16:50:17 -0400 Subject: [PATCH 3/5] Add a comment to a comment. --- pyfpdb/HUD_main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py index 021d1ff2..a0f152b7 100755 --- a/pyfpdb/HUD_main.py +++ b/pyfpdb/HUD_main.py @@ -128,6 +128,9 @@ class HUD_main(object): gtk.gdk.threads_enter() try: # TODO: seriously need to decrease the scope of this block.. what are we expecting to error? + # TODO: The purpose of this try/finally block is to make darn sure that threads_leave() + # TODO: gets called. If there is an exception and threads_leave() doesn't get called we + # TODO: lock up. REB newlabel = gtk.Label("%s - %s" % (table.site, table_name)) self.vb.add(newlabel) newlabel.show() From e25e4cf9b3c92113396bfff39703b43f522140c3 Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Tue, 27 Oct 2009 15:24:49 +0200 Subject: [PATCH 4/5] Use custom tray icon instead of GTK stock Use the "Anonymous Cards" image from openclipart.org (http://openclipart.org/media/files/Anonymous/12230) This same image is used in other new FPDB icons, but the combinations with looking-glass don't look good in systray. This icon is plain enough to work properly even when scaled really small. --- gfx/fpdb-cards.png | Bin 0 -> 3711 bytes pyfpdb/fpdb.py | 7 ++++++- setup.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 gfx/fpdb-cards.png diff --git a/gfx/fpdb-cards.png b/gfx/fpdb-cards.png new file mode 100644 index 0000000000000000000000000000000000000000..4d14be623637d200a58c0011f9076bc7c843a3df GIT binary patch literal 3711 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 Date: Tue, 27 Oct 2009 15:28:11 +0200 Subject: [PATCH 5/5] Typofix in status icon load --- pyfpdb/fpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index c3d7e399..5370bccb 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -628,7 +628,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt") self.statusIcon = gtk.StatusIcon() if os.path.exists('../gfx/fpdb-cards.png'): self.statusIcon.set_from_file('../gfx/fpdb-cards.png') - elif os.path.exits('/usr/share/pixmaps/fpdb-cards.png'): + elif os.path.exists('/usr/share/pixmaps/fpdb-cards.png'): self.statusIcon.set_from_file('/usr/share/pixmaps/fpdb-cards.png') else: self.statusIcon.set_from_stock(gtk.STOCK_HOME)