diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | common/gkr-location.c | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | gp11/tests/gp11-test.h | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-11-04 Stef Walter <stef@memberwebs.com> + + * configure.in: + * gp11/tests/gp11-test.h: + * common/gkr-location.c: Remove usage of deprecated glib stuff. + === gnome-keyring 2.24.1 === 2008-10-19 Stef Walter <stef@memberwebs.com> diff --git a/common/gkr-location.c b/common/gkr-location.c index f8f10174..f48a82aa 100644 --- a/common/gkr-location.c +++ b/common/gkr-location.c @@ -1129,7 +1129,7 @@ gkr_location_write_file (GQuark loc, const guchar *data, gssize len, GError **er 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), diff --git a/configure.in b/configure.in index ca83735b..ec7cfca6 100644 --- a/configure.in +++ b/configure.in @@ -82,7 +82,7 @@ AC_ARG_ENABLE(debug, [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" diff --git a/gp11/tests/gp11-test.h b/gp11/tests/gp11-test.h index 3f7b8f39..2d48bd2b 100644 --- a/gp11/tests/gp11-test.h +++ b/gp11/tests/gp11-test.h @@ -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_*/ |