gnome-keyring r1362 - in trunk: . common gp11/tests

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Nov  4 12:54:32 2008
New Revision: 1362
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1362&view=rev

Log:
	* configure.in: 
	* gp11/tests/gp11-test.h:
	* common/gkr-location.c: Remove usage of deprecated glib stuff. 


Modified:
   trunk/ChangeLog
   trunk/common/gkr-location.c
   trunk/configure.in
   trunk/gp11/tests/gp11-test.h

Modified: trunk/common/gkr-location.c
==============================================================================
--- trunk/common/gkr-location.c	(original)
+++ trunk/common/gkr-location.c	Tue Nov  4 12:54:32 2008
@@ -1129,7 +1129,7 @@
 		return FALSE;
 	}
 	
-	dirname = g_dirname (path);
+	dirname = g_path_get_dirname (path);
 	if (dirname && dirname[0]) {
 		if (g_mkdir_with_parents (dirname, 0700) < 0) {
 			g_set_error (err, G_FILE_ERROR, g_file_error_from_errno (errno),

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov  4 12:54:32 2008
@@ -82,7 +82,7 @@
 	    [Compile binaries in debug mode]))
 
 if test "$enable_debug" = "yes"; then
-  CFLAGS="$CFLAGS -g -O0 -Wall"
+  CFLAGS="$CFLAGS -g -O0 -Wall  -DG_DISABLE_DEPRECATED"
   AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode])
   echo "enabling debug compile mode"
   debug_status="yes"

Modified: trunk/gp11/tests/gp11-test.h
==============================================================================
--- trunk/gp11/tests/gp11-test.h	(original)
+++ trunk/gp11/tests/gp11-test.h	Tue Nov  4 12:54:32 2008
@@ -17,6 +17,6 @@
 
 
 #define WAIT_UNTIL(cond) \
-	while(!cond) g_main_iteration (TRUE);
+	while(!cond) g_main_context_iteration (NULL, TRUE);
 
 #endif /*TESTGP11HELPERS_H_*/