1 files changed, 12 insertions, 11 deletions
diff --git a/Swiften/Avatars/AvatarProvider.h b/Swiften/Avatars/AvatarProvider.h
index 5c9460d..a92418f 100644
--- a/Swiften/Avatars/AvatarProvider.h
+++ b/Swiften/Avatars/AvatarProvider.h
@@ -1,25 +1,26 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
-	class JID;
+    class JID;
 
-	class SWIFTEN_API AvatarProvider {
-		public:
-			virtual ~AvatarProvider();
+    class SWIFTEN_API AvatarProvider {
+        public:
+            virtual ~AvatarProvider();
 
-			virtual std::string getAvatarHash(const JID&) const = 0;
+            virtual boost::optional<std::string> getAvatarHash(const JID&) const = 0;
 
-			boost::signal<void (const JID&)> onAvatarChanged;
-	};
+            boost::signals2::signal<void (const JID&)> onAvatarChanged;
+    };
 }