From 23bee9b0a6f5120426c0c85809e460b79a3c7c3f Mon Sep 17 00:00:00 2001
From: Jaidyn Ann <jadedctrl@teknik.io>
Date: Mon, 5 Jul 2021 13:14:50 -0500
Subject: [PATCH] (jabber) Remove obselete Facebook and GTalk versions

---
 data/icons/protocols/Facebook         | Bin 3191 -> 0 bytes
 data/icons/protocols/Facebook.rdef    |   9 ----
 data/icons/protocols/GoogleTalk       | Bin 11221 -> 0 bytes
 data/icons/protocols/GoogleTalk.rdef  |  22 --------
 protocols/xmpp/FacebookProtocol.cpp   |  72 -------------------------
 protocols/xmpp/FacebookProtocol.h     |  26 ---------
 protocols/xmpp/GoogleTalkProtocol.cpp |  74 --------------------------
 protocols/xmpp/GoogleTalkProtocol.h   |  26 ---------
 protocols/xmpp/JabberMain.cpp         |  14 ++---
 protocols/xmpp/Makefile               |   6 +--
 10 files changed, 4 insertions(+), 245 deletions(-)
 delete mode 100644 data/icons/protocols/Facebook
 delete mode 100644 data/icons/protocols/Facebook.rdef
 delete mode 100644 data/icons/protocols/GoogleTalk
 delete mode 100644 data/icons/protocols/GoogleTalk.rdef
 delete mode 100644 protocols/xmpp/FacebookProtocol.cpp
 delete mode 100644 protocols/xmpp/FacebookProtocol.h
 delete mode 100644 protocols/xmpp/GoogleTalkProtocol.cpp
 delete mode 100644 protocols/xmpp/GoogleTalkProtocol.h

diff --git a/data/icons/protocols/Facebook b/data/icons/protocols/Facebook
deleted file mode 100644
index 7b569763e849e713757a5ae9a0378ea6dbd79f66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3191
zcmc&$O^6&t6n?#v%({vH5?tJagQqNlB!WhCF+FX}Brv<Px&wj-lg?~UrlF_1o$dtp
zAg(tRB(4#~gODhg#fx|oQ8Nb*p8Pp@(Sx}KOd#>*g0OyHRaeqIJ1c#O7SvSL_g=kv
z_1;&n=ji-W<H-Es{eotpZ*J2r?-r>*zH>weOSR9Esx%r)^RzKZB{Z6{Wby|76b#$}
z*#u;Hd<}T(Hmx7KX)loqw90sOVTV55cx6sCm$2Y3z2b=<L)XZ8iVT64IpiwtRK-qn
z2#wPaud1)IQ=V@xJ;U{#6reFw73^v+EIRjK{s#Je=-gY8sRDi;IBi#CR{?(%2I({L
zW~-&_(AIarwVm4)&U4v+&+yRgd)Ok<2v*`=ZEts0;>ZtEk-MiHk$rWMzv^Otu1C3q
z@q2VLPD2NBF=LGNUUV}OKZ0&X?xQ>#hhOQn{aIbkJqi3A){7X|v(c_AZ)$!B7i$m*
z1pk3UbnK_c{>7o_R4On2u~GlJee~9QbcrEDXl%!k;rT5g>O^7aby9CxtkFj9);d9y
zQ247=j>A>xmF4ghQo@$!FkYwF=;U{v!v=2y&vV$|9|6yEm^k}o^l=>C$Z*AB8axr4
z@(g`t)do_xFwR^&=3HC;8|&El^XFrTCFvPEUpU9r_}qg#>NC5KJJjVK!I+~R!J%CR
z*j#uV8-~izRFiXUNTjFc*XG{GX3kgb_omP043REGcg?=5P-=bn%{!RWg5J&f#M*((
z>d?O8KH>0Ged4OUHO+<WCh1DxC2|0nC{w6@o48pG;hG9CgKV0q(NL3L_=857Iz|ow
zDRat~mZpX&hnXQ&f@qC3*OWs;CE_fHjfGYd+Z81Yl`ND)^X2#e!s*PbA_Y285Di4;
zUfVo5aF=}#<?Jk!%Q$=i1}D+!Fq?6lj%bIg%3)sQUMiqzhwqYSo6aHX?L((y)G-&~
zoLqiEVZ<k;-D(~-xCdNwA0MII#Yr2!#R^_i9)A^>KKK4YT|blIoxn{J6=p;X)!oD)
z9k^lAjRt);^&=Klv`^RO^yK=*Y&@t&jjujrz5cDn7r{Xj*#}-)-;BE5#7pIejUS%|
zxeul*F|Q$l?}s;tqd=d*koaNG8~AB$<ap~%$jYQ;5A+x+lMY@T%dtFSxY%@fiaf#}
z6NM|j&|p{em8hKb+!!zD?UFBOKlFGv;}fRJHcheRU(my>kC|K@BWJL+%*{W+t~?=W
znU2$-DVBL+09Ib{k3$~k3u0tOU)&5Z+N?;Cz_Y-4vkGX-KNP$vdk<af?@<IMMn7KO
z27fEVRo$o!ye`(Lbo?%H!R^JzJ3<kqF4r|9^&<DX74Lz3et1%(?}xS1e&V0-13z7<
zB^@`=?CiU*j1!<_!<jNES%(9+DkV(Qb}4xTvT-Tt10R=?)7#*tM%+vZvv4CNnCp}j
K{}%p#dHDyQzKv4=

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 e6d63e7f5704594923a5ced94aca2c4f92a87262..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11221
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

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 <Resources.h>
-
-#include <libinterface/BitmapUtils.h>
-
-
-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 <Resources.h>
-
-#include <libinterface/BitmapUtils.h>
-
-
-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 <BeBuild.h>
 
-#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.