[evolution] Bug #625606 - git/master build dies with glib-2.25.12
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug #625606 - git/master build dies with glib-2.25.12
- Date: Thu, 29 Jul 2010 19:08:36 +0000 (UTC)
commit 52ad80d6014a82cb64903d5a452083f5f923a034
Author: Milan Crha <mcrha redhat com>
Date: Thu Jul 29 21:07:26 2010 +0200
Bug #625606 - git/master build dies with glib-2.25.12
configure.ac | 2 +-
modules/connman/evolution-connman.c | 2 +-
.../network-manager/evolution-network-manager.c | 2 +-
plugins/mail-notification/mail-notification.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 283e758..c793762 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ dnl Automake 1.11 - Silent Build Rules
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl Required Packages
-m4_define([glib_minimum_version], [2.25.11])
+m4_define([glib_minimum_version], [2.25.12])
m4_define([eds_minimum_version], [evo_version])
m4_define([gnome_icon_theme_minimum_version], [2.19.91])
m4_define([pangoft2_minimum_version], [1.0.1]) dnl For libgnomecanvas
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index 18187b4..d11fa52 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -105,7 +105,7 @@ connman_check_initial_state (EConnMan *extension)
/* XXX Assuming this should be safe to call synchronously. */
response = g_dbus_connection_send_message_with_reply_sync (
- extension->connection, message, 100, NULL, NULL, &error);
+ extension->connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error);
if (response != NULL) {
gchar *state = NULL;
diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c
index d63eed2..ec9056d 100644
--- a/modules/network-manager/evolution-network-manager.c
+++ b/modules/network-manager/evolution-network-manager.c
@@ -122,7 +122,7 @@ network_manager_check_initial_state (ENetworkManager *extension)
/* XXX Assuming this should be safe to call synchronously. */
response = g_dbus_connection_send_message_with_reply_sync (
- extension->connection, message, 100, NULL, NULL, &error);
+ extension->connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error);
if (response != NULL) {
GVariant *body = g_dbus_message_get_body (response);
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index d988091..985ef9b 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -161,7 +161,7 @@ send_dbus_message (const gchar *name,
g_dbus_message_set_body (message, g_variant_builder_end (builder));
/* Sends the message */
- g_dbus_connection_send_message (connection, message, NULL, &error);
+ g_dbus_connection_send_message (connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, &error);
/* Frees the message */
g_object_unref (message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]