SF.net SVN: openvrml:[4081] trunk

[<br...@us...>]

Revision: 4081
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4081&view=rev
Author:   braden
Date:     2010-02-06 04:39:52 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Don't add a reference when constructing the intrusive_ptr to put in the controls_map.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/browserfactory.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-06 04:24:05 UTC (rev 4080)
+++ trunk/ChangeLog	2010-02-06 04:39:52 UTC (rev 4081)
@@ -1,5 +1,14 @@
 2010-02-05 Braden McDaniel  <br...@en...>
 
+	* src/openvrml-xembed/browserfactory.cpp
+	(openvrml_xembed_browser_factory_create_control(
+	OpenvrmlXembedBrowserFactory *, const char *, const char *,
+	guint64, gboolean, DBusGMethodInvocation *)): Don't add a
+	reference when constructing the intrusive_ptr to put in the
+	controls_map.
+
+2010-02-05 Braden McDaniel  <br...@en...>
+
 	* src/openvrml-xembed/main.cpp
 	(dbus_thread_loop::operator()() const): Terminating a variable
 	argument list with plain 0 is not 64-bit-safe.

Modified: trunk/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- trunk/src/openvrml-xembed/browserfactory.cpp	2010-02-06 04:24:05 UTC (rev 4080)
+++ trunk/src/openvrml-xembed/browserfactory.cpp	2010-02-06 04:39:52 UTC (rev 4081)
@@ -334,10 +334,12 @@
     bool succeeded;
     try {
         using std::make_pair;
+        static const bool add_ref = false;
         succeeded =
             (*control_factory->priv->hosts)[sender].insert(
                 make_pair(control_obj_path,
-                          boost::intrusive_ptr<GObject>(G_OBJECT(browser))))
+                          boost::intrusive_ptr<GObject>(G_OBJECT(browser),
+                                                        add_ref)))
             .second;
         g_debug("inserted reference to %s", sender);
     } catch (std::bad_alloc & ex) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.