summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2009-11-20 11:34:50 -0500
committerRay Strode <rstrode@redhat.com>2009-11-20 11:34:50 -0500
commitdb37deb589ea6d65611fb27ab1908196ad5d1930 (patch)
treefcb6a65a3f4619065367adb60e57d7877b6c50fa /src/include
parentec7a3c516d36921d49fc757d6afae5e88731f47f (diff)
downloadmetacity-db37deb589ea6d65611fb27ab1908196ad5d1930.tar.gz
metacity-db37deb589ea6d65611fb27ab1908196ad5d1930.tar.bz2
Fix handling of SIGCHLD
The commit that removed metacity-dialog added a global SIGCHLD handler that caused problems by (a) calling waitpid(-1) and thus breaking g_child_watch for everyone else, and (b) doing too much from a signal handler and sometimes causing deadlocks (bug 596200). This removes the global handler and has each zenity user create its own child watch to watch for exit. (It also fixes the window class of the zenity dialogs, so that meta_window_present_delete_dialog() will work again.)
Diffstat (limited to 'src/include')
-rw-r--r--src/include/util.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/include/util.h b/src/include/util.h
index 6fe0ff0..3798763 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -131,28 +131,6 @@ GPid meta_show_dialog (const char *type,
#endif /* !WITH_VERBOSE_MODE */
-#include <glib-object.h>
-
-#define META_TYPE_NEXUS (meta_nexus_get_type ())
-#define META_NEXUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_NEXUS, MetaNexus))
-#define META_NEXUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_NEXUS, MetaNexusClass))
-#define META_IS_NEXUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_NEXUS))
-#define META_IS_NEXUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_NEXUS))
-#define META_NEXUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_NEXUS, MetaNexusClass))
-
-typedef struct _MetaNexus
-{
- GObject parent_instance;
-} MetaNexus;
-
-typedef struct _MetaNexusClass
-{
- GObjectClass parent_class;
-} MetaNexusClass;
-
-GType meta_nexus_get_type (void) G_GNUC_CONST;
-MetaNexus *meta_nexus_new ();
-
/**
* An object which exists purely to attach signals to; this is to receive
* signals when a child process exits. The signal is "sigchld" with no detail.