[Pkg-mozext-commits] [firetray] 19/399: Merge branch 'hide'

[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 8e4e14c8f635cbd482fabf82069c8c65a1ade59f
Merge: 890c457 e9321f5
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Aug 3 15:56:06 2011 +0200

    Merge branch 'hide'
    
    Conflicts:
    	src/chrome/content/overlay.js
    	src/modules/LibGtkStatusIcon.js

 src/Makefile                                       |    3 +-
 src/chrome/content/overlay.js                      |  186 ++++++++++++++--
 src/chrome/content/overlay.xul                     |    2 +-
 src/modules/LibC.js                                |  104 +++++++++
 src/modules/LibGObject.js                          |  230 ++++++++++++++++++++
 src/modules/LibGdkWindow.js                        |  201 +++++++++++++++++
 src/modules/LibGtkStatusIcon.js                    |   53 ++++-
 src/modules/commons.js                             |   47 +++-
 testing/Makefile                                   |   17 +-
 testing/gtk_icon_example                           |  Bin 66933 -> 68328 bytes
 testing/{gkt_icon_example.c => gtk_icon_example.c} |   42 ++++
 testing/hide.c                                     |   53 +++++
 testing/trayicon.c                                 |  109 ++++++++++
 13 files changed, 1014 insertions(+), 33 deletions(-)

diff --cc src/chrome/content/overlay.js
index a58b7a1,4bfc80c..9055004
--- a/src/chrome/content/overlay.js
+++ b/src/chrome/content/overlay.js
@@@ -23,19 -127,61 +127,66 @@@ mozt.Main = 
        return false;
      }
  
-     LibGtkStatusIcon.init();
-     this.tray_icon  = LibGtkStatusIcon.gtk_status_icon_new();
-     var mozApp = mozt.Utils.appInfoService.name;
-     var icon_filename = MOZT_ICON_DIR + mozApp.toLowerCase() + MOZT_ICON_SUFFIX;
-     LibGtkStatusIcon.gtk_status_icon_set_from_file(this.tray_icon,
-                                                    icon_filename);
-     // TODO: produces:
-     // (firefox-bin:5302): Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
-     // (thunderbird-bin:5380): Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
-     LibGtkStatusIcon.gtk_status_icon_set_tooltip_text(this.tray_icon,
-                                                       mozApp);
- 
-     mozt.Debug.dump('Moztray LOADED !');
+     try {
+ 
+       // instanciate tray icon
+       LibGtkStatusIcon.init();
+       this.tray_icon  = LibGtkStatusIcon.gtk_status_icon_new();
+       var mozApp = mozt.Utils.appInfoService.name.toLowerCase();
+       var iconFilename = MOZT_ICON_DIR + mozApp + MOZT_ICON_SUFFIX;
+       LibGtkStatusIcon.gtk_status_icon_set_from_file(this.tray_icon,
+                                                      iconFilename);
 -      // gtk_status_icon_set_tooltip(tray_icon,
 -      //                             "Example Tray Icon");
 -      // gtk_status_icon_set_visible(tray_icon, TRUE);
++
++      // set tooltip.
++      // TODO: produces:
++      // (firefox-bin:5302): Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
++      // (thunderbird-bin:5380): Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
++      LibGtkStatusIcon.gtk_status_icon_set_tooltip_text(this.tray_icon,
++                                                        mozApp);
++
+       LibGtkStatusIcon.shutdown();
+ 
+       // watch out for binding problems !
+       mozt_activateCb = LibGObject.GCallback_t(
+         function(){mozt.Handler.showHideToTray();});
+       LibGObject.g_signal_connect(this.tray_icon, "activate",
+                                   mozt_activateCb, null);
+ 
+     } catch (x) {
+       Components.utils.reportError(ex);
+       return false;
+     }
+ 
+ /*
+     try {
+       // Experimental stuff... needs
+       // Components.utils.import("resource://moztray/LibGdkWindow.js");
+ 
+       var gdkScreen = LibGdkWindow.GdkScreenGetDefault();
+       var tl = LibGdkWindow.GdkScreenGetToplevelWindows(gdkScreen);
+       mozt.Debug.debug(tl);
+ 
+       // gboolean            gdk_window_is_visible               (GdkWindow *window);
+       mozt_func = LibGObject.GFunc_t(mozt_funcGdkJS);
+       LibGObject.g_list_foreach(tl, mozt_func, null);
+       var gdkWinCount = LibGObject.g_list_length(tl);
+       mozt.Debug.debug('gdkWinCount: ' + gdkWinCount);
+ 
+       var pid = LibC.getpid();
+       mozt.Debug.debug(pid);
+ 
+       tl = LibGtkStatusIcon.gtk_window_list_toplevels();
+       mozt_func = LibGObject.GFunc_t(mozt_funcGtkJS);
+       LibGObject.g_list_foreach(tl, mozt_func, null);
+       var gtkWinCount = LibGObject.g_list_length(tl);
+       mozt.Debug.debug('gtkWinCount: ' + gtkWinCount);
+ 
+     } catch (x) {
+       mozt.Debug.debug(x);
+     }
+ */
+ 
+     mozt.Debug.debug('Moztray LOADED !');
      this.initialized = true;
      return true;
    },
diff --cc src/modules/LibGtkStatusIcon.js
index 6e0c74d,5645d70..d6cbc03
--- a/src/modules/LibGtkStatusIcon.js
+++ b/src/modules/LibGtkStatusIcon.js
@@@ -69,14 -98,20 +98,30 @@@ var LibGtkStatusIcon = 
        ctypes.char.ptr
      );
  
 +    this.gtk_status_icon_set_tooltip_text = this._lib.declare(
 +      "gtk_status_icon_set_tooltip_text",
 +      ctypes.default_abi,
 +      ctypes.void_t,
 +      this.GtkStatusIconRef,
 +      ctypes.char.ptr
 +    );
 +
++/*
+     this.gtk_window_list_toplevels = this._lib.declare(
+       "gtk_window_list_toplevels", ctypes.default_abi, LibGObject.GList.ptr
+     );
+ 
+     this.gtk_widget_show = this._lib.declare(
+       "gtk_widget_show", ctypes.default_abi, ctypes.void_t,
+       this.GtkWidget.ptr
+     );
+ 
+     this.gtk_widget_hide = this._lib.declare(
+       "gtk_widget_hide", ctypes.default_abi, ctypes.void_t,
+       this.GtkWidget.ptr
+     );
++*/
+ 
    }
  
  };

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