[Xfce4-commits] <xfce4-panel:xfce-4.8> Panel: Avoid recursing gtk_main_quit() on signal.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to a381318146e6c51a81e86e9b1797cb121f7f1751 (commit)
       from 9d0653ae37b22bdc6530c96a25d9cf63d1cf0867 (commit)

commit a381318146e6c51a81e86e9b1797cb121f7f1751
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 27 12:17:21 2011 +0200

    Panel: Avoid recursing gtk_main_quit() on signal.
    
    (cherry picked from commit 8af0d7e284670e24da47d8f1e96e5f35a7e445d8)

 panel/main.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/panel/main.c b/panel/main.c
index 67ad6a2..76c851a 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -121,6 +121,14 @@ panel_callback_handler (const gchar  *name,
 static void
 panel_signal_handler (gint signum)
 {
+  static gboolean was_triggered = FALSE;
+
+  /* avoid recursing this handler if we receive a
+   * signal before the mainloop is started */
+  if (was_triggered)
+    return;
+  was_triggered = TRUE;
+
   panel_debug (PANEL_DEBUG_MAIN,
                "received signal %s <%d>, %s panel",
                g_strsignal (signum), signum,