Merge lp:~larsu/gwibber/libmessaging-menu-port into lp:gwibber

[Lars Karlitski]

[lp:~larsu/gwibber/libmessaging-menu-port]

1376. By Lars Karlitski on 2012-08-23

Add "Update Status" shortcut to the messaging menu

[Ken VanDine (ken-vandine)]

I am inclined to approve this, it looks fine however I am seeing some strange behavior. Perhaps it's a just a bug in libmessaging-menu. Should remove_source on the count remove the menu item or make it insensitive? Here's a simple example script:

from gi.repository import MessagingMenu
from gi.repository import GObject
from gi.repository import Gio
from gettext import lgettext as _

def activated (mmapp, source):
    print "%s has been activated" % source
    mmapp.set_source_count(source, 0)
    mmapp.remove_source(source)

if __name__ == "__main__":
    MESSAGES = _("Messages")
    REPLIES = _("Replies")
    PRIVATE = _("Private")
    mmapp = MessagingMenu.App.new ("gwibber.desktop")
    mmapp.register ()
    mmapp.append_source_with_count ("messages", None, MESSAGES, 0)
    mmapp.append_source_with_count ("replies", None, REPLIES, 0)
    mmapp.append_source_with_count ("private", None, PRIVATE, 0)
    mmapp.set_source_count ("messages", 123)
    mmapp.draw_attention ("replies")
    mmapp.connect("activate-source", activated)
    GObject.MainLoop().run()

[Lars Karlitski (larsu)]

What you're seeing is indeed a bug in libmessaging-menu. Gio's g_menu_get_item_attribute doesn't allow '&' in the variant format string anymore. Fix is coming.

By the way, I changed gwibber to not always show all streams in the messaging menu, but only the ones that have new messages. The "old" way of showing all streams all the time doesn't work anymore because libmessaging-menu removes sources as soon as they are activated. Thus, the activate callback calling the mmapp.remove_source in your example is redundant. Sorry that this isn't documented very well yet.

[Ken VanDine (ken-vandine)]

Oh, well is it also a bug that the count isn't getting removed? Is that the same bug that you mentioned?

[Ken VanDine (ken-vandine)]

Looks like all the remaining issues are really bugs in libmessaging-menu, so aprroved. Thanks!

review: Approve

=== modified file 'data/gwibber.desktop.in.in'
--- data/gwibber.desktop.in.in	2011-09-26 18:39:07 +0000
+++ data/gwibber.desktop.in.in	2012-08-23 11:01:38 +0000
@@ -9,3 +9,9 @@
 Categories=GTK;GNOME;Network;
 X-GNOME-Gettext-Domain=gwibber
 X-Ayatana-Appmenu-Show-Stubs=False
+Actions=UpdateStatus
+
+[Desktop Action UpdateStatus]
+Name=Update Status
+Exec=gwibber-poster
+OnlyShowIn=Messaging Menu;

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2012-06-22 17:36:27 +0000
+++ gwibber/microblog/dispatcher.py	2012-08-23 11:01:38 +0000
@@ -35,9 +35,9 @@
   pass
 
 try:
-  from gi.repository import Indicate as indicate
+  from gi.repository import MessagingMenu
 except:
-  indicate = None
+  MessagingMenu = None
 
 GLib.threads_init()
 
@@ -328,41 +328,23 @@
     self.connection_monitor.connect_to_signal("ConnectionOnline", self.on_connection_online)
     self.connection_monitor.connect_to_signal("ConnectionOffline", self.on_connection_offline)
 
-    self.indicator_items = {}
+    self.stream_names = { 'messages': _('Messages'), 'replies': _('Replies'), 'private': _('Private') }
     self.notified_items = []
     self.notified_errors = {}
-    self.messages_indicator = None
-    self.replies_indicator = None
-    self.private_indicator = None
     self.unseen_counts = {}
     for s in "messages", "replies", "private":
       self.unseen_counts[s] = 0
 
-    self.indicate = None 
+    self.mmapp = None
     self.launcher = None
 
     self.job_list = []
 
