[Gnash-commit] /srv/bzr/gnash/trunk r12087: Not sure what this commit will do, I'm basically fighting with bazaar.

[Sandro Santilli]

------------------------------------------------------------
revno: 12087 [merge]
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-20 21:46:18 +0100
message:
  Not sure what this commit will do, I'm basically fighting with bazaar.
modified:
  plugin/npapi/Makefile.am
  plugin/npapi/plugin.cpp

=== modified file 'plugin/npapi/Makefile.am'
--- a/plugin/npapi/Makefile.am  2010-03-19 19:22:45 +0000
+++ b/plugin/npapi/Makefile.am  2010-03-19 22:41:34 +0000
@@ -40,13 +40,7 @@
         -I$(top_srcdir)/librender \
        -I$(srcdir)/mozilla-sdk \
        -I$(srcdir)/mozilla-sdk/include \
-       $(GLIB_CFLAGS) \
-       $(X11_CFLAGS) \
-       $(GTK2_CFLAGS) \
-        $(CAIRO_CFLAGS) \
         $(GLIB_CFLAGS) \
-        $(ATK_CFLAGS) \
-        $(PANGO_CFLAGS) \
        $(NULL)
 
 # AM_CXXFLAGS = $(AM_CPPFLAGS)

=== modified file 'plugin/npapi/plugin.cpp'
--- a/plugin/npapi/plugin.cpp   2010-03-19 19:22:45 +0000
+++ b/plugin/npapi/plugin.cpp   2010-03-20 20:33:47 +0000
@@ -823,7 +823,7 @@
 }
 
 void
-create_standalone_launcher(const std::string& page_url, const std::string& 
swf_url)
+create_standalone_launcher(const std::string& page_url, const std::string& 
swf_url, const std::map<std::string, std::string>& params)
 {
 #ifdef CREATE_STANDALONE_GNASH_LAUNCHER
     if (!createSaLauncher) {
@@ -850,6 +850,13 @@
         saLauncher << "-U '" << page_url << "' ";
     }
 
+    for (std::map<std::string,std::string>::const_iterator it = params.begin(),
+        itEnd = params.end(); it != itEnd; ++it) {
+        const std::string& nam = it->first; 
+        const std::string& val = it->second;
+        saLauncher << "-P '" << nam << "=" << val << "' ";
+    }
+
     saLauncher << "'" << swf_url << "' "
                << "$@"       // allow caller to pass any additional argument
                << std::endl;
@@ -903,7 +910,7 @@
     }
     arg_vec.push_back("-");
 
-    create_standalone_launcher(pageurl, _swf_url);
+    create_standalone_launcher(pageurl, _swf_url, _params);
 
     return arg_vec;
 }
@@ -1043,7 +1050,7 @@
         _ichanWatchId = g_io_add_watch(_ichan, 
                 (GIOCondition)(G_IO_IN|G_IO_HUP), 
                 (GIOFunc)handlePlayerRequestsWrapper, this);
-        g_io_channel_unref(_ichan);
+        //g_io_channel_unref(_ichan); // we'll unref on destruction
         return;
     }