diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-02-03 07:03:49 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-02-03 07:03:49 +0800 |
| commit | 18d197f20f16b525b861d2dab67fcce2074fbfc5 (patch) | |
| tree | 647326f45a3ab6a67ad6718938eb9b20410e257e /src/ephy-main.c | |
| parent | b5d229937e31e9cec6cf599ae816e22888237aa0 (diff) | |
| download | gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.tar gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.tar.gz gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.tar.bz2 gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.tar.lz gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.tar.xz gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.tar.zst gsoc2013-epiphany-18d197f20f16b525b861d2dab67fcce2074fbfc5.zip | |
Only claim the DBUS name when not running as private instance.
2006-02-03 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-dbus.c: (ephy_dbus_connect_to_session_bus),
(ephy_dbus_get_property), (ephy_dbus_set_property),
(ephy_dbus_class_init), (_ephy_dbus_startup):
* src/ephy-dbus.h:
* src/ephy-main.c: (main):
Only claim the DBUS name when not running as private instance.
Diffstat (limited to 'src/ephy-main.c')
| -rw-r--r-- | src/ephy-main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index af53d230b..62d5906a4 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -578,7 +578,7 @@ main (int argc, startup_error_quark = g_quark_from_static_string ("epiphany-startup-error"); - if (!_ephy_dbus_startup (&error)) + if (!_ephy_dbus_startup (!private_instance, &error)) { _ephy_dbus_release (); @@ -590,7 +590,8 @@ main (int argc, /* If we're remoting, no need to start up any further services, * just forward the call. */ - if (!_ephy_dbus_is_name_owner ()) + if (!private_instance && + !_ephy_dbus_is_name_owner ()) { /* Create DBUS proxy */ proxy = ephy_dbus_get_proxy (ephy_dbus_get_default (), EPHY_DBUS_SESSION); @@ -627,7 +628,10 @@ main (int argc, /* We're not remoting; start our services */ - if (!ephy_file_helpers_init (NULL, FALSE, FALSE, &error)) + if (!ephy_file_helpers_init (profile_directory, + private_instance, + !keep_profile_directory, + &error)) { _ephy_dbus_release (); |