4 files changed, 31 insertions, 28 deletions

diff --git a/net/straw/files/patch-setup.py b/net/straw/files/patch-setup.py
index 88b4df8f5290..d0bada9d00a6 100644
--- a/net/straw/files/patch-setup.py
+++ b/net/straw/files/patch-setup.py
@@ -1,24 +1,25 @@
---- setup.py.orig	Mon Apr 26 12:17:31 2004
-+++ setup.py	Thu May 20 13:41:56 2004
-@@ -97,8 +97,8 @@
+--- setup.py.orig	Thu Jul 15 15:15:58 2004
++++ setup.py	Mon Aug 16 22:15:09 2004
+@@ -108,8 +108,8 @@
      '''Build list of data files to be installed'''
      images = glob.glob('images/*.png')
      files = [
 -        ('share/pixmaps', ['images/straw.png']),
--        ('share/straw', images + ['data/default_subscriptions.opml', 'glade/straw.glade'])]
+-        ('share/straw', images + ['data/default_subscriptions.opml', 'data/straw.css', 'glade/straw.glade'])]
 +        ('share/gnome/pixmaps', ['images/straw.png']),
-+        ('share/gnome/straw', images + ['data/default_subscriptions.opml', 'glade/straw.glade'])]
++        ('share/gnome/straw', images + ['data/default_subscriptions.opml', 'data/straw.css', 'glade/straw.glade'])]
      return files
  
  long_desc = '''\
-@@ -121,9 +121,8 @@
-       config_files     = [('gconf/schemas',['data/straw.schemas'],
-                            'with-gconf-schema-file-dir')],
+@@ -137,10 +137,9 @@
+       #config_files     = [('gconf/schemas',['data/straw.schemas'],
+       #                     'with-gconf-schema-file-dir')],
        scripts          = ['src/straw'],
 -      modules_check    = modules_check,
        packages         = ['straw'],
        package_dir      = {'straw' : 'src/lib'},
 -      msg_sources      = translation_files(),
 +      msg_sources      = ['glade/strings.c'] + glob.glob('src/lib/*.py'),
-       desktop_file     = ['straw.desktop.in'])
- 
+       desktop_file     = ['straw.desktop.in'],
+       ext_modules      = [TemplateExtension(name='trayicon',
+                                             pkc_name='pygtk-2.0 gtk+-2.0',
diff --git a/net/straw/files/patch-src::lib::Config.py b/net/straw/files/patch-src::lib::Config.py
new file mode 100644
index 000000000000..a5c3debd01c3
--- /dev/null
+++ b/net/straw/files/patch-src::lib::Config.py
@@ -0,0 +1,11 @@
+--- src/lib/Config.py.orig	Tue Aug 24 02:19:12 2004
++++ src/lib/Config.py	Tue Aug 24 02:20:06 2004
+@@ -369,6 +369,8 @@
+     last_poll = property(get_last_poll, set_last_poll, doc="Last polled")
+ 
+     def get_number_of_items_stored(self):
++        if self._items_stored == 0:
++            return 30
+         return self._items_stored
+ 
+     def set_number_of_items_stored(self, num=30):
diff --git a/net/straw/files/patch-src::lib::LookupManager.py b/net/straw/files/patch-src::lib::LookupManager.py
index 72ab3b8fc82e..abcb576da64b 100644
--- a/net/straw/files/patch-src::lib::LookupManager.py
+++ b/net/straw/files/patch-src::lib::LookupManager.py
@@ -1,14 +1,14 @@
---- src/lib/LookupManager.py.orig	Thu Nov 13 23:37:03 2003
-+++ src/lib/LookupManager.py	Thu Nov 13 23:38:28 2003
-@@ -6,9 +6,9 @@
- from error import log
+--- src/lib/LookupManager.py.orig	Thu Jul 15 15:15:58 2004
++++ src/lib/LookupManager.py	Mon Aug 16 22:20:25 2004
+@@ -5,9 +5,9 @@
+ import Config
  try:
      import adns, ADNS
 -    _have_adns = True
 +    _have_adns = False
  except ImportError:
--    log("No ADNS library found, using synchronous name lookups.")
-+    #log("No ADNS library found, using synchronous name lookups.")
+-    error.log("No ADNS library found, using synchronous name lookups.")
++#    error.log("No ADNS library found, using synchronous name lookups.")
      _have_adns = False
  
  MAX_TIMES = 3
diff --git a/net/straw/files/patch-src::lib::Main.py b/net/straw/files/patch-src::lib::utils.py
index 7aec1cb9f214..b3eb80979c25 100644
--- a/net/straw/files/patch-src::lib::Main.py
+++ b/net/straw/files/patch-src::lib::utils.py
@@ -1,15 +1,6 @@
---- src/lib/Main.py.orig	Mon Apr 26 12:17:31 2004
-+++ src/lib/Main.py	Sun May  2 15:30:14 2004
-@@ -417,7 +417,7 @@
-         gtk.main()
- 
-     def quit(self):
--        gtk.mainquit()
-+        gtk.main_quit()
-         self._itemstore.stop()
-         return
- 
-@@ -480,7 +480,7 @@
+--- src/lib/utils.py.orig	Thu Jul 15 15:15:58 2004
++++ src/lib/utils.py	Mon Aug 16 22:26:08 2004
+@@ -162,7 +162,7 @@
          return os.environ["STRAW_DATA"]
      h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
      if t == 'bin':