summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-02-07 13:03:53 (GMT)
committerTobias Markmann <tm@ayena.de>2017-02-10 09:39:53 (GMT)
commit72824c12ab6c15501e6e17c15465d9b27c6f7e1b (patch)
tree9035caf97724f42c8917b0e4cbd50cbe9d948f87 /Swiften
parentd81f9e750627a83c12afeb4718eb12bbb53f5270 (diff)
downloadswift-72824c12ab6c15501e6e17c15465d9b27c6f7e1b.zip
swift-72824c12ab6c15501e6e17c15465d9b27c6f7e1b.tar.bz2
Display error message in profile window if vCard request failed
Also fixed an typo error in GConfProxyProvider.cpp that prevented compilation on Linux. Test-Information: Tested with an XMPP server with vCard support disabled and also with vCard support enabled. Tested profile window and profile editor window. The profile window will show cached vCard data if present and the error message. The profile editor window will only show the error message in case of an error. Tested profile window and profile editor window in a scenario where vCard support is first enabled in the server, then disabled, and finally enabled again, and opening the editors in between. Potential error messages were always correctly cleared before showing the dialog. Tested on macOS 10.12.3 with Qt 5.7.1. Change-Id: I3958c35286f6f0096d1605c29816f666530aae03
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Network/GConfProxyProvider.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/GConfProxyProvider.cpp b/Swiften/Network/GConfProxyProvider.cpp
index 40cd97c..eade450 100644
--- a/Swiften/Network/GConfProxyProvider.cpp
+++ b/Swiften/Network/GConfProxyProvider.cpp
@@ -17,7 +17,7 @@
#include <iostream>
-export "C" {
+extern "C" {
#include <gconf/gconf-client.h>
}