summaryrefslogtreecommitdiff
path: root/devel/bonobo-activation/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/bonobo-activation/files')
-rw-r--r--devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c12
-rw-r--r--devel/bonobo-activation/files/patch-server::Makefile.in4
-rw-r--r--devel/bonobo-activation/files/patch-server::activation-server-main.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
index e3db3eedc374..db8d816a89d2 100644
--- a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
+++ b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
@@ -1,11 +1,11 @@
---- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Nov 8 03:19:52 2002
-+++ bonobo-activation/bonobo-activation-fork-server.c Fri Nov 8 03:20:04 2002
-@@ -396,6 +396,8 @@
+--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Oct 18 06:15:11 2002
++++ bonobo-activation/bonobo-activation-fork-server.c Sat Oct 19 15:35:03 2002
+@@ -364,6 +364,8 @@
} else if ((childpid = fork ())) {
_exit (0); /* de-zombifier process, just exit */
} else {
+ sigprocmask (SIG_SETMASK, &omask, NULL);
+
- if (display)
- bonobo_activation_setenv ("DISPLAY", display);
- if (session_manager)
+ setenv_activation_environment (environment);
+
+ if (od_iorstr != NULL) {
diff --git a/devel/bonobo-activation/files/patch-server::Makefile.in b/devel/bonobo-activation/files/patch-server::Makefile.in
index aad85b8a56c8..80acb58f6dd8 100644
--- a/devel/bonobo-activation/files/patch-server::Makefile.in
+++ b/devel/bonobo-activation/files/patch-server::Makefile.in
@@ -1,5 +1,5 @@
---- server/Makefile.in.orig Fri Nov 8 03:18:57 2002
-+++ server/Makefile.in Fri Nov 8 03:19:22 2002
+--- server/Makefile.in.orig Sat Oct 19 15:35:36 2002
++++ server/Makefile.in Sat Oct 19 15:37:02 2002
@@ -154,7 +154,7 @@
-I$(top_builddir) \
-I$(top_builddir)/bonobo-activation \
diff --git a/devel/bonobo-activation/files/patch-server::activation-server-main.c b/devel/bonobo-activation/files/patch-server::activation-server-main.c
index a6c4e34fa107..56d3537786c3 100644
--- a/devel/bonobo-activation/files/patch-server::activation-server-main.c
+++ b/devel/bonobo-activation/files/patch-server::activation-server-main.c
@@ -1,6 +1,6 @@
---- server/activation-server-main.c.orig Tue Oct 29 05:51:19 2002
-+++ server/activation-server-main.c Fri Nov 8 03:21:04 2002
-@@ -131,7 +131,7 @@
+--- server/activation-server-main.c.orig Fri Oct 18 06:15:12 2002
++++ server/activation-server-main.c Sat Nov 9 01:50:36 2002
+@@ -127,7 +127,7 @@
g_string_append (gnome_od_source_dir,
gnome_dirs[i]);
g_string_append (gnome_od_source_dir,