Merge lp:~eyelash/granite/fix-960215 into lp:~elementary-pantheon/granite/granite

[eyelash]

Granite handles SIGINT and SIGTERM and calls Gtk.main_quit() whenever such a signal is received. Gtk however generates an error message (gtk_main_quit: assertion `main_loops != NULL' failed) most probably because it already quit its main loop. This branch removes the handling of SIGINT and SIGTERM from Granite.

[Avi Romanoff (aroman)]

+1 from me.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'lib/Application.vala'
--- lib/Application.vala	2012-03-16 15:52:01 +0000
+++ lib/Application.vala	2012-06-18 08:18:21 +0000
@@ -66,9 +66,6 @@
             prctl (15, exec_name, 0, 0, 0);
             Environment.set_prgname (exec_name);
 
-            Posix.signal (Posix.SIGINT, sig_handler);
-            Posix.signal (Posix.SIGTERM, sig_handler);
-
             Logger.initialize (program_name);
             Logger.DisplayLevel = LogLevel.INFO;
             message ("%s version: %s", program_name, build_version);
@@ -110,11 +107,6 @@
             { null }
         };
 
-        protected static void sig_handler (int sig) {
-            warning ("Caught signal (%d), exiting", sig);
-            Gtk.main_quit ();
-        }
-
         protected virtual void set_options () {
 
             if (DEBUG)