From e4076f8eb8bf3c68f66bb41a161338b4b0b04a86 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 22 Mar 2017 10:45:32 +0100
Subject: [PATCH] fix(ui/views/App/Main/ManageAccounts): fix the style location

---
 linphone-desktop/resources.qrc                            | 2 +-
 linphone-desktop/ui/views/App/Main/ManageAccounts.qml     | 8 ++++----
 .../ManageAccountsStyle.qml}                              | 0
 linphone-desktop/ui/views/App/Styles/qmldir               | 3 +--
 submodules/linphone                                       | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename linphone-desktop/ui/views/App/Styles/{ManageAccountsWindowStyle.qml => Main/ManageAccountsStyle.qml} (100%)

diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc
index ee862fa8b..2b4a968de 100644
--- a/linphone-desktop/resources.qrc
+++ b/linphone-desktop/resources.qrc
@@ -356,7 +356,7 @@
     <file>ui/views/App/Styles/Main/InviteFriendsStyle.qml</file>
     <file>ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml</file>
     <file>ui/views/App/Styles/Main/MainWindowStyle.qml</file>
-    <file>ui/views/App/Styles/ManageAccountsWindowStyle.qml</file>
+    <file>ui/views/App/Styles/Main/ManageAccountsStyle.qml</file>
     <file>ui/views/App/Styles/qmldir</file>
     <file>ui/views/App/Styles/Settings/SettingsWindowStyle.qml</file>
   </qresource>
diff --git a/linphone-desktop/ui/views/App/Main/ManageAccounts.qml b/linphone-desktop/ui/views/App/Main/ManageAccounts.qml
index 6b0fabe79..7deb5262b 100644
--- a/linphone-desktop/ui/views/App/Main/ManageAccounts.qml
+++ b/linphone-desktop/ui/views/App/Main/ManageAccounts.qml
@@ -19,8 +19,8 @@ DialogPlus {
 
   centeredButtons: true
 
-  height: ManageAccountsWindowStyle.height
-  width: ManageAccountsWindowStyle.width
+  height: ManageAccountsStyle.height
+  width: ManageAccountsStyle.width
 
   // ---------------------------------------------------------------------------
 
@@ -29,9 +29,9 @@ DialogPlus {
 
     anchors {
       left: parent.left
-      leftMargin: ManageAccountsWindowStyle.leftMargin
+      leftMargin: ManageAccountsStyle.leftMargin
       right: parent.right
-      rightMargin: ManageAccountsWindowStyle.rightMargin
+      rightMargin: ManageAccountsStyle.rightMargin
     }
 
     FormLine {
diff --git a/linphone-desktop/ui/views/App/Styles/ManageAccountsWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ManageAccountsStyle.qml
similarity index 100%
rename from linphone-desktop/ui/views/App/Styles/ManageAccountsWindowStyle.qml
rename to linphone-desktop/ui/views/App/Styles/Main/ManageAccountsStyle.qml
diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir
index 6ab14a939..0a7ebacbf 100644
--- a/linphone-desktop/ui/views/App/Styles/qmldir
+++ b/linphone-desktop/ui/views/App/Styles/qmldir
@@ -4,8 +4,6 @@ module App.Styles
 
 # Views styles -----------------------------------------------------------------
 
-singleton ManageAccountsWindowStyle              1.0 ManageAccountsWindowStyle.qml
-
 singleton CallStyle                              1.0 Calls/CallStyle.qml
 singleton CallsWindowStyle                       1.0 Calls/CallsWindowStyle.qml
 
@@ -22,5 +20,6 @@ singleton HomeStyle                              1.0 Main/HomeStyle.qml
 singleton InviteFriendsStyle                     1.0 Main/InviteFriendsStyle.qml
 singleton MainWindowMenuBarStyle                 1.0 Main/MainWindowMenuBarStyle.qml
 singleton MainWindowStyle                        1.0 Main/MainWindowStyle.qml
+singleton ManageAccountsStyle                    1.0 Main/ManageAccountsStyle.qml
 
 singleton SettingsWindowStyle                    1.0 Settings/SettingsWindowStyle.qml
diff --git a/submodules/linphone b/submodules/linphone
index 2e6d2b829..67c8f846f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2e6d2b8297700be1717f7d2e9a67110156364145
+Subproject commit 67c8f846f2087744ebf857e1c8d30b4787a2c24c