Fixed what mankind will remember as the 'Massive Breakage due to "blind svn merge"'.
This commit is contained in:
parent
e3253f9995
commit
cc898075d2
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
Singleton();
|
||||
Singleton() {}
|
||||
};
|
||||
|
||||
#endif // _SINGLETON_H
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Ŝarĝante…
Reference in New Issue