[Xfce4-commits] <xfce4-mailwatch-plugin:master> Fix SIGUSR2 signal handling

[Ján Sučan]

Updating branch refs/heads/master
         to ea8a85352b6e5f01b0f41ac469706465618d7c39 (commit)
       from 32d3845ffa09d1ef7d1051e4e19139ab6860e6e3 (commit)

commit ea8a85352b6e5f01b0f41ac469706465618d7c39
Author: Ján Sučan <sucan at runbox.com>
Date:   Tue Oct 8 16:07:45 2013 +0200

    Fix SIGUSR2 signal handling
    
    Delete #ifdef/#endif lines. Required version of libxfce4util library contains
    needed function(s).

 panel-plugin/mailwatch-plugin.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 1f581ed..04ee650 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -1056,7 +1056,6 @@ mailwatch_show_about(XfcePanelPlugin *plugin,
         g_object_unref(G_OBJECT(icon));
 }
 
-#ifdef HAVE_XFCE_POSIX_SIGNAL_HANDLER_INIT
 static void
 mailwatch_handle_sigusr2(gint     signal_,
                          gpointer user_data)
@@ -1064,7 +1063,6 @@ mailwatch_handle_sigusr2(gint     signal_,
     XfceMailwatchPlugin *mwp = user_data;
     xfce_mailwatch_force_update(mwp->mailwatch);
 }
-#endif
 
 static void
 mailwatch_construct(XfcePanelPlugin *plugin)
@@ -1085,7 +1083,6 @@ mailwatch_construct(XfcePanelPlugin *plugin)
     
     mailwatch_read_config(plugin, mwp);
 
-#ifdef HAVE_XFCE_POSIX_SIGNAL_HANDLER_INIT
     if(xfce_posix_signal_handler_init(NULL)) {
         GError *error = NULL;
 
@@ -1097,9 +1094,7 @@ mailwatch_construct(XfcePanelPlugin *plugin)
             g_error_free(error);
             sigaction(SIGUSR2, &sa, NULL);
         }
-    } else
-#endif
-    {
+    } else {
         g_warning("failed to init POSIX signal handler helper");
         sigaction(SIGUSR2, &sa, NULL);
     }