[Pkg-utopia-commits] r1520 - in /packages/unstable/dbus/debian: changelog patches/02_dbus_monitor_no_sigint_handler.patch

Tue Jun 12 22:29:02 UTC 2007

Author: biebl
Date: Tue Jun 12 22:29:02 2007
New Revision: 1520

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1520
Log:
 * debian/patches/02_dbus_monitor_no_sigint_handler.patch 
   + Remove the sigint_handler in dbus-monitor so the application properly
     terminates on STRG+C. (Closes: #414139)


Added:
    packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
Modified:
    packages/unstable/dbus/debian/changelog

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1520&op=diff
==============================================================================

--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Tue Jun 12 22:29:02 2007
@@ -1,3 +1,11 @@
+dbus (1.1.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/02_dbus_monitor_no_sigint_handler.patch 
+    + Remove the sigint_handler in dbus-monitor so the application properly
+      terminates on STRG+C. (Closes: #414139)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 13 Jun 2007 00:24:07 +0200
+
 dbus (1.1.0-1) unstable; urgency=low
 
   [ Sjoerd Simons ]

Added: packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch?rev=1520&op=file
==============================================================================
--- packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch (added)
+++ packages/unstable/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch Tue Jun 12 22:29:02 2007
@@ -1,0 +1,41 @@
+diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
+index 9f7da5b..c66186f 100644
+--- a/tools/dbus-monitor.c
++++ b/tools/dbus-monitor.c
+@@ -33,8 +33,6 @@
+ 
+ #include <time.h>
+ 
+-#include <signal.h>
+-
+ #include "dbus-print-message.h"
+ 
+ #ifdef DBUS_WIN
+@@ -195,14 +193,6 @@ usage (char *name, int ecode)
+   exit (ecode);
+ }
+ 
+-dbus_bool_t sigint_received = FALSE;
+-
+-static void
+-sigint_handler (int signum)
+-{
+-  sigint_received = TRUE;
+-}
+-
+ int
+ main (int argc, char *argv[])
+ {
+@@ -294,11 +284,7 @@ main (int argc, char *argv[])
+     fprintf (stderr, "Couldn't add filter!\n");
+     exit (1);
+   }
+-
+-  /* we handle SIGINT so exit() is reached and flushes stdout */
+-  signal (SIGINT, sigint_handler);
+-  while (dbus_connection_read_write_dispatch(connection, -1)
+-          && !sigint_received)
++  while (dbus_connection_read_write_dispatch(connection, -1))
+     ;
+   exit (0);
+  lose:


