Merge lp:~mhr3/gtx/raring into lp:gtx

[Michal Hruby]

A few changes to maintain compatibility with latest versions of GLib.

[Mikkel Kamstrup Erlandsen (kamstrup)]

This looks to be 99.9% whitespace twiddling..?

The only non-trivial change is the removal of the gtestutils.h #include?

review: Needs Information

Unmerged revisions

14. By Michal Hruby on 2013-05-31

Make GTX work with Raring

=== modified file 'src/gtestextensions.c'
--- src/gtestextensions.c	2010-05-04 14:25:51 +0000
+++ src/gtestextensions.c	2013-05-31 13:26:54 +0000
@@ -16,9 +16,9 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with GTX.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
+ *   The Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor
+ *   Boston, MA  02110-1301, USA.
  */
 
 #include <stdlib.h> /* For exit() function */
@@ -38,20 +38,20 @@
 gboolean
 gtx_dispatch_test_case (GtxTestContext *ctx)
 {
-	g_assert (ctx != NULL);
-	ctx->test_func (ctx->fixture, ctx->test_data);
-	return FALSE;
+  g_assert (ctx != NULL);
+  ctx->test_func (ctx->fixture, ctx->test_data);
+  return FALSE;
 }
 
 void
 gtx_flush_sources (gboolean may_block)
 {
-	GMainContext *ctx;
-	
-	ctx = g_main_context_default ();
-	
-	while (g_main_context_pending (ctx))
-		g_main_context_iteration (ctx, may_block);
+  GMainContext *ctx;
+  
+  ctx = g_main_context_default ();
+  
+  while (g_main_context_pending (ctx))
+    g_main_context_iteration (ctx, may_block);
 }
 
 /**
@@ -65,14 +65,14 @@
 gboolean
 gtx_quit_main_loop (GMainLoop *loop)
 {
-	g_assert (loop != NULL);
-	
-	if (g_main_loop_is_running (loop))
-		g_main_loop_quit (loop);
-	else
-		g_warning ("Tried to quit non-running GMainLoop@%p", loop);
-	
-	return FALSE;
+  g_assert (loop != NULL);
+  
+  if (g_main_loop_is_running (loop))
+    g_main_loop_quit (loop);
+  else
+    g_warning ("Tried to quit non-running GMainLoop@%p", loop);
+  
+  return FALSE;
 }
 
 /**
@@ -85,20 +85,20 @@
 void
 gtx_yield_main_loop (guint millis)
 {
-	GMainLoop *recursive_main;
-	guint      timeout_id;
-	
-	recursive_main = g_main_loop_new (NULL, FALSE);
-	
-	timeout_id = g_timeout_add (millis,
-	                            (GSourceFunc)gtx_quit_main_loop,
-	                            recursive_main);
-	g_main_loop_run (recursive_main);
-	
-	gtx_flush_sources (FALSE);
+  GMainLoop *recursive_main;
+  guint      timeout_id;
+  
+  recursive_main = g_main_loop_new (NULL, FALSE);
+  
+  timeout_id = g_timeout_add (millis,
+                              (GSourceFunc)gtx_quit_main_loop,
+                              recursive_main);
+  g_main_loop_run (recursive_main);
+  
+  gtx_flush_sources (FALSE);
 
-	g_source_remove (timeout_id);
-	g_main_loop_unref (recursive_main);
+  g_source_remove (timeout_id);
+  g_main_loop_unref (recursive_main);
 }
 
 static void
@@ -108,10 +108,10 @@
                                  const GValue *param_values,
                                  gpointer invocation_hint,
                                  gpointer marshal_data)
-{	
+{  
     WaitForSignalClosure * wfsclosure = (WaitForSignalClosure *) closure;
     guint i;
-	
+  
     wfsclosure->param_values = g_value_array_new (n_param_values);
     for (i = 0 ; i < n_param_values ; i++)
         g_value_array_append (wfsclosure->param_values, param_values + i);
@@ -149,11 +149,12 @@
     handler_id = g_signal_connect_closure_by_id (object, signal_id, detail,
                                                  &wfs->closure, FALSE);
 
-    max_timeout_id = g_timeout_add (max_wait_ms, (GSourceFunc)gtx_quit_main_loop,
-									wfs->loop);
+    max_timeout_id = g_timeout_add (max_wait_ms,
+                                    (GSourceFunc) gtx_quit_main_loop,
+                                    wfs->loop);
 
     g_main_loop_run (wfs->loop);
-	
+  
     g_closure_invalidate (&wfs->closure);
 
     if (wfs->param_values) {
@@ -167,14 +168,16 @@
     } else {
         timed_out = TRUE;
     }
-	
+  
     g_main_loop_unref (wfs->loop);
     wfs->loop = NULL;
-	
+  
     /* Closure will be destroyed here */
-    g_signal_handler_disconnect (object, handler_id);
-	g_source_remove (max_timeout_id);
-	
+    if (g_signal_handler_is_connected (object, handler_id))
+      g_signal_handler_disconnect (object, handler_id);
+
+    g_source_remove (max_timeout_id);
+  
     return timed_out;
 }
 
@@ -660,4 +663,4 @@
   g_free (ctx);
 
   return timed_out;
-}
 \ No newline at end of file
+}
 
=== modified file 'src/gtx.h'
--- src/gtx.h	2010-03-23 12:22:34 +0000
+++ src/gtx.h	2013-05-31 13:26:54 +0000
@@ -24,7 +24,6 @@
 #define __GTX_H__
 
 #include <glib.h>
-#include <glib/gtestutils.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS