[Pkg-mozext-commits] [firetray] 231/399: Merge branch 'minimize-detect'

[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 4174095780fa7d016d8a3fe642fba92a30ee2b7b
Merge: a1f0980 f86a3ac
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Apr 30 22:24:27 2012 +0300

    Merge branch 'minimize-detect'
    
    Conflicts:
    	src/modules/linux/FiretrayWindow.jsm

 src/modules/FiretrayMessaging.jsm       |    8 +++-----
 src/modules/ctypes/linux/gtk.jsm        |    2 +-
 src/modules/linux/FiretrayPopupMenu.jsm |    2 +-
 src/modules/linux/FiretrayWindow.jsm    |   16 +++++++---------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --cc src/modules/linux/FiretrayPopupMenu.jsm
index 233d7fa,233d7fa..391ca48
--- a/src/modules/linux/FiretrayPopupMenu.jsm
+++ b/src/modules/linux/FiretrayPopupMenu.jsm
@@@ -146,7 -146,7 +146,7 @@@ firetray.PopupMenu = 
  
    showAllWindowItemsOnlyVisibleWindows: function() {
      for (let xid in firetray.Handler.windows)
--      if (!firetray.Handler.windows[xid].visibility)
++      if (!firetray.Handler.windows[xid].visible)
          this.showSingleWindowItem(xid);
    },
  
diff --cc src/modules/linux/FiretrayWindow.jsm
index 1bfd942,9229851..cf8f401
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@@ -322,8 -320,13 +322,14 @@@ firetray.Window = 
    },
  
    setVisibility: function(xid, visibility) {
-     firetray.Handler.windows[xid].baseWin.visibility = visibility;
++    F.WARN("setVisibility="+visibility);
+     let gtkWidget = ctypes.cast(firetray.Handler.gtkWindows.get(xid), gtk.GtkWidget.ptr);
+     if (visibility)
+       gtk.gtk_widget_show_all(gtkWidget);
+     else
+       gtk.gtk_widget_hide(gtkWidget);
+ 
 -    firetray.Handler.windows[xid].visibility = visibility;
 +    firetray.Handler.windows[xid].visible = visibility;
      firetray.Handler.visibleWindowsCount = visibility ?
        firetray.Handler.visibleWindowsCount + 1 :
        firetray.Handler.visibleWindowsCount - 1 ;
@@@ -487,25 -477,22 +493,17 @@@
        let xany = ctypes.cast(xev, x11.XAnyEvent.ptr);
        let xwin = xany.contents.window;
  
 +      let winStates, isHidden;
        switch (xany.contents.type) {
  
--      case x11.UnmapNotify:
--        F.LOG("UnmapNotify");
-         if (firetray.Handler.windows[xwin].visible) {
-           winStates = firetray.Window.getXWindowStates(xwin);
-           isHidden = winStates & FIRETRAY_XWINDOW_HIDDEN;
-         }
-         break;
- 
 -        let winStates = firetray.Window.getXWindowStates(xwin);
 -        let isHidden = winStates & FIRETRAY_XWINDOW_HIDDEN;
 -        F.LOG("winStates="+winStates+", isHidden="+isHidden);
 -        if (isHidden) {
 -          let hides_on_minimize = firetray.Utils.prefService.getBoolPref('hides_on_minimize');
 -          let hides_single_window = firetray.Utils.prefService.getBoolPref('hides_single_window');
 -          if (hides_on_minimize) {
 -            if (hides_single_window) {
 -              firetray.Handler.hideSingleWindow(xwin);
 -            } else
 -              firetray.Handler.hideAllWindows();
 -          }
 +      case x11.PropertyNotify:
 +        let xprop = ctypes.cast(xev, x11.XPropertyEvent.ptr);
 +        if (firetray.Handler.windows[xwin].visible &&
 +            firetray.js.strEquals(xprop.contents.atom, x11.current.Atoms.WM_STATE) &&
 +            firetray.js.strEquals(xprop.contents.state, x11.PropertyNewValue)) {
 +          F.LOG("PropertyNotify: WM_STATE, send_event: "+xprop.contents.send_event+", state: "+xprop.contents.state);
 +          winStates = firetray.Window.getXWindowStates(xwin);
 +          isHidden = winStates & FIRETRAY_XWINDOW_HIDDEN;
          }
          break;
  

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