Merge lp:~laney/whoopsie/source into lp:whoopsie

[Iain Lane]

Use G_SOURCE_* macros for clarity

Don't call g_main_loop_quit as a GSourceFunc directly, it has the wrong return type. Need to remove the source explicitly.

[Lars Karlitski (larsu)]

Looks good, thanks!

review: Approve

[Evan (ev)]

Thank you for this.

review: Approve

[lp:~laney/whoopsie/source]

641. By Iain Lane on 2014-10-16

releasing package whoopsie version 0.2.39

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-09 22:59:00 +0000
+++ debian/changelog	2014-10-16 09:41:22 +0000
@@ -1,3 +1,13 @@
+whoopsie (0.2.39) UNRELEASED; urgency=medium
+
+  * Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE for GSourceFunc return values,
+    for clarity
+  * tests/monitor: Call g_main_loop_quit from a callback function which
+    removes the source instead of directly. GSourceFuncs need to return a
+    boolean to say if they should be executed again or not. (LP: #1381804)
+
+ -- Iain Lane <[e-mail]>  Thu, 16 Oct 2014 10:16:45 +0100
+
 whoopsie (0.2.38) utopic; urgency=medium
 
   [ Evan Dandrea ]

=== modified file 'debian/control'
--- debian/control	2014-07-24 12:34:15 +0000
+++ debian/control	2014-10-16 09:41:22 +0000
@@ -4,7 +4,7 @@
 Maintainer: Evan Dandrea <[e-mail]>
 Build-Depends: debhelper (>= 9.0),
  dh-systemd,
- libglib2.0-dev (>= 2.31.6),
+ libglib2.0-dev (>= 2.32),
  libcurl4-openssl-dev,
  libgcrypt11-dev,
  libcap-dev,

=== modified file 'src/tests/test_monitor.c'
--- src/tests/test_monitor.c	2014-05-12 13:45:48 +0000
+++ src/tests/test_monitor.c	2014-10-16 09:41:22 +0000
@@ -39,7 +39,14 @@
 {
     g_main_loop_quit (loop);
     g_test_fail ();
-    return FALSE;
+    return G_SOURCE_REMOVE;
+}
+
+gboolean
+_test_callback_quit (GMainLoop *main_loop)
+{
+    g_main_loop_quit (main_loop);
+    return G_SOURCE_REMOVE;
 }
 
 void
@@ -49,7 +56,7 @@
     monitor = monitor_directory ("/fake", _test_callback_never_triggered_callback);
     loop = g_main_loop_new (NULL, FALSE);
 
-    g_timeout_add_seconds (0.5, (GSourceFunc) g_main_loop_quit, loop);
+    g_timeout_add (500, (GSourceFunc) _test_callback_quit, loop);
     g_main_loop_run (loop);
     if (monitor)
         unmonitor_directory (monitor, _test_callback_never_triggered_callback);
@@ -68,12 +75,12 @@
         g_warning ("Couldn't create temporary crash file.");
         g_test_fail ();
         g_free (path);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
     close (fd);
     g_free (path);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 gboolean
@@ -90,7 +97,7 @@
         g_warning ("Couldn't create temporary upload file.");
         g_test_fail ();
         g_free (path);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
     close (fd);
 
@@ -102,7 +109,7 @@
         g_test_fail ();
     }
     g_free (path);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 gboolean
@@ -203,7 +210,7 @@
 
     g_idle_add ((GSourceFunc) _create_crash_file, template);
     loop = g_main_loop_new (NULL, FALSE);
-    g_timeout_add_seconds (2, (GSourceFunc) g_main_loop_quit, loop);
+    g_timeout_add_seconds (2, (GSourceFunc) _test_callback_quit, loop);
 
     monitor = monitor_directory (template, _test_callback_never_triggered_callback);
     g_main_loop_run (loop);

=== modified file 'src/whoopsie.c'
--- src/whoopsie.c	2014-09-17 19:50:03 +0000
+++ src/whoopsie.c	2014-10-16 09:41:22 +0000
@@ -716,7 +716,7 @@
     }
     g_dir_close (dir);
 
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 void daemonize (void)