From 5ec391d6f2eba7e7819bd357759f7a4507fa5379 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Sat, 21 Jul 2012 21:39:32 +0200 Subject: [PATCH] core: store addressbook URI in sipe_core_private --- src/core/sipe-core-private.h | 3 +++ src/core/sipe-notify.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/core/sipe-core-private.h b/src/core/sipe-core-private.h index 97097fd1..34c00f3c 100644 --- a/src/core/sipe-core-private.h +++ b/src/core/sipe-core-private.h @@ -138,6 +138,9 @@ struct sipe_core_private { /* [MS-DLX] server URI */ gchar *dlx_uri; + + /* Addressbook server URI */ + gchar *addressbook_uri; }; /** diff --git a/src/core/sipe-notify.c b/src/core/sipe-notify.c index ca61b0df..fb78c718 100644 --- a/src/core/sipe-notify.c +++ b/src/core/sipe-notify.c @@ -92,6 +92,8 @@ static void sipe_process_provisioning_v2(struct sipe_core_private *sipe_private, if (sipe_strequal("ServerConfiguration", sipe_xml_attribute(node, "name"))) { const gchar *dlx_uri_str = SIPE_CORE_PRIVATE_FLAG_IS(REMOTE_USER) ? "dlxExternalUrl" : "dlxInternalUrl"; + const gchar *addressbook_uri_str = SIPE_CORE_PRIVATE_FLAG_IS(REMOTE_USER) ? + "absExternalServerUrl" : "absInternalServerUrl"; g_free(sipe_private->focus_factory_uri); sipe_private->focus_factory_uri = sipe_xml_data(sipe_xml_child(node, "focusFactoryUri")); @@ -103,6 +105,11 @@ static void sipe_process_provisioning_v2(struct sipe_core_private *sipe_private, SIPE_DEBUG_INFO("sipe_process_provisioning_v2: sipe_private->dlx_uri=%s", sipe_private->dlx_uri ? sipe_private->dlx_uri : ""); + g_free(sipe_private->addressbook_uri); + sipe_private->addressbook_uri = sipe_xml_data(sipe_xml_child(node, addressbook_uri_str)); + SIPE_DEBUG_INFO("sipe_process_provisioning_v2: sipe_private->addressbook_uri=%s", + sipe_private->addressbook_uri ? sipe_private->addressbook_uri : ""); + #ifdef HAVE_VV g_free(sipe_private->test_call_bot_uri); sipe_private->test_call_bot_uri = sipe_xml_data(sipe_xml_child(node, "botSipUriForTestCall")); -- 2.11.4.GIT