[Pkg-mozext-commits] [firetray] 383/399: Merge branch 'urgency'

[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 f6508616e62b0e908d4cd00e64f50dabebb6c9ec
Merge: 2749816 6615219
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Jul 24 15:46:12 2013 +0200

    Merge branch 'urgency'
    
    Conflicts:
    	src/modules/FiretrayChat.jsm
    	src/modules/linux/FiretrayChatStatusIcon.jsm

 src/modules/FiretrayChat.jsm                 |    9 ++--
 src/modules/FiretrayHandler.jsm              |    3 +-
 src/modules/FiretrayMessaging.jsm            |   13 +++--
 src/modules/ctypes/linux/gdk.jsm             |    1 +
 src/modules/ctypes/linux/gobject.jsm         |   23 ---------
 src/modules/linux/FiretrayChatStatusIcon.jsm |   29 -----------
 src/modules/linux/FiretrayWindow.jsm         |   70 ++++++++++++++++++--------
 7 files changed, 64 insertions(+), 84 deletions(-)

diff --cc src/modules/FiretrayChat.jsm
index a8b7c54,a8624e7..0eac3e7
--- a/src/modules/FiretrayChat.jsm
+++ b/src/modules/FiretrayChat.jsm
@@@ -128,9 -123,10 +129,9 @@@ firetray.Chat = 
  
    startGetAttentionMaybe: function(conv) {
      log.debug('startGetAttentionMaybe conv.id='+conv.id);
 -    if (this.shouldAcknowledgeConvs.ids[conv.id]) return; // multiple messages
  
      let convIsCurrentlyShown =
-           this.isConvCurrentlyShown(conv, firetray.Handler.findActiveWindow());
+           this.isConvCurrentlyShown(conv, firetray.Handler.getActiveWindow());
      log.debug("convIsCurrentlyShown="+convIsCurrentlyShown);
      if (convIsCurrentlyShown) return; // don't blink when conv tab already on top
  
diff --cc src/modules/linux/FiretrayChatStatusIcon.jsm
index 2c2e473,eec2650..fda634d
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@@ -43,12 -38,7 +43,11 @@@ firetray.ChatStatusIcon = 
      return o;
    })(),
    themedIconNameCurrent: null,
-   signals: {'focus-in': {callback: {}, handler: {}}},
 -  timers: {},
 +  timers: {'blink': null, 'fade-step': null, 'fade-loop': null},
 +  events: {},
 +  generators: {},
 +  pixBuffer: {},
 +  get isBlinking () {return (firetray.Chat.convsToAcknowledge.length() > 0);},
  
    init: function() {
      if (!firetray.Handler.inMailApp) throw "ChatStatusIcon for mail app only";
@@@ -296,36 -112,8 +295,8 @@@
  
    setIconTooltipDefault: function() {
      this.setIconTooltip(firetray.Handler.appName+" Chat");
-   },
- 
-   attachOnFocusInCallback: function(xid) {
-     log.debug("attachOnFocusInCallback xid="+xid);
-     this.signals['focus-in'].callback[xid] =
-       gtk.GCallbackWidgetFocusEvent_t(firetray.ChatStatusIcon.onFocusIn);
-     this.signals['focus-in'].handler[xid] = gobject.g_signal_connect(
-       firetray.Handler.gtkWindows.get(xid), "focus-in-event",
-       firetray.ChatStatusIcon.signals['focus-in'].callback[xid], null);
-     log.debug("focus-in handler="+this.signals['focus-in'].handler[xid]);
-   },
- 
-   detachOnFocusInCallback: function(xid) {
-     log.debug("detachOnFocusInCallback xid="+xid);
-     let gtkWin = firetray.Handler.gtkWindows.get(xid);
-     gobject.g_signal_handler_disconnect(gtkWin, this.signals['focus-in'].handler[xid]);
-     delete this.signals['focus-in'].callback[xid];
-     delete this.signals['focus-in'].handler[xid];
-   },
- 
-   // NOTE: fluxbox issues a FocusIn event when switching workspace
-   // by hotkey, which means 2 FocusIn events when switching to a moz app :(
-   // (http://sourceforge.net/tracker/index.php?func=detail&aid=3190205&group_id=35398&atid=413960)
-   onFocusIn: function(widget, event, data) {
-     log.debug("onFocusIn");
-     let xid = firetray.Window.getXIDFromGtkWidget(widget);
-     log.debug("xid="+xid);
-     firetray.Chat.stopGetAttentionMaybe(xid);
    }
  
 -  // FIXME: TODO: onclick/activate -> chatHandler.showCurrentConversation()
 +  // TODO: onclick/activate -> chatHandler.showCurrentConversation()
  
  }; // firetray.ChatStatusIcon
diff --cc src/modules/linux/FiretrayWindow.jsm
index 7230474,fd8eb38..e9bcf77
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@@ -610,10 -616,42 +616,42 @@@ firetray.Window = 
      if (visibilityRate < 1)
        firetray.Handler.showAllWindows();
  
 -    for(var key in firetray.Handler.windows);
 +    for(var key in firetray.Handler.windows); // FIXME: this is not the proper way for finding the last registered window !
      firetray.Window.activate(key);
-   }
+   },
+ 
+   attachOnFocusInCallback: function(xid) {
+     log.debug("attachOnFocusInCallback xid="+xid);
+     this.signals['focus-in'].callback[xid] =
+       gtk.GCallbackWidgetFocusEvent_t(firetray.Window.onFocusIn);
+     this.signals['focus-in'].handler[xid] = gobject.g_signal_connect(
+       firetray.Handler.gtkWindows.get(xid), "focus-in-event",
+       firetray.Window.signals['focus-in'].callback[xid], null);
+     log.debug("focus-in handler="+this.signals['focus-in'].handler[xid]);
+   },
+ 
+   detachOnFocusInCallback: function(xid) {
+     log.debug("detachOnFocusInCallback xid="+xid);
+     let gtkWin = firetray.Handler.gtkWindows.get(xid);
+     gobject.g_signal_handler_disconnect(gtkWin, this.signals['focus-in'].handler[xid]);
+     delete this.signals['focus-in'].callback[xid];
+     delete this.signals['focus-in'].handler[xid];
+   },
+ 
+   // NOTE: fluxbox issues a FocusIn event when switching workspace
+   // by hotkey, which means 2 FocusIn events when switching to a moz app :(
+   // (http://sourceforge.net/tracker/index.php?func=detail&aid=3190205&group_id=35398&atid=413960)
+   onFocusIn: function(widget, event, data) {
+     log.debug("onFocusIn");
+     let xid = firetray.Window.getXIDFromGtkWidget(widget);
+     log.debug("xid="+xid);
  
+     firetray.Window.setUrgency(xid, false);
+ 
+     if (firetray.Handler.isChatEnabled() && firetray.Chat.initialized) {
+       firetray.Chat.stopGetAttentionMaybe(xid);
+     }
+   }
  
  }; // firetray.Window
  

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