[Gnash-commit] gnash ChangeLog server/movie_root.h server/movi...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/30 01:09:24

Modified files:
        .              : ChangeLog 
        server         : movie_root.h movie_root.cpp 

Log message:
        assert that movie_root::get_url is never called.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.556&r2=1.557
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -b -r1.556 -r1.557
--- ChangeLog   30 Jul 2006 01:04:18 -0000      1.556
+++ ChangeLog   30 Jul 2006 01:09:24 -0000      1.557
@@ -1,3 +1,8 @@
+2006-07-29 Sandro Santilli <address@hidden>
+
+       * server/movie_root.cpp, server/movie_root.h:
+         assert that movie_root::get_url is never called.
+
 2006-07-29  Rob Savoye  <address@hidden>
 
        * macros/glib.m4: Use pkg-config if it exists.

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/movie_root.h 27 Jul 2006 00:15:22 -0000      1.7
+++ server/movie_root.h 30 Jul 2006 01:09:24 -0000      1.8
@@ -141,7 +141,15 @@
            return m_def->get_file_bytes();
        }
 
-       virtual void get_url(const char *url);
+       virtual void get_url(const char *url) {
+               // SWFHandlers::ActionGetUrl calls get_url
+               // on target, which is always a sprite_instance
+               // (well, a character, at least)
+               assert(0);
+               // @@ delegate to actual sprite instance
+               m_movie->get_url(url);
+       }
+
        virtual int add_interval_timer(void *timer);
        virtual void clear_interval_timer(int x);
        virtual void do_something(void *timer);

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/movie_root.cpp       27 Jul 2006 00:15:22 -0000      1.8
+++ server/movie_root.cpp       30 Jul 2006 01:09:24 -0000      1.9
@@ -52,6 +52,8 @@
 #include "sprite_instance.h"
 #include "render.h"
 
+#include <cassert>
+
 using namespace std;
 
 namespace gnash
@@ -174,17 +176,22 @@
     *buttons = m_mouse_buttons;
 }
 
+#if 0 // see comments in movie_root.h
 void
 movie_root::get_url(const char *url)
 {
     GNASH_REPORT_FUNCTION;
     
+       // nobody should use this function
+       assert(0);
+    
     string command = "mozilla -remote \"openurl";
     command += url;
     command += ")\"";
     dbglogfile << "Launching URL... " << command << endl;
     system(command.c_str());
 }      
+#endif
 
 int
 movie_root::add_interval_timer(void *timer)