diff --git a/data/icons/protocols/Facebook b/data/icons/protocols/Facebook deleted file mode 100644 index 7b56976..0000000 Binary files a/data/icons/protocols/Facebook and /dev/null differ diff --git a/data/icons/protocols/Facebook.rdef b/data/icons/protocols/Facebook.rdef deleted file mode 100644 index c606ec0..0000000 --- a/data/icons/protocols/Facebook.rdef +++ /dev/null @@ -1,9 +0,0 @@ - -resource(1, "facebook") #'VICN' array { - $"6E6369660202000602000000C000004000000000009220244C000067003C7FFF" - $"1A5EA805FF0206111B1111BD01C0A72B4828BF72B8033FBBBA3C39463F5C4A46" - $"523C4ABC4D4ABB7A4ABC4DC3D234C59634C51C34C659BB0E54352C0208242824" - $"2624BA4724C94924C528245AB6245C265CBA355CC94B5CC5285C5A5C5CC9565C" - $"5A5CC5485CB64A5CBA7B5C26C951245A24C55D242824BA53242624020A000101" - $"000A01010000" -}; diff --git a/data/icons/protocols/GoogleTalk b/data/icons/protocols/GoogleTalk deleted file mode 100644 index e6d63e7..0000000 Binary files a/data/icons/protocols/GoogleTalk and /dev/null differ diff --git a/data/icons/protocols/GoogleTalk.rdef b/data/icons/protocols/GoogleTalk.rdef deleted file mode 100644 index 8b19457..0000000 --- a/data/icons/protocols/GoogleTalk.rdef +++ /dev/null @@ -1,22 +0,0 @@ - -resource(2, "gtalk") #'VICN' array { - $"6E636966080501040046020106023E40000000000000003D4000494000470000" - $"7EFFFFFFFFE5E1DA02000602000000BBC0004000000000009220244AF0000000" - $"33CCFC3366FF02000602000000BA000040000000000092202448800000336699" - $"FF6699CC02000602000000B9000040000000000092202448E00000CC0000FFFF" - $"000002000602000000BA000040000000000092202448800000FF9900FFFBFF00" - $"02000602000000BA000040000000000092202448800000006600FF00CC000A02" - $"06C22622C7562239222E342E2B2E3D4146364441483C50404C3C504A444A4E55" - $"44CBB634CBB83E5E2A0206C22622C7562239222E342E2B2E3D4146364441483C" - $"50404C3C504C464A505744CBB634CBB83E5E2A02024C265928532A583B59335D" - $"350610CAFFFEAF375335543B3B5A3B5A395D325D355D2C5D274F275627483241" - $"2C413541BDA7C2A83942BDA7C2A8394A3F463F463C40324036402A40234F2346" - $"2358325E2A5E395EBF5C5A3F5CBF5C5A3F544053080234313C310404FE372C37" - $"393739373A393B383B3A3B3B393B3A3B390406FE0B4536403640363F363E383E" - $"373E383E393E393E3A403B3F3B413B453A0405FE03453C453445344533433244" - $"324332403240323F323E343E333E3408024D2C4D3C0803553C4F3655300D0A00" - $"01001001178400040A020101000A010102000A0101032021210A010204053021" - $"2101178200040A0102070630212101178200040A010108301D2101178200040A" - $"0102090830212101178200040A030103000A040204051001178200040A050207" - $"061001178200040A060108301C2001178200040A07020908100117820004" -}; diff --git a/protocols/xmpp/FacebookProtocol.cpp b/protocols/xmpp/FacebookProtocol.cpp deleted file mode 100644 index 95425ae..0000000 --- a/protocols/xmpp/FacebookProtocol.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2010, Pier Luigi Fiorini. All rights reserved. - * Distributed under the terms of the GPL v2 License. - * - * Authors: - * Pier Luigi Fiorini, pierluigi.fiorini@gmail.com - */ - -#include "FacebookProtocol.h" - -#include - -#include - - -FacebookProtocol::FacebookProtocol() - : JabberHandler() -{ -} - - -FacebookProtocol::~FacebookProtocol() -{ -} - - -const char* -FacebookProtocol::Signature() const -{ - return "facebook"; -} - - -const char* -FacebookProtocol::FriendlySignature() const -{ - return "Facebook"; -} - - -BBitmap* -FacebookProtocol::Icon() const -{ - BResources res(fPath.Path()); - return IconFromResources(&res, 1, B_LARGE_ICON); -} - - -BMessage -FacebookProtocol::SettingsTemplate(const char* name) -{ - if (name == BString("account")) - return JabberHandler::_SettingsTemplate("Username", false); - else - return BMessage(); -} - - -void -FacebookProtocol::OverrideSettings() -{ - fServer = "chat.facebook.com"; -} - - -BString -FacebookProtocol::ComposeJID() const -{ - BString jid(fUsername); - jid << "@" << fServer << "/" << fResource; - return jid; -} diff --git a/protocols/xmpp/FacebookProtocol.h b/protocols/xmpp/FacebookProtocol.h deleted file mode 100644 index 17fb591..0000000 --- a/protocols/xmpp/FacebookProtocol.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2010, Pier Luigi Fiorini. All rights reserved. - * Distributed under the terms of the GPL v2 License. - */ -#ifndef _FACEBOOK_PROTOCOL_H -#define _FACEBOOK_PROTOCOL_H - -#include "JabberHandler.h" - -class FacebookProtocol : public JabberHandler { -public: - FacebookProtocol(); - virtual ~FacebookProtocol(); - - virtual const char* Signature() const; - virtual const char* FriendlySignature() const; - - virtual BBitmap* Icon() const; - - virtual BMessage SettingsTemplate(const char*); - virtual void OverrideSettings(); - - virtual BString ComposeJID() const; -}; - -#endif // _FACEBOOK_PROTOCOL_H diff --git a/protocols/xmpp/GoogleTalkProtocol.cpp b/protocols/xmpp/GoogleTalkProtocol.cpp deleted file mode 100644 index db683e2..0000000 --- a/protocols/xmpp/GoogleTalkProtocol.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2010, Pier Luigi Fiorini. All rights reserved. - * Distributed under the terms of the GPL v2 License. - * - * Authors: - * Pier Luigi Fiorini, pierluigi.fiorini@gmail.com - */ - -#include "GoogleTalkProtocol.h" - -#include - -#include - - -GoogleTalkProtocol::GoogleTalkProtocol() - : JabberHandler() -{ -} - - -GoogleTalkProtocol::~GoogleTalkProtocol() -{ -} - - -const char* -GoogleTalkProtocol::Signature() const -{ - return "gtalk"; -} - - -const char* -GoogleTalkProtocol::FriendlySignature() const -{ - return "GTalk"; -} - - -BBitmap* -GoogleTalkProtocol::Icon() const -{ - BResources res(fPath.Path()); - return IconFromResources(&res, 2, B_LARGE_ICON); -} - - -BMessage -GoogleTalkProtocol::SettingsTemplate(const char* name) -{ - if (name == BString("account")) - return JabberHandler::_SettingsTemplate("Identifier", false); - else - return BMessage(); -} - - -void -GoogleTalkProtocol::OverrideSettings() -{ - fServer = "dismail.de"; -} - - -BString -GoogleTalkProtocol::ComposeJID() const -{ - BString jid(fUsername); - if (jid.FindLast("@") < 0) - jid << "@dismail.de"; - jid << "/" << fResource; - return jid; -} diff --git a/protocols/xmpp/GoogleTalkProtocol.h b/protocols/xmpp/GoogleTalkProtocol.h deleted file mode 100644 index 4e12c04..0000000 --- a/protocols/xmpp/GoogleTalkProtocol.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2010, Pier Luigi Fiorini. All rights reserved. - * Distributed under the terms of the GPL v2 License. - */ -#ifndef _GOOGLE_TALK_PROTOCOL_H -#define _GOOGLE_TALK_PROTOCOL_H - -#include "JabberHandler.h" - -class GoogleTalkProtocol : public JabberHandler { -public: - GoogleTalkProtocol(); - virtual ~GoogleTalkProtocol(); - - virtual const char* Signature() const; - virtual const char* FriendlySignature() const; - - virtual BBitmap* Icon() const; - - virtual BMessage SettingsTemplate(const char* name); - virtual void OverrideSettings(); - - virtual BString ComposeJID() const; -}; - -#endif // _GOOGLE_TALK_PROTOCOL_H diff --git a/protocols/xmpp/JabberMain.cpp b/protocols/xmpp/JabberMain.cpp index df20087..ed3d56a 100644 --- a/protocols/xmpp/JabberMain.cpp +++ b/protocols/xmpp/JabberMain.cpp @@ -8,8 +8,6 @@ #include -#include "FacebookProtocol.h" -#include "GoogleTalkProtocol.h" #include "JabberProtocol.h" @@ -23,14 +21,8 @@ extern "C" _EXPORT uint32 version(); ChatProtocol* protocol_at(int32 i) { - switch(i) { - case 0: - return (ChatProtocol*)new JabberProtocol(); - case 1: - return (ChatProtocol*)new FacebookProtocol(); - case 2: - return (ChatProtocol*)new GoogleTalkProtocol(); - } + if (i == 0) + return (ChatProtocol*)new JabberProtocol(); return NULL; } @@ -38,7 +30,7 @@ protocol_at(int32 i) int32 protocol_count() { - return 3; + return 1; } diff --git a/protocols/xmpp/Makefile b/protocols/xmpp/Makefile index 0a69bee..e425785 100644 --- a/protocols/xmpp/Makefile +++ b/protocols/xmpp/Makefile @@ -32,8 +32,6 @@ APP_MIME_SIG = # same name (source.c or source.cpp) are included from different directories. # Also note that spaces in folder names do not work well with this Makefile. SRCS = \ - protocols/xmpp/FacebookProtocol.cpp \ - protocols/xmpp/GoogleTalkProtocol.cpp \ protocols/xmpp/JabberHandler.cpp \ protocols/xmpp/JabberMain.cpp \ protocols/xmpp/JabberProtocol.cpp @@ -43,9 +41,7 @@ SRCS = \ # used. RDEFS = \ protocols/xmpp/jabber.rdef \ - data/icons/protocols/Jabber.rdef \ - data/icons/protocols/GoogleTalk.rdef \ - data/icons/protocols/Facebook.rdef + data/icons/protocols/Jabber.rdef # Specify the resource files to use. Full or relative paths can be used. # Both RDEFS and RSRCS can be utilized in the same Makefile.