From a681c348b8a2da51aa3c230219e769899ac5997d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 21 Jul 2017 12:55:16 +0200 Subject: [PATCH 1/2] fix(Notifier): check correctly internalWindow... --- src/components/notifier/Notifier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/notifier/Notifier.cpp b/src/components/notifier/Notifier.cpp index cffdae7cc..d06657bd4 100644 --- a/src/components/notifier/Notifier.cpp +++ b/src/components/notifier/Notifier.cpp @@ -43,7 +43,7 @@ #define NOTIFICATION_PROPERTY_X "popupX" #define NOTIFICATION_PROPERTY_Y "popupY" -#define NOTIFICATION_PROPERTY_WINDOW "internalWindow" +#define NOTIFICATION_PROPERTY_WINDOW "__internalWindow" #define NOTIFICATION_PROPERTY_TIMER "__timer" From 1deb63ad7aeb13bf661ff866f7a99abe2fb0ab2e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 21 Jul 2017 15:02:33 +0200 Subject: [PATCH 2/2] Update version to 4.1.1. --- CMakeLists.txt | 2 +- submodules/belle-sip | 2 +- submodules/mediastreamer2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f53a39b..70ce2755e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ ################################################################################ cmake_minimum_required(VERSION 3.1) -project(linphoneqt VERSION 4.1.0) +project(linphoneqt VERSION 4.1.1) set(APP_LIBRARY app-library) diff --git a/submodules/belle-sip b/submodules/belle-sip index a19b7e3e8..647393a5e 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a19b7e3e833dc121f91452e40658dd80f8f0c145 +Subproject commit 647393a5e4b49551f34e213c91d80b675c60a7f6 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 3bd6daab8..f0411b1d7 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 3bd6daab8496eefc0b67db8d703487d81f2bfa52 +Subproject commit f0411b1d7ade88cd5c4b868e6a025740a464bfea