|
From: <br...@us...> - 2008-10-05 08:25:45
|
Revision: 3718
http://openvrml.svn.sourceforge.net/openvrml/?rev=3718&view=rev
Author: braden
Date: 2008-10-05 06:57:26 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
Need to use dbus_g_proxy_new_for_name rather than _new_for_name_owner in order for activation to work.
Modified Paths:
--------------
trunk/ChangeLog
trunk/mozilla-plugin/src/openvrml.cpp
trunk/src/openvrml-player/curlbrowserhost.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
/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
/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-05 06:50:53 UTC (rev 3717)
+++ trunk/ChangeLog 2008-10-05 06:57:26 UTC (rev 3718)
@@ -1,3 +1,17 @@
+2008-10-05 Braden McDaniel <br...@en...>
+
+ Need to use dbus_g_proxy_new_for_name rather than
+ _new_for_name_owner in order for activation to work.
+
+ * mozilla-plugin/src/openvrml.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Use dbus_g_proxy_new_for_name to get the
+ org.openvrml.BrowserFactory proxy.
+ * src/openvrml-player/curlbrowserhost.cpp
+ (get_browser(DBusGConnection *, const char *, const char *,
+ guint64, GError **)): Use dbus_g_proxy_new_for_name to get the
+ org.openvrml.BrowserFactory proxy.
+
2008-10-04 Braden McDaniel <br...@en...>
If we set the absolute path of session_bus_servicesdir, the
Modified: trunk/mozilla-plugin/src/openvrml.cpp
===================================================================
--- trunk/mozilla-plugin/src/openvrml.cpp 2008-10-05 06:50:53 UTC (rev 3717)
+++ trunk/mozilla-plugin/src/openvrml.cpp 2008-10-05 06:57:26 UTC (rev 3718)
@@ -1160,11 +1160,10 @@
throw ()
{
DBusGProxy * browser_factory =
- dbus_g_proxy_new_for_name_owner(connection,
- "org.openvrml.BrowserControl",
- "/BrowserFactory",
- "org.openvrml.BrowserFactory",
- error);
+ dbus_g_proxy_new_for_name(connection,
+ "org.openvrml.BrowserControl",
+ "/BrowserFactory",
+ "org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
scope_guard browser_factory_guard =
make_guard(g_object_unref, G_OBJECT(browser_factory));
Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713
+ /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717
Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717
Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.h:3713
+ /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717
Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713
+ /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717
Modified: trunk/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- trunk/src/openvrml-player/curlbrowserhost.cpp 2008-10-05 06:50:53 UTC (rev 3717)
+++ trunk/src/openvrml-player/curlbrowserhost.cpp 2008-10-05 06:57:26 UTC (rev 3718)
@@ -853,11 +853,10 @@
throw ()
{
DBusGProxy * browser_factory =
- dbus_g_proxy_new_for_name_owner(connection,
- "org.openvrml.BrowserControl",
- "/BrowserFactory",
- "org.openvrml.BrowserFactory",
- error);
+ dbus_g_proxy_new_for_name(connection,
+ "org.openvrml.BrowserControl",
+ "/BrowserFactory",
+ "org.openvrml.BrowserFactory");
g_return_val_if_fail(browser_factory, 0);
scope_guard browser_factory_guard =
make_guard(g_object_unref, G_OBJECT(browser_factory));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|