Changeset 9358

Timestamp:

Oct 22, 2009, 2:25:26 AM (13 years ago)

Author:

charles

Message:

(1.7x) backports for 1.76: r9196 #2454: gtk client handles SIGINT (ctrl-c) wrong

Location:

branches/1.7x

Files:

• NEWS (modified) (1 diff)
• gtk/main.c (modified) (3 diffs)

branches/1.7x/NEWS

@@ -4 +4 @@
   * Use automake's "quieter builds" rule when available
 ==== GTK+ ====
+  * Fix broken SIGINT (ctrl-c) handling
+  * Fix tray menu's main window status when Transmission is started minimized
   * Fix 1.61 build failure on systems with new versions of glib but older versions of gtk
-  * Fix tray menu's main window status when Transmission is started minimized
 
 === Transmission 1.75 (2009/09/13) ===

branches/1.7x/gtk/main.c

@@ -260 +260 @@
 
 static sig_atomic_t global_sigcount = 0;
-
-static void
-fatalsig( int sig )
-{
-    /* revert to default handler after this many */
-    static const int SIGCOUNT_MAX = 3;
-
-    if( ++global_sigcount >= SIGCOUNT_MAX )
+static struct cbdata * sighandler_cbdata = NULL;
+
+static void
+signal_handler( int sig )
+{
+    if( ++global_sigcount > 1 )
     {
         signal( sig, SIG_DFL );
         raise( sig );
     }
+    else switch( sig )
+    {
+        case SIGINT:
+            g_message( _( "Got signal %d; trying to shut down cleanly.  Do it again if it gets stuck." ), sig );
+            doAction( "quit", sighandler_cbdata );
+            break;
+    }
 }
 
@@ -277 +282 @@
 setupsighandlers( void )
 {
-#ifdef G_OS_WIN32
-    const int sigs[] = { SIGINT, SIGTERM };
-#else
-    const int sigs[] = { SIGHUP, SIGINT, SIGQUIT, SIGTERM };
-#endif
-    guint     i;
-
-    for( i = 0; i < G_N_ELEMENTS( sigs ); ++i )
-        signal( sigs[i], fatalsig );
+    signal( SIGINT, signal_handler );
 }
 
@@ -435 +432 @@
         struct cbdata * cbdata = g_new0( struct cbdata, 1 );
 
+        sighandler_cbdata = cbdata;
+
         /* ensure the directories are created */
-       if(( str = pref_string_get( PREF_KEY_DIR_WATCH )))
-           gtr_mkdir_with_parents( str, 0777 );
-       if(( str = pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR )))
-           gtr_mkdir_with_parents( str, 0777 );
+        if(( str = pref_string_get( PREF_KEY_DIR_WATCH )))
+            gtr_mkdir_with_parents( str, 0777 );
+        if(( str = pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR )))
+            gtr_mkdir_with_parents( str, 0777 );
 
         /* initialize the libtransmission session */