summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2002-11-07 23:27:46 +0000
committerMark McLoughlin <markmc@src.gnome.org>2002-11-07 23:27:46 +0000
commit4a22e5072711d3f3e70764e0277b20da5f87b104 (patch)
tree8e3998a8f280e0a1ab803a41e7727f0dc91c41ee
parentcf659c8882cf761ff3a9a3dc80470941f66f9415 (diff)
downloadyelp-4a22e5072711d3f3e70764e0277b20da5f87b104.tar.gz
register yelp with bonobo-activation server on a per-display basis so that
2002-11-08 Mark McLoughlin <mark@skynet.ie> * src/yelp-main.c: (main): register yelp with bonobo-activation server on a per-display basis so that we get a new instace per display/screen. Fixes #91983.
-rw-r--r--ChangeLog7
-rw-r--r--src/yelp-main.c14
2 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 81bb035b..8f561c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-08 Mark McLoughlin <mark@skynet.ie>
+
+ * src/yelp-main.c: (main): register yelp with
+ bonobo-activation server on a per-display basis
+ so that we get a new instace per display/screen.
+ Fixes #91983.
+
2002-11-03 Dmitry G. Mastrukov <dmitry@taurussoft.org>
* configure.in: Added Belarusian to ALL_LINGUAS
diff --git a/src/yelp-main.c b/src/yelp-main.c
index c0cff108..2005996c 100644
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@ -309,13 +309,17 @@ main (int argc, char **argv)
flag = TRUE;
}
- if (!factory) {
- BonoboGenericFactory *factory;
- /* Not started, start now */
-
- factory = bonobo_generic_factory_new (YELP_FACTORY_OAFIID,
+ if (!factory) { /* Not started, start now */
+ BonoboGenericFactory *factory;
+ char *registration_id;
+
+ registration_id = bonobo_activation_make_registration_id (
+ YELP_FACTORY_OAFIID,
+ gdk_display_get_name (gdk_display_get_default ()));
+ factory = bonobo_generic_factory_new (registration_id,
main_base_factory,
NULL);
+ g_free (registration_id);
bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));