-    if indicate and util.resources.get_desktop_file():
-      self.indicate = indicate.Server.ref_default ()
-      self.indicate.set_type("message.gwibber")
-      self.indicate.set_desktop_file(util.resources.get_desktop_file())
-      if Dbusmenu and self.indicate:
-        post_menu = Dbusmenu.Menuitem.new ()
-        post_menu.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Update Status"))
-        post_menu.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True)
-        post_menu.connect("item-activated", self.show_poster)
-
-        menu_server = Dbusmenu.Server.new("/messaging/commands")
-        root = Dbusmenu.Menuitem.new ()
-        root.child_append (post_menu)
-        menu_server.set_root(root)
-        self.indicate.set_menu (menu_server)
-      self.indicate.connect("server-display", self.on_indicator_server_activate)
-      self.indicate.connect("interest-added", self.on_indicator_interest_added)
-      self.indicate.connect("interest-removed", self.on_indicator_interest_removed)
-      self.update_indicators(self.unseen_counts)
-      self.indicate.show()
+    if MessagingMenu:
+      self.mmapp = MessagingMenu.App(desktop_id='gwibber.desktop')
+      self.mmapp.register()
+      self.mmapp.connect('activate-source', self.on_messaging_menu_source_activated)
+      self.update_message_sources(self.unseen_counts)
 
     if Unity and Dbusmenu:
       self.launcher = Unity.LauncherEntry.get_for_desktop_id ("gwibber.desktop")
