From d5f2142afdf1a9c95a496515e194bb1c4991f47b Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 16 Jul 2014 17:55:44 -0400
Subject: [PATCH] daemon: add version API
Refs: #48032
---
daemon/bin/main.cpp | 2 +-
daemon/src/sflphone.h | 3 +++
daemon/src/sflphone_api.cpp | 6 ++++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/daemon/bin/main.cpp b/daemon/bin/main.cpp
index 0690343b2a..70943daec0 100644
--- a/daemon/bin/main.cpp
+++ b/daemon/bin/main.cpp
@@ -42,7 +42,7 @@ static std::unique_ptr<DBusClient> dbusClient;
static void print_title()
{
- std::cout << "SFLphone Daemon " << VERSION <<
+ std::cout << "SFLphone Daemon " << sflph_version() <<
", by Savoir-Faire Linux 2004-2014" << std::endl <<
"http://www.sflphone.org/" << std::endl;
}
diff --git a/daemon/src/sflphone.h b/daemon/src/sflphone.h
index ebb11b0f11..d4837ab382 100644
--- a/daemon/src/sflphone.h
+++ b/daemon/src/sflphone.h
@@ -38,6 +38,9 @@
#include <string>
#include <map>
+const char *
+sflph_version();
+
/* presence events */
#ifdef SFL_PRESENCE
struct sflph_pres_ev_handlers
diff --git a/daemon/src/sflphone_api.cpp b/daemon/src/sflphone_api.cpp
index 277d304877..f4d0446dfb 100644
--- a/daemon/src/sflphone_api.cpp
+++ b/daemon/src/sflphone_api.cpp
@@ -83,6 +83,12 @@ namespace {
struct sflph_ev_handlers _evHandlers;
}
+const char *
+sflph_version()
+{
+ return PACKAGE_VERSION;
+}
+
int sflph_init(struct sflph_ev_handlers* ev_handlers, enum sflph_init_flag flags)
{
// Ignore initialization if already done
--
GitLab