Merge pull request #1250 from wenningerk/fix_for_older_glib2

Fix: pacemaker_remoted: Allow compilation with glib older 2.36
ClusterLabs · Mar 21, 2017 · 8a3fbff · 8a3fbff
2 parents 41e0838 + 3246a23
commit 8a3fbff
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/lrmd/main.c b/lrmd/main.c
@@ -382,12 +382,8 @@ void handle_shutdown_nack()
     if (shutting_down) {
         crm_info("Received shutdown nack");
         if (shutdown_ack_timer > 0) {
-            GSource *timer =
-                g_main_context_find_source_by_id(NULL, shutdown_ack_timer);
-
-            if (timer != NULL) {
-                g_source_set_ready_time(timer, 0);
-            }
+            g_source_remove(shutdown_ack_timer);
+            shutdown_ack_timer = g_timeout_add(0, lrmd_exit, NULL);
         }
         return;
     }