[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gtk.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/14 09:33:10

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp gtk.cpp 

Log message:
            * gui/gtk.cpp: gdk_screen_get_resolution only available from
              version 2.10 onwards (thanks buildbot!).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6268&r2=1.6269
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.170&r2=1.171

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6268
retrieving revision 1.6269
diff -u -b -r1.6268 -r1.6269
--- ChangeLog   14 Apr 2008 08:37:14 -0000      1.6268
+++ ChangeLog   14 Apr 2008 09:33:09 -0000      1.6269
@@ -1,5 +1,17 @@
 2008-04-14 Benjamin Wolsey <address@hidden>
 
+    * gui/gtk.cpp: gdk_screen_get_resolution only available from
+      version 2.10 onwards (thanks buildbot!).
+
+2008-04-14 Benjamin Wolsey <address@hidden>
+
+       * server/asobj/System.cpp: correct formatting of serverString.
+       * gui/Player.cpp, gui/gui.h, gui/gtk{sup.h,.cpp}: get screen
+         resolution in DPI (doesn't agree with the pp, but no idea
+         which is correct).
+
+2008-04-14 Benjamin Wolsey <address@hidden>
+
        * utilities/processor.cpp: return some fake values for
          System.capabilities requests.
 

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- gui/Player.cpp      14 Apr 2008 08:55:29 -0000      1.101
+++ gui/Player.cpp      14 Apr 2008 09:33:10 -0000      1.102
@@ -563,8 +563,6 @@
     if (event == "System.capabilities.screenDPI")
     {
         std::ostringstream ss;
-        // Whether the pp actively limits the precision or simply
-        // gets a slightly different result isn't clear.
         ss << _gui->getScreenDPI();
         return ss.str();
     }

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- gui/gtk.cpp 14 Apr 2008 08:55:29 -0000      1.170
+++ gui/gtk.cpp 14 Apr 2008 09:33:10 -0000      1.171
@@ -441,8 +441,12 @@
 double
 GtkGui::getScreenDPI()
 {
+#if GTK_CHECK_VERSION(2,10,0)
     GdkScreen* screen = gdk_screen_get_default();
     return gdk_screen_get_resolution(screen);
+#else
+    return 0;
+#endif
 }
 
 // private