Merge lp:~larsu/thunderbird/libmessaging-menu-port into lp:thunderbird/3.3

[Lars Karlitski]

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

690. By Lars Karlitski on 2012-08-23

Make "Contacts" and "Compose" actions show up in the messaging menu

[Chris Coulson (chrisccoulson)]

Thanks for working on this. Note that the actual addon is maintained at lp:messagingmenu-extension, so I've merged that work there (and then in to the Thunderbird packaging).

I've merged the desktop file fix separately as well.

Thanks!

review: Approve

=== modified file 'debian/messagingmenu/modules/MessagingMenu.jsm'
--- debian/messagingmenu/modules/MessagingMenu.jsm	2012-02-16 17:38:02 +0000
+++ debian/messagingmenu/modules/MessagingMenu.jsm	2012-08-23 20:00:25 +0000
@@ -52,8 +52,7 @@
 Cu.import("resource:///modules/iteratorUtils.jsm");
 Cu.import("resource://messagingmenu/glib.jsm");
 Cu.import("resource://messagingmenu/gobject.jsm");
-Cu.import("resource://messagingmenu/dbusmenu.jsm");
-Cu.import("resource://messagingmenu/indicate.jsm");
+Cu.import("resource://messagingmenu/messagingmenu.jsm");
 Cu.import("resource://messagingmenu/unity.jsm");
 Cu.import("resource://messagingmenu/msgHdrUtils.jsm");
 
@@ -80,8 +79,6 @@
 const FOLDER_URL_KEY                    = "url";
 const USER_SHARE_APPLICATIONS           = "/usr/share/applications/";
 const SYSTEM_LAUNCHER_ENTRIES           = "/usr/share/indicators/messages/applications/";
-const USER_LAUNCHER_ENTRIES             = ".config/indicators/messages/applications/";
-const USER_BLACKLIST_ENTRIES            = ".config/indicators/messages/applications-blacklist/";
 const MAX_INDICATORS                    = 6;
 const ADDON_ID                          = "[e-mail]";
 const PREF_ROOT                         = "extensions.messagingmenu.";
@@ -95,10 +92,7 @@
 const PREF_ACCOUNTS                     = "mail.accountmanager.accounts";
 const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
 
-var open3PaneCallback;
-var contactsCallback;
-var composerCallback;
-var clickIndicatorCallback;
+var sourceActivatedCallback;
 
 function injectTimestamp(aTimestamp) {
   let atts = new gdk.GdkWindowAttributes;
@@ -138,34 +132,8 @@
   }
 }
 
-function openAndFocus3Pane(aInstance, aTimestamp, aUserData) {
-  LOG("Opening 3pane");
-  openWindowByType("mail:3pane",
-                   "chrome://messenger/content/messenger.xul",
-                   aTimestamp);
-}
-
-function openAndFocusAddressBook(aInstance, aTimestamp, aUserData) {
-  LOG("Opening addressbook");
-  openWindowByType("mail:addressbook",
-                   "chrome://messenger/content/addressbook/addressbook.xul",
-                   aTimestamp);
-}
-
-function openAndFocusComposer(aInstance, aTimestamp, aUserData) {
-  LOG("Opening composer");
-  injectTimestamp(aTimestamp);
-  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"]
-           .getService(Ci.nsIWindowWatcher);
-  if (ww) {
-    ww.openWindow(null, "chrome://messenger/content/messengercompose/messengercompose.xul",
-                  "_blank", "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar", null);
-  }
-}
-
-function onClickIndicator(aInstance, aTimestamp, aUserData) {
-  let indicator = ctypes.cast(aInstance, indicate.Indicator.ptr);
-  let folderURL = indicate.indicate_indicator_get_property(indicator, FOLDER_URL_KEY).readString();
+function onSourceActivated(aInstance, aSourceId, aUserData) {
+  let folderURL = aSourceId.readString();
   LOG("Received click event on indicator for folder " + folderURL);
 
   let indicatorEntry = MessagingMenuEngine.mIndicators[folderURL];
@@ -174,9 +142,6 @@
     return;
   }
 
-  // Hide the indicator
-  MessagingMenuEngine.hideIndicator(indicatorEntry);
-
   var msg = MessagingMenuEngine.messenger.msgHdrFromURI(indicatorEntry.messageURL);
   if(!msg) {
     WARN("Invalid message URI " + indicatorEntry.messageURL);
@@ -184,7 +149,9 @@
   }
 
   // Focus 3pane
-  openAndFocus3Pane(aInstance, aTimestamp, aUserData);
+  LOG("Opening 3pane");
+  openWindowByType("mail:3pane",
+                   "chrome://messenger/content/messenger.xul")
   let win = null;
   let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
            .getService(Ci.nsIWindowMediator);
@@ -490,37 +457,17 @@
 function MMIndicatorEntry (aFolder) {
   LOG("Creating indicator for folder " + aFolder.folderURL);
   this.folder = aFolder;
-  this.indicator = indicate.indicate_indicator_new();
   this.refreshLabel();
   this.newCount = 0;
   this.dateInSeconds = 0;
   this.cancelAttention();
   this.hide();
 
-  gobject.g_signal_connect(this.indicator, "user-display",
-                           clickIndicatorCallback, null);
-
-  indicate.indicate_indicator_set_property(this.indicator,
-                                           FOLDER_URL_KEY,
-                                           aFolder.folderURL);
-
   Services.prefs.addObserver(PREF_ACCOUNTS, this, false);
   MessagingMenuEngine.prefs.addObserver("", this, false);
 }
 
 MMIndicatorEntry.prototype = {
-  get indicator() {
-    if (this._indicator) {
-      return this._indicator;
-    }
-
-    throw "No IndicateIndicator. Have we been destroyed?";
-  },
-
-  set indicator(aIndicator) {
-    this._indicator = aIndicator;
-  },
-
   requestAttention: function MMIE_requestAttention() {
     if (!this.active) {
       WARN("Attempting to request attention for an inactive indicator");
@@ -539,9 +486,7 @@
 
   _requestAttention: function MMIE__requestAttention() {
     LOG("Requesting attention for folder " + this.label);
-    indicate.indicate_indicator_set_property(this.indicator,
-                                             indicate.INDICATOR_MESSAGES_PROP_ATTENTION,
-                                             "true");
+    messagingmenu.messaging_menu_app_draw_attention(MessagingMenuEngine.mmapp, this.folder.folderURL);
   },
 
   cancelAttention: function MMIE_cancelAttention() {
@@ -551,16 +496,11 @@
   },
 
   _cancelAttention: function MMIE__cancelAttention() {
-    indicate.indicate_indicator_set_property(this.indicator,
-                                             indicate.INDICATOR_MESSAGES_PROP_ATTENTION,
-                                             "false");
+    messagingmenu.messaging_menu_app_remove_attention(MessagingMenuEngine.mmapp, this.folder.folderURL);
   },
 
   set label(aName) {
     LOG("Setting label for folder " + this.folder.folderURL + " to " + aName);
-    indicate.indicate_indicator_set_property(this.indicator,
-                                             indicate.INDICATOR_MESSAGES_PROP_NAME,
-                                             aName);
     this._label = aName;
   },
 
@@ -571,10 +511,17 @@
   set newCount(aCount) {
     LOG("Setting unread count for folder " + this.label +
         " to " + aCount.toString());
-    indicate.indicate_indicator_set_property(this.indicator,
-                                             indicate.INDICATOR_MESSAGES_PROP_COUNT,
-                                             aCount.toString());
     this._newCount = aCount;
+    if (aCount == 0) {
+      this.hide();
+    }
+    else if (this.visible) {
+      messagingmenu.messaging_menu_app_set_source_count(MessagingMenuEngine.mmapp, this.folder.folderURL, aCount);
+    }
+    else {
+      messagingmenu.messaging_menu_app_append_source_with_count(
+          MessagingMenuEngine.mmapp, this.folder.folderURL, null, this.label, aCount);
+    }
   },
 
   get newCount() {
@@ -592,7 +539,10 @@
     }
 
     LOG("Showing indicator for folder " + this.label);
-    indicate.indicate_indicator_show(this.indicator);
+    if (!this.visible) {
+      messagingmenu.messaging_menu_app_append_source_with_count(
+          MessagingMenuEngine.mmapp, this.folder.folderURL, null, this.label, this.newCount);
+    }
 
     // Ensure we really request attention now we are being made visible
     if (this._attention)
@@ -601,14 +551,11 @@
 
   hide: function MMIE_hide() {
     LOG("Hiding indicator for folder " + this.label);
-    indicate.indicate_indicator_hide(this.indicator);
-
-    // Cancel our request for attention whilst we are hidden
-    this._cancelAttention();
+    messagingmenu.messaging_menu_app_remove_source(MessagingMenuEngine.mmapp, this.folder.folderURL);
   },
 
   get visible() {
-    return indicate.indicate_indicator_is_visible(this.indicator) != 0;
+    return messagingmenu.messaging_menu_app_has_source(MessagingMenuEngine.mmapp, this.folder.folderURL) != 0;
   },
 
   get priority() {
@@ -760,85 +707,29 @@
     return this._prefs;
   },
 
-  get indicateServer() {
-    if (this._indicateServer)
-      return this._indicateServer;
-
-    let indicateServer = indicate.indicate_server_ref_default();
-    indicate.indicate_server_set_type(indicateServer, "message.email");
-    indicate.indicate_server_set_desktop_file(indicateServer, 
-                                              this.desktopFile);
-
-    let serverDisplayCB = ctypes.FunctionType(ctypes.default_abi,
-                                              ctypes.void_t,
-                                              [glib.gpointer,
-                                               glib.guint,
-                                               glib.gpointer]).ptr;
-    open3PaneCallback = serverDisplayCB(openAndFocus3Pane);
-
-    gobject.g_signal_connect(indicateServer, "server-display",
-                             open3PaneCallback, null);
-
-    let bundle = Services.strings.createBundle(
-                  "chrome://messagingmenu/locale/messagingmenu.properties");
-
-    let server = dbusmenu.dbusmenu_server_new("/messaging/commands");
-    let root = dbusmenu.dbusmenu_menuitem_new();
-
-    let composeMi = dbusmenu.dbusmenu_menuitem_new();
-    dbusmenu.dbusmenu_menuitem_property_set(composeMi, "label",
-                                            bundle.GetStringFromName("composeNewMessage"));
-    dbusmenu.dbusmenu_menuitem_property_set_bool(composeMi, "visible", true);
-
-    let menuItemActivatedCB = ctypes.FunctionType(ctypes.default_abi,
-                                                  ctypes.void_t,
-                                                  [glib.gpointer,
-                                                   glib.guint,
-                                                   glib.gpointer]).ptr;
-    composerCallback = menuItemActivatedCB(openAndFocusComposer);
-
-    gobject.g_signal_connect(composeMi,
-                             dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, 
-                             composerCallback, null);
-    dbusmenu.dbusmenu_menuitem_child_append(root, composeMi);
-    // I can't believe that this doesn't inherit from GInitiallyUnowned.
-    // It really, really sucks that we need to do this....
-    gobject.g_object_unref(composeMi);
-
-    let contactsMi = dbusmenu.dbusmenu_menuitem_new();
-    dbusmenu.dbusmenu_menuitem_property_set(contactsMi, "label",
-                                            bundle.GetStringFromName("contacts"));
-    dbusmenu.dbusmenu_menuitem_property_set_bool(contactsMi, "visible", true);
-    contactsCallback = menuItemActivatedCB(openAndFocusAddressBook);
-
-    gobject.g_signal_connect(contactsMi,
-                             dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, 
-                             contactsCallback, null);
-    dbusmenu.dbusmenu_menuitem_child_append(root, contactsMi);
-    gobject.g_object_unref(contactsMi); // This too
-
-    dbusmenu.dbusmenu_server_set_root(server, root);
-    gobject.g_object_unref(root); // And this...
-
-    indicate.indicate_server_set_menu(indicateServer, server);
-    gobject.g_object_unref(server);
-
-    let displayCB = ctypes.FunctionType(ctypes.default_abi,
-                                        ctypes.void_t,
-                                        [glib.gpointer,
-                                         glib.guint,
-                                         glib.gpointer]).ptr;
-    clickIndicatorCallback = displayCB(onClickIndicator);
-
-    this._indicateServer = indicateServer;
-    return this._indicateServer;
+  get mmapp() {
+    if (this._mmapp)
+      return this._mmapp;
+
+    let mmapp = messagingmenu.messaging_menu_app_new(Services.appinfo.name.toLowerCase() + '.desktop');
+
+    let sourceActivatedCB = ctypes.FunctionType(ctypes.default_abi,
+                                                ctypes.void_t,
+                                                [glib.gpointer,
+                                                 glib.gchar.ptr,
+                                                 glib.gpointer]).ptr;
+    sourceActivatedCallback = sourceActivatedCB(onSourceActivated);
+
+    gobject.g_signal_connect(mmapp, 'activate-source', sourceActivatedCallback, null);
+
+    this._mmapp = mmapp;
+    return this._mmapp;
   },
 
   get available() {
     return (gobject.available() &&
             gdk.available() &&
-            dbusmenu.available() &&
-            indicate.available());
+            messagingmenu.available());
   },
 
   get badgeCount() {
@@ -868,28 +759,6 @@
     }
   },
 
-  createLauncherEntry: function MME_createLauncherEntry(aDir) {
-    if (!aDir.exists()) {
-      aDir.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0755);
-    }
-    let entry = aDir;
-    entry.append(Services.appinfo.name.toLowerCase());
-    let ostream = FileUtils.openSafeFileOutputStream(entry,
-                                                     FileUtils.MODE_WRONLY |
-                                                     FileUtils.MODE_CREATE |
-                                                     FileUtils.MODE_TRUNCATE);
-    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-                    .createInstance(Ci.nsIScriptableUnicodeConverter);
-    converter.charset = "UTF-8";
-    let istream = converter.convertToInputStream(this.desktopFile);
-    var self = this;
-    NetUtil.asyncCopy(istream, ostream, function() {
-      self.prefs.setCharPref(PREF_USER_LAUNCHER_PATH, entry.path);
-      self.prefs.setIntPrefAsChar(PREF_USER_LAUNCHER_MTIME,
-                                  entry.lastModifiedTime);
-    });
-  },
-
   init: function MME_init() {
     if (this.initialized)
       return;
@@ -902,31 +771,6 @@
       return;
     }
 
-    // Check if we have a static launcher entry in the messaging menu. If we
-    // don't, then we should add one and also display "Contacts" and "Compose"
-    // menu items. If there is one, then it was probably added by the Thunderbird
-    // package. We don't need to create one or show the extra menu items in that case
-    let sysLauncherEntriesDir = Cc["@mozilla.org/file/local;1"]
-                                .createInstance(Ci.nsILocalFile);
-    sysLauncherEntriesDir.initWithPath(SYSTEM_LAUNCHER_ENTRIES);
-    LauncherEntryFind(sysLauncherEntriesDir, this.desktopFile,
-                      function(aFile) {
-                        if(!aFile) {
-                          // There is no system-provided static launcher entry for us in the
-                          // messaging menu
-                          var userLauncherEntriesDir = Services.dirsvc.get("Home",
-                                                                           Ci.nsILocalFile);
-                          userLauncherEntriesDir.appendRelativePath(USER_LAUNCHER_ENTRIES);
-                          LauncherEntryFind(userLauncherEntriesDir,
-                                            this.desktopFile,
-                                            function(aFile) {
-                                              if (!aFile) {
-                                                MessagingMenuEngine.createLauncherEntry(userLauncherEntriesDir);
-                                              }
-                                            });
-                        }
-                      });
-
     AddonManager.addAddonListener(this);
     this.prefs.addObserver("", this, false);
     Services.obs.addObserver(this, "xpcom-will-shutdown", false);
@@ -950,22 +794,12 @@
 
     LOG("Enabling messaging indicator");
 
-    if (!this.indicateServer) {
-      Cu.reportError("Could not construct the Messaging Menu server.");
+    if (!this.mmapp) {
+      Cu.reportError("Could not connect to the Messaging Menu.");
       return;
     }
 
-    indicate.indicate_server_show(this.indicateServer);
-
-    let userBlacklistDir = Services.dirsvc.get("Home", Ci.nsILocalFile);
-    userBlacklistDir.appendRelativePath(USER_BLACKLIST_ENTRIES);
-    LauncherEntryFind(userBlacklistDir, this.desktopFile,
-                      function(aFile) {
-                        if (aFile) {
-                          LOG("Removing launcher entry " + aFile.path);
-                          aFile.remove(false);
-                        }
-                      });
+    messagingmenu.messaging_menu_app_register(this.mmapp);
 
     let notificationFlags = Ci.nsIFolderListener.added |
                             Ci.nsIFolderListener.boolPropertyChanged
@@ -976,30 +810,8 @@
 
   disableAndHide: function MME_disableAndHide() {
     LOG("Hiding messaging indicator");
-    var userBlacklistDir = Services.dirsvc.get("Home", Ci.nsILocalFile);
-    userBlacklistDir.appendRelativePath(USER_BLACKLIST_ENTRIES);
-    LauncherEntryFind(userBlacklistDir, this.desktopFile,
-                      function(aFile) {
-                        if (aFile)
-                          return;
-
-                        if (!userBlacklistDir.exists()) {
-                          userBlacklistDir.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0755);
-                        }
-
-                        let entry = userBlacklistDir.clone();
-                        entry.append(Services.appinfo.name.toLowerCase());
-                        let ostream = FileUtils.openSafeFileOutputStream(entry,
-                                                                         FileUtils.MODE_WRONLY |
-                                                                         FileUtils.MODE_CREATE |
-                                                                         FileUtils.MODE_TRUNCATE);
-                        let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-                                        .createInstance(Ci.nsIScriptableUnicodeConverter);
-                        converter.charset = "UTF-8";
-                        let istream = converter.convertToInputStream(this.desktopFile);
-                        var self = this;
-                        NetUtil.asyncCopy(istream, ostream, null);
-                      });
+
+    messagingmenu.messaging_menu_app_unregister(this.mmapp);
 
     this.disable();
   },
@@ -1040,9 +852,6 @@
     this.mIndicators = {};
     this.visibleIndicators = 0;
 
-    if (this._indicateServer)
-      indicate.indicate_server_hide(this._indicateServer);
-
     this.badgeCount = 0;
 
     this.enabled = false;
@@ -1058,9 +867,9 @@
 
     this.disable();
 
-    if (this._indicateServer)
-      gobject.g_object_unref(this._indicateServer);
-    this._indicateServer = null;
+    if (this._mmapp)
+      gobject.g_object_unref(this._mmapp);
+    this._mmapp = null;
 
     AddonManager.removeAddonListener(this);
     Services.obs.removeObserver(this, "xpcom-will-shutdown");
 
=== removed file 'debian/messagingmenu/modules/dbusmenu.jsm'
--- debian/messagingmenu/modules/dbusmenu.jsm	2012-01-13 09:28:15 +0000
+++ debian/messagingmenu/modules/dbusmenu.jsm	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- *	 Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is messagingmenu-extension
- *
- * The Initial Developer of the Original Code is
- * Mozilla Messaging, Ltd.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    Mike Conley <[e-mail]>
- *    Chris Coulson <[e-mail]>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- * 
- * ***** END LICENSE BLOCK ***** */
-
-var EXPORTED_SYMBOLS  = [ "dbusmenu" ];
-
-const Cu = Components.utils;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://messagingmenu/ctypes-utils.jsm");
-Cu.import("resource://messagingmenu/gobject.jsm");
-Cu.import("resource://messagingmenu/glib.jsm");
-
-const DBUSMENU_ABIS    = [ 4, 3 ];
-const DBUSMENU_LIBNAME = "dbusmenu-glib";
-
-function dbusmenu_defines(lib) {
-  this.MENUITEM_SIGNAL_ITEM_ACTIVATED = "item-activated";
-
-  this.DbusmenuMenuitem = ctypes.StructType("DbusmenuMenuitem");
-  this.DbusmenuServer = ctypes.StructType("DbusmenuServer");
-
-  lib.lazy_bind("dbusmenu_menuitem_new", this.DbusmenuMenuitem.ptr);
-  lib.lazy_bind("dbusmenu_menuitem_property_set", glib.gboolean, this.DbusmenuMenuitem.ptr, glib.gchar.ptr, glib.gchar.ptr);
-  lib.lazy_bind("dbusmenu_menuitem_property_set_bool", glib.gboolean, this.DbusmenuMenuitem.ptr, glib.gchar.ptr, glib.gboolean);
-  lib.lazy_bind("dbusmenu_menuitem_child_append", glib.gboolean, this.DbusmenuMenuitem.ptr, this.DbusmenuMenuitem.ptr);
-  lib.lazy_bind("dbusmenu_server_new", this.DbusmenuServer.ptr, glib.gchar.ptr);
-  lib.lazy_bind("dbusmenu_server_set_root", ctypes.void_t, this.DbusmenuServer.ptr, this.DbusmenuMenuitem.ptr);
-}
-
-new ctypes_library(DBUSMENU_LIBNAME, DBUSMENU_ABIS, dbusmenu_defines, this);
 
=== removed file 'debian/messagingmenu/modules/indicate.jsm'
--- debian/messagingmenu/modules/indicate.jsm	2012-01-13 09:28:15 +0000
+++ debian/messagingmenu/modules/indicate.jsm	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- *	 Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is messagingmenu-extension
- *
- * The Initial Developer of the Original Code is
- * Mozilla Messaging, Ltd.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    Mike Conley <[e-mail]>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- * 
- * ***** END LICENSE BLOCK ***** */
-
-var EXPORTED_SYMBOLS = [ "indicate" ];
-
-const Cu = Components.utils;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://messagingmenu/ctypes-utils.jsm");
-Cu.import("resource://messagingmenu/gobject.jsm");
-Cu.import("resource://messagingmenu/dbusmenu.jsm");
-Cu.import("resource://messagingmenu/glib.jsm");
-
-const IMPORTS          = ["resource://messagingmenu/glib.jsm"];
-const INDICATE_LIBNAME = "indicate";
-const INDICATE_ABIS    = [ 5 ];
-
-function indicate_defines(lib) {
-  this.INDICATOR_MESSAGES_SERVER_TYPE = "message";
-  this.INDICATOR_MESSAGES_PROP_NAME = "name";
-  this.INDICATOR_MESSAGES_PROP_ICON = "icon";
-  this.INDICATOR_MESSAGES_PROP_COUNT = "count";
-  this.INDICATOR_MESSAGES_PROP_TIME = "time";
-  this.INDICATOR_MESSAGES_PROP_ATTENTION = "draw-attention";
-
-  this.IndicateServer = ctypes.StructType("IndicateServer");
-  this.Indicator = ctypes.StructType("Indicator");
-
-  lib.lazy_bind("indicate_server_ref_default", this.IndicateServer.ptr);
-  lib.lazy_bind("indicate_server_set_type", ctypes.void_t, this.IndicateServer.ptr, glib.gchar.ptr);
-  lib.lazy_bind("indicate_server_set_desktop_file", ctypes.void_t, this.IndicateServer.ptr, glib.gchar.ptr);
-  lib.lazy_bind("indicate_server_show", ctypes.void_t, this.IndicateServer.ptr);
-  lib.lazy_bind("indicate_server_hide", ctypes.void_t, this.IndicateServer.ptr);
-  lib.lazy_bind("indicate_server_set_menu", ctypes.void_t, this.IndicateServer.ptr, dbusmenu.DbusmenuServer.ptr);
-  lib.lazy_bind("indicate_indicator_new", this.Indicator.ptr);
-  lib.lazy_bind("indicate_indicator_set_property", ctypes.void_t, this.Indicator.ptr, glib.gchar.ptr, glib.gchar.ptr);
-  lib.lazy_bind("indicate_indicator_get_property", glib.gchar.ptr, this.Indicator.ptr, glib.gchar.ptr);
-  lib.lazy_bind("indicate_indicator_show", ctypes.void_t, this.Indicator.ptr);
-  lib.lazy_bind("indicate_indicator_hide", ctypes.void_t, this.Indicator.ptr);
-  lib.lazy_bind("indicate_indicator_is_visible", glib.gboolean, this.Indicator.ptr);
-}
-
-new ctypes_library(INDICATE_LIBNAME, INDICATE_ABIS, indicate_defines, this);
 
=== added file 'debian/messagingmenu/modules/messagingmenu.jsm'
--- debian/messagingmenu/modules/messagingmenu.jsm	1970-01-01 00:00:00 +0000
+++ debian/messagingmenu/modules/messagingmenu.jsm	2012-08-23 20:00:25 +0000
@@ -0,0 +1,74 @@
+/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ *	 Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is messagingmenu-extension
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Messaging, Ltd.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *    Mike Conley <[e-mail]>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ * 
+ * ***** END LICENSE BLOCK ***** */
+
+var EXPORTED_SYMBOLS = [ "messagingmenu" ];
+
+const Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/ctypes.jsm");
+Cu.import("resource://messagingmenu/ctypes-utils.jsm");
+Cu.import("resource://messagingmenu/gobject.jsm");
+Cu.import("resource://messagingmenu/glib.jsm");
+
+const IMPORTS                = ["resource://messagingmenu/glib.jsm"];
+const MESSAGING_MENU_LIBNAME = "messaging-menu";
+const MESSAGING_MENU_ABIS    = [ 0 ];
+
+function messaging_menu_defines(lib) {
+  this.MessagingMenuApp = ctypes.StructType("MessagingMenuApp");
+
+  lib.lazy_bind("messaging_menu_app_new", this.MessagingMenuApp.ptr, glib.gchar.ptr);
+  lib.lazy_bind("messaging_menu_app_register", ctypes.void_t, this.MessagingMenuApp.ptr);
+  lib.lazy_bind("messaging_menu_app_unregister", ctypes.void_t, this.MessagingMenuApp.ptr);
+
+  lib.lazy_bind("messaging_menu_app_append_source",
+      ctypes.void_t, this.MessagingMenuApp.ptr, glib.gchar.ptr, glib.gpointer, glib.gchar.ptr);
+  lib.lazy_bind("messaging_menu_app_append_source_with_count",
+      ctypes.void_t, this.MessagingMenuApp.ptr, glib.gchar.ptr, glib.gpointer, glib.gchar.ptr, glib.guint);
+
+  lib.lazy_bind("messaging_menu_app_remove_source", ctypes.void_t, this.MessagingMenuApp.ptr, glib.gchar.ptr);
+  lib.lazy_bind("messaging_menu_app_has_source", glib.gboolean, this.MessagingMenuApp.ptr, glib.gchar.ptr);
+  lib.lazy_bind("messaging_menu_app_set_source_count", ctypes.void_t, this.MessagingMenuApp.ptr, glib.gchar.ptr, glib.guint);
+  lib.lazy_bind("messaging_menu_app_draw_attention", ctypes.void_t, this.MessagingMenuApp.ptr, glib.gchar.ptr);
+  lib.lazy_bind("messaging_menu_app_remove_attention", ctypes.void_t, this.MessagingMenuApp.ptr, glib.gchar.ptr);
+}
+
+new ctypes_library(MESSAGING_MENU_LIBNAME, MESSAGING_MENU_ABIS, messaging_menu_defines, this);
+
 
=== modified file 'debian/thunderbird.desktop.in'
--- debian/thunderbird.desktop.in	2012-06-13 00:34:08 +0000
+++ debian/thunderbird.desktop.in	2012-08-23 20:00:25 +0000
@@ -176,7 +176,7 @@
 %%ifdef MOZ_ENABLE_UNITY_INTEGRATION
 %%if DISTRIB_VERSION >= 1204
 Actions=Compose;Contacts
-%%define TARGET_ENV OnlyShowIn=Unity;
+%%define TARGET_ENV OnlyShowIn=Messaging Menu;Unity;
 %%define COMPOSE_SECTION [Desktop Action Compose]
 %%define CONTACTS_SECTION [Desktop Action Contacts]
 %%else