From cc898075d2dd43cd4b173952569e2ce7e972b990 Mon Sep 17 00:00:00 2001
From: plfiorini <plfiorini@10171b4d-537d-4361-a55b-26d635fbb5c3>
Date: Wed, 19 May 2010 21:36:36 +0000
Subject: [PATCH] Fixed what mankind will remember as the 'Massive Breakage due
 to "blind svn merge"'.

---
 application/AboutWindow.cpp     |  3 ++-
 libs/libsupport/Singleton.cpp   | 17 +----------------
 libs/libsupport/Singleton.h     | 11 ++++++++---
 protocols/facebook/Facebook.cpp |  2 +-
 protocols/gtalk/GoogleTalk.cpp  |  2 +-
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/application/AboutWindow.cpp b/application/AboutWindow.cpp
index edae162..70adaa2 100644
--- a/application/AboutWindow.cpp
+++ b/application/AboutWindow.cpp
@@ -8,12 +8,13 @@
  *		Ryan Leavengood, leavengood@gmail.com
  */
 
-#include <AboutWindow.h>
 #include <Alert.h>
 #include <Font.h>
 #include <String.h>
 #include <TextView.h>
 
+#include "AboutWindow.h"
+
 
 AboutWindow::AboutWindow(const char* appName, const char** holders,
 						   const char** authors, const char* extraInfo)
diff --git a/libs/libsupport/Singleton.cpp b/libs/libsupport/Singleton.cpp
index dd32f5a..efd1cd4 100644
--- a/libs/libsupport/Singleton.cpp
+++ b/libs/libsupport/Singleton.cpp
@@ -10,20 +10,5 @@
 
 #include "Singleton.h"
 
+
 template<typename T> T* Singleton<T>::fInstance = 0;
-
-
-template<typename T>
-Singleton<T>::Singleton()
-{
-}
-
-
-template<typename T>
-T*
-Singleton<T>::Get()
-{
-	if (!fInstance)
-		fInstance = new T();
-	return fInstance;
-}
diff --git a/libs/libsupport/Singleton.h b/libs/libsupport/Singleton.h
index b0df1db..aa936fe 100644
--- a/libs/libsupport/Singleton.h
+++ b/libs/libsupport/Singleton.h
@@ -8,12 +8,17 @@
 template<typename T>
 class Singleton {
 public:
-	static	T*		Get();
+	static	T*			Get()
+						{
+							if (!fInstance)
+								fInstance = new T();
+							return fInstance;
+						}
 
 protected:
-	static	T*		fInstance;
+	static	T*			fInstance;
 
-					Singleton();
+						Singleton() {}
 };
 
 #endif	// _SINGLETON_H
diff --git a/protocols/facebook/Facebook.cpp b/protocols/facebook/Facebook.cpp
index e019b9f..79d399f 100644
--- a/protocols/facebook/Facebook.cpp
+++ b/protocols/facebook/Facebook.cpp
@@ -398,7 +398,7 @@ Facebook::LoggedIn()
 	Progress("Facebook Login", "Facebook: Logged in!", 1.00);
 
 	BMessage msg(IM_MESSAGE);
-	msg.AddInt32("im_what", IM_STATUS_SET);
+	msg.AddInt32("im_what", IM_OWN_STATUS_SET);
 	msg.AddString("protocol", kProtocolSignature);
 	msg.AddInt32("status", CAYA_ONLINE);
 
diff --git a/protocols/gtalk/GoogleTalk.cpp b/protocols/gtalk/GoogleTalk.cpp
index 1cf81ee..7200092 100644
--- a/protocols/gtalk/GoogleTalk.cpp
+++ b/protocols/gtalk/GoogleTalk.cpp
@@ -398,7 +398,7 @@ GoogleTalk::LoggedIn()
 	Progress("GoogleTalk Login", "GoogleTalk: Logged in!", 1.00);
 
 	BMessage msg(IM_MESSAGE);
-	msg.AddInt32("im_what", IM_STATUS_SET);
+	msg.AddInt32("im_what", IM_OWN_STATUS_SET);
 	msg.AddString("protocol", kProtocolSignature);
 	msg.AddInt32("status", CAYA_ONLINE);