← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gwibber/maverick-updates

« back to all changes in this revision

Viewing changes to gwibber/client.py

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2010-11-09 14:06:05 UTC
  • mfrom: (0.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20101109140605-612kiws7snsb4t88
Tags: 2.32.1-0ubuntu1
https://launchpad.net/bugs/673161
https://launchpad.net/bugs/643487
https://launchpad.net/bugs/661330
https://launchpad.net/bugs/661358
https://launchpad.net/bugs/661359
* New upstream release (LP: #673161)
  - Backported fix for clearing multi-column streams when activated by
    the messaging indicator (LP: #643487)
  - Save window size/position when it changes, so it doesn't get moved
    unexpectedly when activated by the messaging indicator
  - Fixed dupe notifications as well as displaying dupes in the stream
  - Shouldn't display reply icon for messages from you (LP: #661330)
  - Private messages shouldn't allow public replies (LP: #661358)
  - Private messages shouldn't allow retweets (LP: #661359)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gwibber/client.py
103
103
    gobject.idle_add(lambda: self.resize(*self.model.settings["window_size"]))
104
104
    gobject.idle_add(lambda: self.move(*self.model.settings["window_position"]))
105
105
 
 
106
    self.connect("configure-event", self.on_configure_event)
 
107
 
 
108
  def on_configure_event(self, *args):
 
109
    self.save_window_settings()
 
110
 
106
111
  def on_indicator_interest_added(self):
107
112
    # Hide the notification area icon if there is interest from the 
108
113
    # messaging menu indicator
450
455
    def perform_action(mi, act, widget, msg): act(widget, self, msg)
451
456
 
452
457
    for a in actions.MENU_ITEMS:
 
458
      if a.action.__self__.__name__ == "private" and msg["sender"].get("is_me", 0):
 
459
        continue
 
460
 
453
461
      if a.include(self, msg):
454
462
        image = gtk.image_new_from_icon_name(a.icon, gtk.ICON_SIZE_MENU)
455
463
        mi = gtk.ImageMenuItem()
560
568
    self.w.present_with_time(int(time.mktime(datetime.datetime.now().timetuple())))
561
569
    self.w.move(*self.w.model.settings["window_position"])
562
570
    stream = {'account': None, 'stream': 'replies', 'transient': False}
563
 
    self.w.stream_view.set_state([stream])
 
571
    if isinstance(self.w.stream_view, gwui.MultiStreamUi):
 
572
      streams = self.w.stream_view.get_state()
 
573
      if stream["stream"] not in str(streams):
 
574
        streams.append(stream)
 
575
        self.w.stream_view.set_state(streams)
 
576
    else:
 
577
      self.w.stream_view.set_state([stream])
 
578
 
564
579
 
565
580
  @dbus.service.method("com.GwibberClient")
566
581
  def list(self):