[Pkg-mozext-commits] [firetray] 22/84: Revert "attempt to use gtk3"

[David Prévot]

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

taffit pushed a commit to branch master
in repository firetray.

commit 23f4bc30143810e1f4ae3dc40a8745c2bce89c5a
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Fri Feb 7 11:36:24 2014 +0100

    Revert "attempt to use gtk3"
    
    This reverts commit 769105c59b94713674e09638fd5aaa0a27108883.
---
 src/modules/ctypes/linux/gdk.jsm     | 2 +-
 src/modules/ctypes/linux/gtk.jsm     | 6 +++---
 src/modules/linux/FiretrayWindow.jsm | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/modules/ctypes/linux/gdk.jsm b/src/modules/ctypes/linux/gdk.jsm
index 29d5736..ee11087 100644
--- a/src/modules/ctypes/linux/gdk.jsm
+++ b/src/modules/ctypes/linux/gdk.jsm
@@ -39,7 +39,7 @@
 
 var EXPORTED_SYMBOLS = [ "gdk" ];
 
-const GDK_LIBNAME = "gdk-3";
+const GDK_LIBNAME = "gdk-x11-2.0";
 const GDK_ABIS    = [ 0 ];
 
 const Cu = Components.utils;
diff --git a/src/modules/ctypes/linux/gtk.jsm b/src/modules/ctypes/linux/gtk.jsm
index 51243a5..fc70953 100644
--- a/src/modules/ctypes/linux/gtk.jsm
+++ b/src/modules/ctypes/linux/gtk.jsm
@@ -2,7 +2,7 @@
 
 var EXPORTED_SYMBOLS = [ "gtk" ];
 
-const GTK_LIBNAME = "gtk-3";
+const GTK_LIBNAME = "gtk-x11-2.0";
 const GTK_ABIS    = [ 0 ];
 
 const Cu = Components.utils;
@@ -17,8 +17,8 @@ Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
 Cu.import("resource://firetray/ctypes/linux/pango.jsm");
 
 function gtk_defines(lib) {
-  this.FIRETRAY_REQUIRED_GTK_MAJOR_VERSION = 3;
-  this.FIRETRAY_REQUIRED_GTK_MINOR_VERSION = 0;
+  this.FIRETRAY_REQUIRED_GTK_MAJOR_VERSION = 2;
+  this.FIRETRAY_REQUIRED_GTK_MINOR_VERSION = 20;
   this.FIRETRAY_REQUIRED_GTK_MICRO_VERSION = 0;
 
   this.GtkIconSize = ctypes.int; // enum
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 0520530..9a6fed4 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -749,10 +749,6 @@ x11.init = function() {
 
   this.current = {};
   try {
-/* When using GTK3 (gdk.jsm, gtk.jsm) crashes with:
-(firefox:8250): GLib-GObject-WARNING **: cannot register existing type `GdkDisplayManager'
-0x00007fffd62a54b0 in gdk_display_manager_get_default_display () from /lib64/libgdk-3.so.0
-Not sure we can mix mozilla-gtk2 with firetray-gtk3... */
     let gdkDisplay = gdk.gdk_display_get_default();
     this.current.Display = gdk.gdk_x11_display_get_xdisplay(gdkDisplay);
     this.current.Atoms = {};

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