SF.net SVN: openvrml:[3745] trunk

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

Revision: 3745
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3745&view=rev
Author:   braden
Date:     2008-10-23 06:34:43 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
Removed redundant registration of the OpenvrmlXembedBrowserFactory instance.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/mozilla-plugin/src/openvrml.cpp
    trunk/src/openvrml-player/curlbrowserhost.cpp
    trunk/src/openvrml-xembed/main.cpp

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/ChangeLog	2008-10-23 06:34:43 UTC (rev 3745)
@@ -1,5 +1,22 @@
 2008-10-23 Braden McDaniel  <br...@en...>
 
+	Removed redundant registration of the OpenvrmlXembedBrowserFactory
+	instance.
+
+	* src/openvrml-xembed/main.cpp
+	(main(int, char *[])): Removed redundant registration of the
+	OpenvrmlXembedBrowserFactory instance.
+	* src/openvrml-player/curlbrowserhost.cpp
+	(get_browser(DBusGConnection *, const char *, const char *,
+	guint64, GError **)): Proper factory object path is
+	"org/openvrml/BrowserFactory".
+	* mozilla-plugin/src/openvrml.cpp
+	(get_browser(DBusGConnection *, const char *, const char *,
+	guint64, GError **)): Proper factory object path is
+	"org/openvrml/BrowserFactory".
+
+2008-10-23 Braden McDaniel  <br...@en...>
+
 	Require Automake 1.10.1.
 
 	* configure.ac: Require Automake 1.10.1.

Modified: trunk/mozilla-plugin/src/openvrml.cpp
===================================================================
--- trunk/mozilla-plugin/src/openvrml.cpp	2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/mozilla-plugin/src/openvrml.cpp	2008-10-23 06:34:43 UTC (rev 3745)
@@ -1162,7 +1162,7 @@
         DBusGProxy * browser_factory =
             dbus_g_proxy_new_for_name(connection,
                                       "org.openvrml.BrowserControl",
-                                      "/BrowserFactory",
+                                      "/org/openvrml/BrowserFactory",
                                       "org.openvrml.BrowserFactory");
         g_return_val_if_fail(browser_factory, 0);
         scope_guard browser_factory_guard =


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743

Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp	2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp	2008-10-23 06:34:43 UTC (rev 3745)
@@ -855,7 +855,7 @@
         DBusGProxy * browser_factory =
             dbus_g_proxy_new_for_name(connection,
                                       "org.openvrml.BrowserControl",
-                                      "/BrowserFactory",
+                                      "/org/openvrml/BrowserFactory",
                                       "org.openvrml.BrowserFactory");
         g_return_val_if_fail(browser_factory, 0);
         scope_guard browser_factory_guard =

Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp	2008-10-23 06:12:01 UTC (rev 3744)
+++ trunk/src/openvrml-xembed/main.cpp	2008-10-23 06:34:43 UTC (rev 3745)
@@ -102,10 +102,6 @@
 //        make_guard(g_object_unref, G_OBJECT(browser_factory));
 //    boost::ignore_unused_variable_warning(browser_factory_guard);
 
-    dbus_g_connection_register_g_object(bus,
-                                        "/BrowserFactory",
-                                        G_OBJECT(browser_factory));
-
     gdk_threads_enter();
     gtk_main();
     gdk_threads_leave();


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