ORBit2 r2104 - in trunk: . src/services/imodule test/everything

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Dec  9 12:22:43 2008
New Revision: 2104
URL: http://svn.gnome.org/viewvc/ORBit2?rev=2104&view=rev

Log:
2008-12-09  Kjartan Maraas  <kmaraas gnome org>

	* src/services/imodule/orbit-imodule-libidl-utils.h:
	* src/services/imodule/orbit-imodule-utils.h:
	* test/everything/client.c: (wait_until_done):
	Fix glib single includes. Patch from PrzemysÅaw Grzegorczyk.
	Closes bug #563700.

Modified:
   trunk/ChangeLog
   trunk/src/services/imodule/orbit-imodule-libidl-utils.h
   trunk/src/services/imodule/orbit-imodule-utils.h
   trunk/test/everything/client.c

Modified: trunk/src/services/imodule/orbit-imodule-libidl-utils.h
==============================================================================
--- trunk/src/services/imodule/orbit-imodule-libidl-utils.h	(original)
+++ trunk/src/services/imodule/orbit-imodule-libidl-utils.h	Tue Dec  9 12:22:43 2008
@@ -21,7 +21,7 @@
 #ifndef __ORBIT_IMODULE_LIBIDL_UTILS_H__
 #define __ORBIT_IMODULE_LIBIDL_UTILS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libIDL/IDL.h>
 
 G_BEGIN_DECLS 

Modified: trunk/src/services/imodule/orbit-imodule-utils.h
==============================================================================
--- trunk/src/services/imodule/orbit-imodule-utils.h	(original)
+++ trunk/src/services/imodule/orbit-imodule-utils.h	Tue Dec  9 12:22:43 2008
@@ -25,8 +25,7 @@
 #ifndef __ORBIT_IMODULE_UTILS_H__
 #define __ORBIT_IMODULE_UTILS_H__
 
-#include <glib/gmacros.h>
-#include <glib/ghash.h>
+#include <glib.h>
 #include <libIDL/IDL.h>
 
 G_BEGIN_DECLS

Modified: trunk/test/everything/client.c
==============================================================================
--- trunk/test/everything/client.c	(original)
+++ trunk/test/everything/client.c	Tue Dec  9 12:22:43 2008
@@ -1957,7 +1957,7 @@
 wait_until_done (void)
 {
 	while (!done)
-		g_main_iteration (TRUE);
+		g_main_context_iteration (NULL, TRUE);
 }
 
 static void