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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/11 17:26:33

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

Log message:
        Cleanup code to use available functions, missing returns etc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5876&r2=1.5877
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.155&r2=1.156

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5876
retrieving revision 1.5877
diff -u -b -r1.5876 -r1.5877
--- ChangeLog   11 Mar 2008 17:18:43 -0000      1.5876
+++ ChangeLog   11 Mar 2008 17:26:32 -0000      1.5877
@@ -1,3 +1,7 @@
+2008-03-11 Benjamin Wolsey <address@hidden>
+
+       * gui/gtk.cpp, gui/Player.cpp: minor code cleanups.
+
 2008-03-11 Sandro Santilli <address@hidden>
 
        * server/vm/ASHandlers.cpp (ActionCallFunction): only

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- gui/Player.cpp      11 Mar 2008 16:58:23 -0000      1.87
+++ gui/Player.cpp      11 Mar 2008 17:26:32 -0000      1.88
@@ -205,7 +205,7 @@
 movie_definition* 
 Player::load_movie()
 {
-       gnash::movie_definition* md=NULL;
+       gnash::movie_definition* md = NULL;
 
        RcInitFile& rcfile = RcInitFile::getDefaultInstance();
        URL vurl(_url);
@@ -350,11 +350,10 @@
 
     if ( ! _width || ! _height )
     {
-        //log_error(_("Input movie has collapsed dimensions " SIZET_FMT "/" 
SIZET_FMT ". Giving up."), width, height);
-        log_debug(_("Input movie has collapsed dimensions " SIZET_FMT "/" 
SIZET_FMT ". Setting to 1/1 and going on."), _width, _height);
+        log_debug(_("Input movie has collapsed dimensions " SIZET_FMT "/"
+                SIZET_FMT ". Setting to 1/1 and going on."), _width, _height);
        if ( ! _width ) _width = 1;
        if ( ! _height ) _height = 1;
-       //return EXIT_FAILURE;
     }
 
     // Now that we know about movie size, create gui window.
@@ -444,6 +443,7 @@
        if (noCaseCompare(command, "exec"))
        {
         log_unimpl(_("FScommand exec called with argument %s"), args);
+        return;
        }
 
        // FSCommand allowscale

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- gui/gtk.cpp 11 Mar 2008 16:58:23 -0000      1.155
+++ gui/gtk.cpp 11 Mar 2008 17:26:33 -0000      1.156
@@ -124,7 +124,7 @@
 
     _drawingArea = gtk_drawing_area_new();
 
-    // IF we don't set this flag we won't be able to grab focus
+    // If we don't set this flag we won't be able to grab focus
     // ( grabFocus() would be a no-op )
     GTK_WIDGET_SET_FLAGS (GTK_WIDGET(_drawingArea), GTK_CAN_FOCUS);
 
@@ -254,7 +254,7 @@
         _overlay = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         addGnashIcon(GTK_WINDOW(_overlay));
         gtk_window_fullscreen(GTK_WINDOW(_overlay));
-        log_debug (_("Created fullscreen window"));
+        //log_debug (_("Created fullscreen window"));
         
         // Reparent drawing area from GtkPlug to fullscreen window
         gtk_widget_realize(_overlay);      
@@ -298,16 +298,14 @@
         setupWindowEvents();
         if (_overlay) {
             gtk_widget_destroy(_overlay);
-            log_debug (_("Destroyed fullscreen window"));
+            //log_debug (_("Destroyed fullscreen window"));
         }        
     }
     
     // Stand-alone
     else {
        gtk_window_unfullscreen(GTK_WINDOW(_window));
-       if (_menubar) {
-           gtk_widget_show(_menubar);
-       }
+           showMenu(true);
     }
     
     _fullscreen = false;
@@ -351,7 +349,9 @@
 GtkGui::showMouse(bool show)
 {
 
-    if (!show && _mouseShown)
+    if (show == _mouseShown) return;
+
+    if (!show)
     {
         GdkPixmap *pixmap;
         GdkColor *color;
@@ -370,7 +370,7 @@
         _mouseShown = false;
 
     }
-       else if (show && !_mouseShown)
+       else if (show)
     {
         _mouseShown = true;    
     }