[Gnash-commit] [SCM] Gnash branch, master, updated. 298cc5dadef666bb3dec7021c82569e03ba8659a

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  298cc5dadef666bb3dec7021c82569e03ba8659a (commit)
      from  8921362c3181647d649f739c8e18cde403dbc9b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=298cc5dadef666bb3dec7021c82569e03ba8659a


commit 298cc5dadef666bb3dec7021c82569e03ba8659a
Author: Markus Gothe <address@hidden>
Date:   Fri Jan 7 10:58:12 2011 +0100

    Cure some X11-headache on non-X11

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 5df7e3c..fe86993 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -1,6 +1,6 @@
 // gtk.cpp: Gnome ToolKit graphical user interface, for Gnash.
 // 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 //   Foundation, Inc
 // 
 // This program is free software; you can redistribute it and/or modify
@@ -154,11 +154,12 @@ GtkGui::GtkGui(unsigned long xid, float scale, bool loop, 
RunResources& r)
 bool
 GtkGui::init(int argc, char **argv[])
 {
+#ifdef HAVE_X11
     if (!XInitThreads()) {
         log_debug("Failed to initialize X threading support\n");
         return false;
     }
-
+#endif
     gtk_init(&argc, argv);
 
     addPixmapDirectory (PKGDATADIR);
@@ -2122,7 +2123,10 @@ GtkGui::playHook()
 bool 
 GtkGui::checkX11Extension(const std::string& ext)
 {
-    
+#ifdef HAVE_X11
+#if GTK_CHECK_VERSION(2,22,0)
+       #define GDK_DISPLAY() (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))
+#endif 
     int n = 0;
     char **extlist = XListExtensions(GDK_DISPLAY(), &n);
 
@@ -2133,6 +2137,7 @@ GtkGui::checkX11Extension(const std::string& ext)
             }
         }
     }
+#endif /* HAVE_X11 */ 
     // do not free, Xlib can depend on contents being unaltered
     return false;
 }

-----------------------------------------------------------------------

Summary of changes:
 gui/gtk/gtk.cpp |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash