fix conflicts

issues/issue-29419930d0857751427cd66cbb7f18dbf6a341c7.yaml

@@ -0,0 +1,18 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: error with python2.5
+desc: with python2.5, there is an error about ".name" in Thread.
+type: :bugfix
+component: pygtk
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 20:01:36.001876 Z
+references: []
+
+id: 29419930d0857751427cd66cbb7f18dbf6a341c7
+log_events: 
+- - 2009-12-22 20:01:44.964221 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - It's "setName()", it seems.

issues/issue-37813b5340d51d6f0ce1920f899231fc8ff1f7bb.yaml

@@ -0,0 +1,22 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: retrieve favourites
+desc: ""
+type: :feature
+component: twitter
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 17:31:26.876484 Z
+references: 
+- pygtk-12
+id: 37813b5340d51d6f0ce1920f899231fc8ff1f7bb
+log_events: 
+- - 2009-12-22 17:31:27.844562 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - ""
+- - 2009-12-22 17:32:31.936245 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - added reference 1
+  - ""

issues/issue-473598ce0e59c10ef110066851c294db49864a4e.yaml

@@ -0,0 +1,20 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: return focus to list after status update
+desc: |-
+  after the user updates their status, return the focus to the list, s
+  less clicking around.
+type: :feature
+component: pygtk
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 12:42:34.952481 Z
+references: []
+
+id: 473598ce0e59c10ef110066851c294db49864a4e
+log_events: 
+- - 2009-12-22 12:42:35.656335 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - ""

issues/issue-713be72c759f03440bcd67127682ebd3702661e7.yaml

@@ -0,0 +1,24 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: make NetworkData a dictionary
+desc: Allow NetworkData to be accessed as a dictionary.
+type: :feature
+component: network
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 12:30:17.804340 Z
+references: 
+- network-3
+id: 713be72c759f03440bcd67127682ebd3702661e7
+log_events: 
+- - 2009-12-22 12:30:53.772236 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - |-
+    This may help with the problem with the prefix for replies (since people can
+    use the %{var}.
+- - 2009-12-22 12:32:16.476249 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - added reference 1
+  - ""

issues/issue-8b9fbefd5cf9f5638d9e54a1538abca58c932c0a.yaml

@@ -0,0 +1,18 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: seems favouriting something doesn't update the statusbar
+desc: title says it all
+type: :bugfix
+component: pygtk
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 12:53:49.180343 Z
+references: []
+
+id: 8b9fbefd5cf9f5638d9e54a1538abca58c932c0a
+log_events: 
+- - 2009-12-22 12:53:50.036343 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - ""

issues/issue-95a69f922a192e8b57715432993a07f0edd92c11.yaml

@@ -7,8 +7,8 @@ type: :bugfix
 component: pygtk
 release: 1.0.0
 reporter: Julio Biason <julio.biason@gmail.com>
-status: :closed
-disposition: :fixed
+status: :unstarted
+disposition: 
 creation_time: 2009-12-21 10:41:32.855458 Z
 references: []
 
@@ -18,7 +18,3 @@ log_events:
   - Julio Biason <julio.biason@gmail.com>
   - created
   - ""
-- - 2009-12-22 07:43:59.725233 Z
-  - Julio Biason <julio.biason@gmail.com>
-  - closed with disposition fixed
-  - ","

issues/issue-c8a150e2683f92b4a9caab10943885e09338d21a.yaml

@@ -0,0 +1,23 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: add a threshold to ask for a new page
+desc: |-
+  Add a config option to set the threshold to request the next page. if the
+  number of messages in the previous request is below this threshold, there
+  is no need to request a new page.
+type: :feature
+component: twitter
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 19:07:09.084361 Z
+references: []
+
+id: c8a150e2683f92b4a9caab10943885e09338d21a
+log_events: 
+- - 2009-12-22 19:07:30.200262 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - |-
+    I think 5 would be a good default threshold. 10 may also be good (50% of the
+    default page, but we never know.)

issues/issue-de26ded9beb48644ce9c18e6cd531333a723b812.yaml

@@ -0,0 +1,22 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: message url
+desc: return the direct url for a message.
+type: :feature
+component: network
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 12:36:09.292341 Z
+references: 
+- pygtk-12
+id: de26ded9beb48644ce9c18e6cd531333a723b812
+log_events: 
+- - 2009-12-22 12:36:09.880242 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - ""
+- - 2009-12-22 12:37:19.984250 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - added reference 1
+  - ""

issues/issue-f765c17cfc7491492564797ce7612053453eea8c.yaml

@@ -0,0 +1,20 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: need prefix for replies
+desc: |-
+  when people reply, some networks add a message as prefix (as do twitter with
+  @username). we need something to make networks return that.
+type: :feature
+component: network
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 12:31:41.160379 Z
+references: []
+
+id: f765c17cfc7491492564797ce7612053453eea8c
+log_events: 
+- - 2009-12-22 12:31:41.768238 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - ""

issues/issue-fc295a72e8c2767cc17ac76830e1286430c77d48.yaml

@@ -0,0 +1,22 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: ask network for prefixes on replies
+desc: when user starts a reply, ask the network for the prefix for the reply.
+type: :feature
+component: pygtk
+release: 1.0.0
+reporter: Julio Biason <julio.biason@gmail.com>
+status: :unstarted
+disposition: 
+creation_time: 2009-12-22 12:33:43.272350 Z
+references: 
+- network-2
+id: fc295a72e8c2767cc17ac76830e1286430c77d48
+log_events: 
+- - 2009-12-22 12:33:43.864262 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - created
+  - ""
+- - 2009-12-22 12:34:03.380687 Z
+  - Julio Biason <julio.biason@gmail.com>
+  - added reference 1
+  - ""

mitterlib/ui/ui_pygtk.py

@@ -552,16 +552,6 @@ class Interface(object):
 
         data = store.get_value(position, 0)
         pic = data.avatar
-        if not pic in self._avatars:
-            # set the user avatar to the default image, so it won't get queued
-            # again. Once downloaded, the _post_download_pic will update the
-            # image and force a redraw.
-            self._avatars[pic] = self._images['avatar']
-            self._threads.add_work(self._post_download_pic,
-                    self._exception_download_pic,
-                    self._download_pic,
-                    pic)
-
         cell.set_property('pixbuf', self._avatars[pic])
 
         return
@@ -1056,6 +1046,17 @@ class Interface(object):
         for message in results:
             _log.debug('Data: %s', str(message))
             message.read = False
+            pic = message.avatar
+            if not pic in self._avatars:
+                # set the user avatar to the default image, so it won't get
+                # queued again. Once downloaded, the _post_download_pic will
+                # update the image and force a redraw.
+                self._avatars[pic] = self._images['avatar']
+                self._threads.add_work(self._post_download_pic,
+                        self._exception_download_pic,
+                        self._download_pic,
+                        pic)
+
             store.prepend([message])
         store.sort_column_changed()
         self._grid.queue_draw()