From a0a35b08099e20bf054f8486410929e31ebe8280 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 29 Jul 2010 20:40:05 +0200 Subject: [PATCH] Bug #625606 - git/master build dies with glib-2.25.12 --- camel/camel-sasl-gssapi.c | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c index f5a3202..554e8e8 100644 --- a/camel/camel-sasl-gssapi.c +++ b/camel/camel-sasl-gssapi.c @@ -216,7 +216,7 @@ send_dbus_message (gchar *name) g_dbus_message_set_body (message, g_variant_new ("(s)", name)); /* Sends the message: Have a 300 sec wait timeout */ - reply = g_dbus_connection_send_message_with_reply_sync (connection, message, 300 * 1000, NULL, NULL, &error); + reply = g_dbus_connection_send_message_with_reply_sync (connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 300 * 1000, NULL, NULL, &error); if (error) { g_warning ("%s: %s\n", G_STRFUNC, error->message); diff --git a/configure.ac b/configure.ac index a603287..88936bc 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ dnl Automake 1.11 - Silent Build Rules m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Package Versions -m4_define([glib_minimum_version], [2.25.11]) +m4_define([glib_minimum_version], [2.25.12]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libxml_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libsoup_minimum_version], [2.3.0]) -- 2.7.4