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

Proposed by eyelash on 2012-06-18
Status: Merged
Merged at revision: 274
Proposed branch: lp:~eyelash/granite/fix-960215
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 25 lines (+0/-8)
1 file modified
lib/Application.vala (+0/-8)
To merge this branch: bzr merge lp:~eyelash/granite/fix-960215
Reviewer Review Type Date Requested Status
Cody Garver 2012-06-18 Approve on 2012-06-18
Review via email: mp+110741@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Avi Romanoff (aroman) wrote :

+1 from me.

Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
66 prctl (15, exec_name, 0, 0, 0);66 prctl (15, exec_name, 0, 0, 0);
67 Environment.set_prgname (exec_name);67 Environment.set_prgname (exec_name);
6868
69 Posix.signal (Posix.SIGINT, sig_handler);
70 Posix.signal (Posix.SIGTERM, sig_handler);
71
72 Logger.initialize (program_name);69 Logger.initialize (program_name);
73 Logger.DisplayLevel = LogLevel.INFO;70 Logger.DisplayLevel = LogLevel.INFO;
74 message ("%s version: %s", program_name, build_version);71 message ("%s version: %s", program_name, build_version);
@@ -110,11 +107,6 @@
110 { null }107 { null }
111 };108 };
112109
113 protected static void sig_handler (int sig) {
114 warning ("Caught signal (%d), exiting", sig);
115 Gtk.main_quit ();
116 }
117
118 protected virtual void set_options () {110 protected virtual void set_options () {
119111
120 if (DEBUG)112 if (DEBUG)

Subscribers

People subscribed via source and target branches