Updating branch refs/heads/master
to fa5c3a0abf5a499dc123b337124689a414c85a76 (commit)
from 69fcad9d68973ed8e7c3d76ee12f43300a1e8291 (commit)
commit fa5c3a0abf5a499dc123b337124689a414c85a76
Author: Nick Schermer <n...@xfce.org>
Date: Sat Jan 15 16:01:32 2011 +0100
Revert "xfce_spawn_startup_watch: do not mess with the marshaller the user
set up."
Firt of all this is breaking master 1 day before the release, secondly its
wrong, because we always return the exit_status.
libxfce4ui/xfce-spawn.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libxfce4ui/xfce-spawn.c b/libxfce4ui/xfce-spawn.c
index 3b4e108..731ffb2 100644
--- a/libxfce4ui/xfce-spawn.c
+++ b/libxfce4ui/xfce-spawn.c
@@ -154,7 +154,7 @@ xfce_spawn_startup_watch (GPid pid,
g_value_init (&instance_and_params[1], G_TYPE_INT);
g_value_set_int (&instance_and_params[1], status);
- /*the caller, not us, needs to do: g_closure_set_marshal
(spawn_data->closure, g_cclosure_marshal_VOID__INT);*/
+ g_closure_set_marshal (spawn_data->closure,
g_cclosure_marshal_VOID__INT);
g_closure_invoke (spawn_data->closure, NULL,
2, instance_and_params, NULL);
@@ -245,7 +245,7 @@ xfce_spawn_get_active_workspace_number (GdkScreen *screen)
/**
- * xfce_spawn_on_screen_with_child_watch:
+ * xfce_spawn_on_screen_with_closure:
* @screen : a #GdkScreen or %NULL to use the active screen,
* see xfce_gdk_screen_get_active().
* @working_directory : child's current working directory or %NULL to
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
