jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Fixed what mankind will remember as the 'Massive Breakage due to "blind svn merge"'.

This commit is contained in:
plfiorini 2010-05-19 21:36:36 +00:00
parent e3253f9995
commit cc898075d2
5 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/AboutWindow.cpp
View File

@ -8,12 +8,13 @@
* Ryan Leavengood, leavengood@gmail.com * Ryan Leavengood, leavengood@gmail.com
*/ */
#include <AboutWindow.h>
#include <Alert.h> #include <Alert.h>
#include <Font.h> #include <Font.h>
#include <String.h> #include <String.h>
#include <TextView.h> #include <TextView.h>
#include "AboutWindow.h"
AboutWindow::AboutWindow(const char* appName, const char** holders, AboutWindow::AboutWindow(const char* appName, const char** holders,
const char** authors, const char* extraInfo) const char** authors, const char* extraInfo)

17
libs/libsupport/Singleton.cpp
View File

@ -10,20 +10,5 @@
#include "Singleton.h" #include "Singleton.h"
template<typename T> T* Singleton<T>::fInstance = 0; 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;
}

9
libs/libsupport/Singleton.h
View File

@ -8,12 +8,17 @@
template<typename T> template<typename T>
class Singleton { class Singleton {
public: public:
static T* Get(); static T* Get()
{
if (!fInstance)
fInstance = new T();
return fInstance;
}
protected: protected:
static T* fInstance; static T* fInstance;
Singleton(); Singleton() {}
}; };
#endif // _SINGLETON_H #endif // _SINGLETON_H

2
protocols/facebook/Facebook.cpp
View File

@ -398,7 +398,7 @@ Facebook::LoggedIn()
Progress("Facebook Login", "Facebook: Logged in!", 1.00); Progress("Facebook Login", "Facebook: Logged in!", 1.00);
BMessage msg(IM_MESSAGE); BMessage msg(IM_MESSAGE);
msg.AddInt32("im_what", IM_STATUS_SET); msg.AddInt32("im_what", IM_OWN_STATUS_SET);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddInt32("status", CAYA_ONLINE); msg.AddInt32("status", CAYA_ONLINE);

2
protocols/gtalk/GoogleTalk.cpp
View File

@ -398,7 +398,7 @@ GoogleTalk::LoggedIn()
Progress("GoogleTalk Login", "GoogleTalk: Logged in!", 1.00); Progress("GoogleTalk Login", "GoogleTalk: Logged in!", 1.00);
BMessage msg(IM_MESSAGE); BMessage msg(IM_MESSAGE);
msg.AddInt32("im_what", IM_STATUS_SET); msg.AddInt32("im_what", IM_OWN_STATUS_SET);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddInt32("status", CAYA_ONLINE); msg.AddInt32("status", CAYA_ONLINE);