summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2003-09-03 05:47:50 +0000
committerShaun McCance <shaunm@src.gnome.org>2003-09-03 05:47:50 +0000
commiteffce106c2c007f966a918bb2fdf94fb4cc484f3 (patch)
tree9ab4a92dcc1bab8c90bb5d508cedd5bbe1bf3dc0
parentd0ca78a6be1f8218a3038b7e19c0a62e0b39e9b6 (diff)
downloadyelp-effce106c2c007f966a918bb2fdf94fb4cc484f3.tar.gz
- Fix from alexl for forkbomb when DISPLAY is set.
* src/yelp-main.c: - Fix from alexl for forkbomb when DISPLAY is set.
-rw-r--r--ChangeLog5
-rw-r--r--src/yelp-main.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 07390d03..ae4e9e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-03 Shaun McCance <shaunm@wolfram.com>
+
+ * src/yelp-main.c:
+ - Fix from alexl for forkbomb when DISPLAY is set.
+
2003-09-01 Shaun McCance <shaunm@wolfram.com>
* configure.in: Version 2.3.90
diff --git a/src/yelp-main.c b/src/yelp-main.c
index b9f73218..13e0cc4f 100644
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@ -324,6 +324,11 @@ main (int argc, char **argv)
GNOME_PROGRAM_STANDARD_PROPERTIES,
NULL);
+ /* Need to set this to the canonical DISPLAY value, since
+ that's where we're registering per-display components */
+ bonobo_activation_set_activation_env_value ("DISPLAY",
+ gdk_display_get_name (gdk_display_get_default ()));
+
gnome_vfs_init ();
/* Commandline parsing is done here */