[Pkg-mozext-commits] [firetray] 196/399: activate window with gtk_window_present instead of XSendClientMessgeEvent(_NET_ACTIVE_WINDOW)

[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 b47e960755fb3b0e2a530579088c44ebc2568c7b
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Mar 7 14:41:05 2012 +0100

    activate window with gtk_window_present instead of
    XSendClientMessgeEvent(_NET_ACTIVE_WINDOW)
---
 src/modules/ctypes/linux/gtk.jsm     |    1 +
 src/modules/linux/FiretrayWindow.jsm |   10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/modules/ctypes/linux/gtk.jsm b/src/modules/ctypes/linux/gtk.jsm
index c71bafd..a02ca7a 100644
--- a/src/modules/ctypes/linux/gtk.jsm
+++ b/src/modules/ctypes/linux/gtk.jsm
@@ -116,6 +116,7 @@ function gtk_defines(lib) {
   lib.lazy_bind("gtk_window_stick", gobject.gint, this.GtkWindow.ptr);
   lib.lazy_bind("gtk_window_maximize", gobject.gint, this.GtkWindow.ptr);
   lib.lazy_bind("gtk_window_fullscreen", gobject.gint, this.GtkWindow.ptr);
+  lib.lazy_bind("gtk_window_present", ctypes.void_t, this.GtkWindow.ptr);
 
 }
 
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 72ee8de..9f4b581 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -344,21 +344,13 @@ firetray.Window = {
     // always returns 1 (BadRequest as a coincidence)
   },
 
-
   /**
    * raises window on top and give focus.
    */
   activate: function(xid) {
     if (!firetray.Utils.prefService.getBoolPref('show_activates'))
       return;
-
-    let dataSize = 3;
-    let data = ctypes.long(dataSize);
-    data[0] = 1; // source indication (0=none, 1=app, 2=pager)
-    data[1] = 0; // timestamp
-    data[2] = 0; // requestor's currently active window, 0 if none
-    this.xSendClientMessgeEvent(xid, x11.current.Atoms._NET_ACTIVE_WINDOW, data, dataSize);
-
+    gtk.gtk_window_present(firetray.Handler.gtkWindows.get(xid));
     LOG("window raised");
   },
 

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