@@ -565,7 +547,7 @@
             service = dbus.Interface(obj, "com.Gwibber.Service")
             service.UpdateIndicators("stream")
     """
-    self.handle_indicator_counts(stream)
+    self.handle_message_source_counts(stream)
 
   @dbus.service.method("com.Gwibber.Service", in_signature="s")
   def SendMessage(self, message):
@@ -702,28 +684,6 @@
     logger.info("Gwibber Service is being shutdown")
     self.mainloop.quit()
 
-  @dbus.service.method("com.Gwibber.Service", out_signature="b")
-  def IndicatorInterestCheck(self):
-    """
-    Check for interest from the messaging menu indicator
-    Returns a boolean
-    example:
-            import dbus
-            obj = dbus.SessionBus().get_object("com.Gwibber.Service", "/com/gwibber/Service")
-            service = dbus.Interface(obj, "com.Gwibber.Service")
-            res = service.IndicatorInterestCheck()
-    """
-    if indicate and self.indicate:
-      return self.indicate.check_interest(indicate.INTEREST_SERVER_DISPLAY)
-    else:
-      return False
-
-  @dbus.service.signal("com.Gwibber.Service")
-  def IndicatorInterestAdded(self): pass
-  
-  @dbus.service.signal("com.Gwibber.Service")
-  def IndicatorInterestRemoved(self): pass
-
   @dbus.service.signal("com.Gwibber.Service", signature="s")
   def Error(self, error): pass
 
@@ -803,7 +763,7 @@
             ",".join(self.messages.columns),
             ",".join("?" * len(self.messages.columns))), items)
 
-      GLib.idle_add (self.update_indicators, self.unseen_counts)
+      GLib.idle_add (self.update_message_sources, self.unseen_counts)
       query = """
               SELECT * FROM messages WHERE rowid > {0} AND
                                      ((operation == "receive" AND to_me = 0) OR
@@ -831,44 +791,18 @@
     self.LoadingComplete()
     logger.info("Loading complete: %s - %s", self.refresh_count, output.rowcount if output.rowcount > 0 else 0)
 
-  def update_indicators(self, counts):
+  def update_message_sources(self, counts):
     total_unseen = 0
-    if indicate:
-      if counts.has_key("messages"):
-        if not self.messages_indicator:
-          self.messages_indicator = indicate.Indicator() if hasattr(indicate, "Indicator") else indicate.IndicatorMessage()
-          self.messages_indicator.connect("user-display", self.on_indicator_activate)
-          self.messages_indicator.set_property("name", _("Messages"))
-          self.messages_indicator.set_property("stream", "messages")
-          self.messages_indicator.show()
-        self.messages_indicator.set_property("count", str(counts["messages"]))
-        total_unseen += counts["messages"]
-        if self.messages_indicator not in self.indicator_items:
-          self.indicator_items["messages"] = self.messages_indicator
-      if counts.has_key("replies"):
-        if not self.replies_indicator:
-          self.replies_indicator = indicate.Indicator() if hasattr(indicate, "Indicator") else indicate.IndicatorMessage()
-          self.replies_indicator.connect("user-display", self.on_indicator_activate)
-          self.replies_indicator.set_property("name", _("Replies"))
-          self.replies_indicator.set_property("stream", "replies")
-          self.replies_indicator.show()
-        self.replies_indicator.set_property("count", str(counts["replies"]))
-        total_unseen += counts["replies"]
-        if self.replies_indicator not in self.indicator_items:
-          self.indicator_items["replies"] = self.replies_indicator
-      if counts.has_key("private"):
-        if not self.private_indicator:
-          self.private_indicator = indicate.Indicator() if hasattr(indicate, "Indicator") else indicate.IndicatorMessage()
-          self.private_indicator.connect("user-display", self.on_indicator_activate)
-          self.private_indicator.set_property("name", _("Private"))
-          self.private_indicator.set_property("stream", "private")
-          self.private_indicator.show()
-        self.private_indicator.set_property("count", str(counts["private"]))
-        total_unseen += counts["private"]
-        if counts["private"] > 0:
-          self.private_indicator.set_property_bool("draw-attention", True)
-        if self.private_indicator not in self.indicator_items:
-          self.indicator_items["private"] = self.private_indicator
+    pos = 0
+    if self.mmapp:
+      for source, name in self.stream_names.iteritems():
+        if counts.has_key(source) and counts[source] > 0:
+          if self.mmapp.has_source(source):
+            self.mmapp.set_source_count(source, counts[source])
+          else:
+            self.mmapp.insert_source_with_count(pos, source, None, name, counts[source])
+        total_unseen += counts[source]
+        pos += 1
     if Unity and self.launcher:
       self.launcher.set_property("count", total_unseen)
       if total_unseen < 1:
@@ -877,28 +811,10 @@
         self.launcher.set_property("count_visible", True)
     return False
 
-  def on_indicator_interest_added(self, server, interest):
-    self.IndicatorInterestAdded()
-
-  def on_indicator_interest_removed(self, server, interest):
-    self.IndicatorInterestRemoved()
-
-  def on_indicator_server_activate(self, indicator, timestamp=None):
-    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-    client_bus = dbus.SessionBus()
-    logger.debug("Raising gwibber client")
-    try:
-      self.handle_indicator_counts()
-    except:
-      pass
-    self.show_client()
-
-  def on_indicator_activate(self, indicator, timestamp=None):
-    if not indicate: return
-    stream = indicator.get_property("stream")
+  def on_messaging_menu_source_activated(self, mmapp, stream):
     logger.debug("Raising gwibber client, focusing %s stream", stream)
     try:
-      self.handle_indicator_counts(stream)
+      self.handle_message_source_counts(stream)
     except:
       pass
     self.show_client(stream=stream)
@@ -909,29 +825,24 @@
   def handle_focus_error(self, *args):
     logger.error("Failed to raise client %s", args)
 
-  def handle_indicator_counts(self, stream=None):
-    if indicate:
+  def handle_message_source_counts(self, stream=None):
+    if self.mmapp:
       if not stream or stream == "home":
-        for s in self.indicator_items.keys():
-          self.indicator_items[s].set_property("count", str(0))
-          self.unseen_counts[s] = 0
-          if s == "private":
-            self.private_indicator.set_property_bool("draw-attention", False)
+        for s in self.stream_names.keys():
+          self.mmapp.remove_source(s)
         if self.launcher:
           self.launcher.set_property("count", 0)
           self.launcher.set_property("count_visible", False)
         return
-      if self.indicator_items.has_key(stream):
-        self.indicator_items[stream].set_property("count", str(0))
-        if stream == "private":
-          self.private_indicator.set_property_bool("draw-attention", False)
+      else:
+        self.mmapp.remove_source(stream)
 
     self.unseen_counts[stream] = 0
     if Unity:
       total_unseen = 0
       for s in self.unseen_counts.keys():
         total_unseen += self.unseen_counts[s]
-      logger.debug ("handle_indicator_counts total_unseen is %d", total_unseen)
+      logger.debug ("handle_message_source_counts total_unseen is %d", total_unseen)
       if self.launcher:
         self.launcher.set_property("count", total_unseen)
         if total_unseen < 1: