[Pkg-mozext-commits] [firetray] 216/399: fix MenuItem initialization

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit c0479d16839a7db496a65017fca4e3f65320c381
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Mar 28 17:57:02 2012 +0200

    fix MenuItem initialization
---
 src/modules/linux/FiretrayPopupMenu.jsm |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/linux/FiretrayPopupMenu.jsm b/src/modules/linux/FiretrayPopupMenu.jsm
index 581b1c3..7d53852 100644
--- a/src/modules/linux/FiretrayPopupMenu.jsm
+++ b/src/modules/linux/FiretrayPopupMenu.jsm
@@ -115,19 +115,19 @@ firetray.PopupMenu = {
   // hides_single_window is false, because if hides_single_window becomes true,
   // we'll just have to show the menuItems
   addWindowItem: function(xid) { // on registerWindow
-    var menuItemWindow = this.addItem();
+    var menuItemWindow = this.createAndAddItemToMenu();
     firetray.Handler.gtkPopupMenuWindowItems.insert(xid, menuItemWindow);
+    this.setWindowItemLabel(menuItemWindow, xid.toString()); // default to xid
 
     this.callbacks.menuItemWindowActivate[xid] = gobject.GCallback_t(
       function(){firetray.Handler.showSingleWindow(xid);});
     gobject.g_signal_connect(menuItemWindow, "activate",
       firetray.PopupMenu.callbacks.menuItemWindowActivate[xid], null);
-    this.setWindowItemLabel(menuItemWindow, xid); // default to xid
 
-    firetray.LOG("add gtkPopupMenuWindowItems: "+firetray.Handler.gtkPopupMenuWindowItems.count);
+    firetray.LOG("added gtkPopupMenuWindowItems: "+firetray.Handler.gtkPopupMenuWindowItems.count);
   },
 
-  addItem: function() {
+  createAndAddItemToMenu: function() {
     var menuItem = gtk.gtk_image_menu_item_new();
     var menuShell = ctypes.cast(this.menu, gtk.GtkMenuShell.ptr);
     gtk.gtk_menu_shell_prepend(menuShell, ctypes.cast(menuItem, gtk.GtkWidget.ptr));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git