[Gnash-commit] gnash ./ChangeLog server/action.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/16 16:47:37

Modified files:
        .              : ChangeLog 
        server         : action.cpp 

Log message:
        * server/action.cpp: use GUI_GTK rather then HAVE_GTK2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.337&tr2=1.338&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.75&tr2=1.76&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.337 gnash/ChangeLog:1.338
--- gnash/ChangeLog:1.337       Tue May 16 15:32:49 2006
+++ gnash/ChangeLog     Tue May 16 16:47:37 2006
@@ -1,6 +1,6 @@
 2006-05-16 Sandro Santilli <address@hidden>
 
-       * server/action.cpp: removed useless gtk2 include.
+       * server/action.cpp: use GUI_GTK rather then HAVE_GTK2
        * macros/gtk2.m4: fixed ac_cv_path_gtk2_incl setting to
        always include -I.
 
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.75 gnash/server/action.cpp:1.76
--- gnash/server/action.cpp:1.75        Tue May 16 15:32:49 2006
+++ gnash/server/action.cpp     Tue May 16 16:47:37 2006
@@ -90,13 +90,13 @@
 #include "URL.h"
 #include "GnashException.h"
 
-#ifndef HAVE_GTK2
+#ifndef GUI_GTK
 int windowid = 0;
 #else
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
-//#include <gtk/gtk.h>
-//GdkNativeWindow windowid = 0;
+#include <gtk/gtk.h>
+GdkNativeWindow windowid = 0;
 #endif
 
 using namespace gnash;