From 8f159b7e8bd8e4171945eaabe7a584f2398f934f Mon Sep 17 00:00:00 2001 From: Jaidyn Ann Date: Thu, 19 Aug 2021 02:28:06 -0500 Subject: [PATCH] Rename Cardie to Chat-O-Matic --- Contributors | 2 +- Makefile.common | 2 +- README.ADDON.md | 26 +++++++++---------- README.md | 17 ++++++------ application/AppConstants.h | 5 ---- application/{Cardie.h => ChatOMatic.h} | 4 +-- application/{Cardie.rdef => ChatOMatic.rdef} | 4 +-- application/ChatProtocol.h | 2 +- application/Conversation.cpp | 2 +- application/Makefile | 6 ++--- application/ProtocolLooper.cpp | 3 ++- application/Server.cpp | 4 +-- application/TheApp.cpp | 2 +- application/Utils.cpp | 2 +- application/views/ConversationView.cpp | 7 +++-- application/views/ReplicantStatusView.cpp | 2 +- application/views/RosterView.cpp | 2 +- application/windows/MainWindow.cpp | 2 +- application/windows/RosterWindow.cpp | 1 - data/icons/AppIcon | Bin 0 -> 11997 bytes data/icons/AppIcon.png | Bin 0 -> 1492 bytes data/icons/AppIcon.rdef | 19 ++++++++++++++ protocols/irc/IrcProtocol.cpp | 6 ++--- protocols/irc/Makefile | 4 +-- protocols/irc/irc.rdef | 2 +- protocols/purple/Makefile | 4 +-- protocols/purple/Purple.h | 2 +- protocols/purple/PurpleApp.cpp | 2 +- protocols/purple/PurpleProtocol.cpp | 2 +- protocols/purple/purple.rdef | 2 +- protocols/xmpp/JabberHandler.cpp | 6 ++--- protocols/xmpp/Makefile | 4 +-- protocols/xmpp/jabber.rdef | 2 +- 33 files changed, 84 insertions(+), 66 deletions(-) rename application/{Cardie.h => ChatOMatic.h} (65%) rename application/{Cardie.rdef => ChatOMatic.rdef} (72%) create mode 100644 data/icons/AppIcon create mode 100644 data/icons/AppIcon.png create mode 100644 data/icons/AppIcon.rdef diff --git a/Contributors b/Contributors index 0ae3875..105fa07 100644 --- a/Contributors +++ b/Contributors @@ -6,7 +6,7 @@ We will add you! == Core developers == - Cardie mantainer(s): + Chat-O-Matic mantainer(s): * Jaidyn Levesque Caya mantainer(s): diff --git a/Makefile.common b/Makefile.common index f0b7d3c..027f7db 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,5 +1,5 @@ LIBPATHS = $(OBJ_DIR) -PROTOCOL_DIR = $(OBJ_DIR)/cardie/ +PROTOCOL_DIR = $(OBJ_DIR)/chat-o-matic/ DEBUG_ENABLED ?= false DEFINES := VERSION="\"0.0.2\"" \ diff --git a/README.ADDON.md b/README.ADDON.md index 6d7f796..2397dda 100644 --- a/README.ADDON.md +++ b/README.ADDON.md @@ -46,9 +46,9 @@ to offline. `STATUS_OFFLINE` is for a momentary pause, i.e., the server is down or the user toggled the connection. The ChatProtocol will remain existent and active. -If the status is set to offline by the protocol (and not the user!) Cardie will -automatically attempt a reconnect after some time by trying to set the status -to `STATUS_ONLINE`, which should toggle the connection. +If the status is set to offline by the protocol (and not the user!) +Chat-O-Matic will automatically attempt a reconnect after some time by trying to +set the status to `STATUS_ONLINE`, which should toggle the connection. `IM_PROTOCOL_DISABLE` deletes the ChatProtocol, and should only be sent to the app when an irrecoverable error requiring user intervention has happened, i.e., @@ -93,10 +93,10 @@ BMessage('IMst') { ``` The template is a BMessage with sub-messages named "setting", each with, at -least, an internal "name" (the slot used by Cardie in the message parameter of -`UpdateSettings()`), a user-friendly label ("description"), and the slot type -in "type"― currently `B_INT32_TYPE`,` B_STRING_TYPE`, and `B_BOOL_TYPE` are -accepted. +least, an internal "name" (the slot used by Chat-O-Matic in the message +parameter of `UpdateSettings()`), a user-friendly label ("description"), and +the slot type in "type"― currently `B_INT32_TYPE`,` B_STRING_TYPE`, and +`B_BOOL_TYPE` are accepted. By default, slots are not required, and it's accepted for the user to skip them. To make a slot required, put an error message into "error", warning the user @@ -144,14 +144,14 @@ continuity a bit. # Joining a room The basic structure for joining a room should be like this, with each line being a subsequent response to the previous message: - * Cardie (`IM_JOIN_ROOM`/`IM_CREATE_CHAT`) → Protocol - * Protocol (`IM_ROOM_JOINED`/`IM_CHAT_CREATED`) → Cardie - * Cardie (`IM_GET_ROOM_METADATA` & `IM_GET_ROOM_PARTICIPANTS`) → Protocol - * Protocol (`IM_ROOM_METADATA` & `IM_ROOM_PARTICIPANTS`) → Cardie + * App (`IM_JOIN_ROOM`/`IM_CREATE_CHAT`) → Protocol + * Protocol (`IM_ROOM_JOINED`/`IM_CHAT_CREATED`) → App + * App (`IM_GET_ROOM_METADATA` & `IM_GET_ROOM_PARTICIPANTS`) → Protocol + * Protocol (`IM_ROOM_METADATA` & `IM_ROOM_PARTICIPANTS`) → App Preferably, `IM_ROOM_METADATA` and `IM_ROOM_PARTICIPANTS` should only be used as -above (in response to a request from Cardie) since they are silent and don't -explicitly tell the user what's happened― whereas messages like +above (in response to a request from Chat-O-Matic) since they are silent and +don't explicitly tell the user what's happened― whereas messages like `IM_ROOM_PARTICIPANT_JOINED` and `IM_ROOM_SUBJECT_SET` will inform the user of the change. diff --git a/README.md b/README.md index 8cdc14c..1cd86eb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -# Cardie +# ![Chat-O-Matic Icon](data/icons/AppIcon.png) Chat-O-Matic + ![GSoC 2021](https://img.shields.io/badge/GSoC-2021-green.svg) -Cardie is a multi-protocol chat program based on [Caya](https://github.com/Augustolo/Caya). +Chat-O-Matic is a multi-protocol chat program based on [Caya](https://github.com/Augustolo/Caya). ![Screenshot](data/screenshots/update-3.png) @@ -15,7 +16,7 @@ Protocols generally supported through libpurple include GroupWise, Zephyr, and ## Building -You can make Cardie and its protocols with: +You can make Chat-O-Matic and its protocols with: `$ make` @@ -23,22 +24,22 @@ Or one-by-one: `$ make libs; make app; make protocols` -Cardie itself requires the `expat_devel` package, the XMPP protocol requires +Chat-O-Matic itself requires the `expat_devel` package, the XMPP protocol requires `gloox_devel`, and the libpurple add-on requires `libpurple_devel` and `glib2_devel`― though it's worth noting that libpurple doesn't work on x86_gcc2. ## Installation -Protocol add-ons can be installed in any add-ons directory under `cardie` -(i.e., `~/config/non-packaged/add-ons/cardie/`) or in the binary's CWD -(`./cardie/`). +Protocol add-ons can be installed in any add-ons directory under `chat-o-matic` +(i.e., `~/config/non-packaged/add-ons/chat-o-matic/`) or in the binary's CWD +(`./chat-o-matic/`). libpurple plugins can be installed to any lib directory under `purple-2` (i.e., `~/config/non-packaged/lib/purple-2/`). ## License -Cardie itself is under the MIT license, but licenses vary for the included +Chat-O-Matic is under the MIT license, but licenses vary for the included libraries and add-ons. The `xmpp` and `purple` add-ons are under the GPLv2+, and `irc` the MIT license. diff --git a/application/AppConstants.h b/application/AppConstants.h index 70080a0..70240f8 100644 --- a/application/AppConstants.h +++ b/application/AppConstants.h @@ -22,11 +22,6 @@ const rgb_color APP_SELEND_COLOR = {230, 113, 9}; #define APP_MENTION_BEEP "Chat-o-Matic mention" #define APP_MESSAGE_BEEP "Chat-o-Matic message" -/** - * Miscellaneous. - */ -#define APP_UTF8_MUSICAL_NOTES "\xE2\x99\xAB" - /** * Status codes. */ diff --git a/application/Cardie.h b/application/ChatOMatic.h similarity index 65% rename from application/Cardie.h rename to application/ChatOMatic.h index 5d7750f..b74e5c4 100644 --- a/application/Cardie.h +++ b/application/ChatOMatic.h @@ -5,7 +5,7 @@ #ifndef _APP_H #define _APP_H -#define APP_SIGNATURE "application/x-vnd.cardie" -#define APP_NAME "Cardie" +#define APP_SIGNATURE "application/x-vnd.chat-o-matic" +#define APP_NAME "Chat-O-Matic" #endif // _APP_H diff --git a/application/Cardie.rdef b/application/ChatOMatic.rdef similarity index 72% rename from application/Cardie.rdef rename to application/ChatOMatic.rdef index 0bd71ae..eacc978 100644 --- a/application/Cardie.rdef +++ b/application/ChatOMatic.rdef @@ -1,4 +1,4 @@ -#include "Cardie.h" +#include "ChatOMatic.h" resource app_signature APP_SIGNATURE; @@ -11,7 +11,7 @@ resource app_version { internal = 0, short_info = APP_NAME, - long_info = "©2009-2021 Cardie, Caya, & IMKit Contributors" + long_info = "©2009-2021 Chat-O-Matic, Caya, & IMKit Contributors" }; resource app_flags B_SINGLE_LAUNCH; diff --git a/application/ChatProtocol.h b/application/ChatProtocol.h index 589a9dc..722bb61 100644 --- a/application/ChatProtocol.h +++ b/application/ChatProtocol.h @@ -14,7 +14,7 @@ class BBitmap; -// Cardie protocol interface version +// Chat-O-Matic protocol interface version #define APP_VERSION_1_PRE_ALPHA_1 0x00000001 #define APP_VERSION_1_ALPHA_1 0x00000100 diff --git a/application/Conversation.cpp b/application/Conversation.cpp index 1c806d0..77a19f7 100644 --- a/application/Conversation.cpp +++ b/application/Conversation.cpp @@ -14,7 +14,7 @@ #include "AppConstants.h" #include "AppPreferences.h" -#include "Cardie.h" +#include "ChatOMatic.h" #include "ChatProtocolMessages.h" #include "RenderView.h" #include "ChatCommand.h" diff --git a/application/Makefile b/application/Makefile index 2a4544b..884eb1e 100644 --- a/application/Makefile +++ b/application/Makefile @@ -8,7 +8,7 @@ ## file:///system/develop/documentation/makefile-engine.html # The name of the binary. -NAME = Cardie +NAME = Chat-O-Matic # The type of binary, must be one of: # APP: Application @@ -18,7 +18,7 @@ NAME = Cardie TYPE = APP # If you plan to use localization, specify the application's MIME signature. -APP_MIME_SIG = application/x-vnd.cardie +APP_MIME_SIG = application/x-vnd.chat-o-matic # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are # so that Pe and Eddie can fill them in for you. @@ -87,7 +87,7 @@ SRCS = \ # Specify the resource definition files to use. Full or relative paths can be # used. -RDEFS = Cardie.rdef \ +RDEFS = ChatOMatic.rdef \ data/misc/Templates.rdef \ data/icons/status/Away.rdef \ data/icons/status/Busy.rdef \ diff --git a/application/ProtocolLooper.cpp b/application/ProtocolLooper.cpp index 86e905d..6a87b44 100644 --- a/application/ProtocolLooper.cpp +++ b/application/ProtocolLooper.cpp @@ -17,6 +17,7 @@ #include "Account.h" #include "AppMessages.h" +#include "ChatOMatic.h" #include "ChatProtocolMessages.h" #include "Conversation.h" #include "ConversationAccountItem.h" @@ -263,7 +264,7 @@ ProtocolLooper::_InitChatView() BMessage init(IM_MESSAGE); init.AddInt32("im_what", IM_MESSAGE_RECEIVED); - init.AddString("user_name", "Cardie"); + init.AddString("user_name", APP_NAME); init.AddString("body", B_TRANSLATE("I'm rearing to go!")); fSystemChatView->MessageReceived(&init); diff --git a/application/Server.cpp b/application/Server.cpp index 5f7eb41..b832481 100644 --- a/application/Server.cpp +++ b/application/Server.cpp @@ -28,7 +28,7 @@ #include "Account.h" #include "AppMessages.h" #include "AppPreferences.h" -#include "Cardie.h" +#include "ChatOMatic.h" #include "ChatProtocol.h" #include "ConversationInfoWindow.h" #include "ConversationView.h" @@ -284,7 +284,7 @@ Server::ImMessage(BMessage* msg) if (status == STATUS_OFFLINE || status == STATUS_ONLINE) { BMessage info(IM_MESSAGE); info.AddInt32("im_what", IM_MESSAGE_RECEIVED); - info.AddString("user_name", "Cardie"); + info.AddString("user_name", APP_NAME); if (status == STATUS_OFFLINE) info.AddString("body", B_TRANSLATE("Account now offline and disconnected.")); else diff --git a/application/TheApp.cpp b/application/TheApp.cpp index 9c29b38..953cafb 100644 --- a/application/TheApp.cpp +++ b/application/TheApp.cpp @@ -22,7 +22,7 @@ #include #include "AboutWindow.h" -#include "Cardie.h" +#include "ChatOMatic.h" #include "AppMessages.h" #include "FilePanel.h" #include "MainWindow.h" diff --git a/application/Utils.cpp b/application/Utils.cpp index b2fdaba..e34d821 100644 --- a/application/Utils.cpp +++ b/application/Utils.cpp @@ -19,7 +19,7 @@ #include -#include "Cardie.h" +#include "ChatOMatic.h" #include "Utils.h" diff --git a/application/views/ConversationView.cpp b/application/views/ConversationView.cpp index 35363c3..4c5996f 100644 --- a/application/views/ConversationView.cpp +++ b/application/views/ConversationView.cpp @@ -23,6 +23,7 @@ #include "AppMessages.h" #include "AppPreferences.h" +#include "ChatOMatic.h" #include "ChatProtocolMessages.h" #include "Conversation.h" #include "NotifyMessage.h" @@ -630,8 +631,10 @@ ConversationView::_UserMessage(const char* format, const char* bodyFormat, void ConversationView::_FakeChat() { - fNameTextView->SetText(B_TRANSLATE("Cardie setup")); - fSubjectTextView->SetText(B_TRANSLATE("No accounts configured, no joy.")); + BString name(B_TRANSLATE("%app% setup")); + name.ReplaceAll("%app%", APP_NAME); + fNameTextView->SetText(name); + fSubjectTextView->SetText(B_TRANSLATE("No accounts enabled, no joy.")); BMessage obsv(IM_MESSAGE); obsv.AddInt32("im_what", IM_MESSAGE_RECEIVED); diff --git a/application/views/ReplicantStatusView.cpp b/application/views/ReplicantStatusView.cpp index fa071b9..31068b2 100644 --- a/application/views/ReplicantStatusView.cpp +++ b/application/views/ReplicantStatusView.cpp @@ -29,7 +29,7 @@ #include "AppMessages.h" #include "AppPreferences.h" -#include "Cardie.h" +#include "ChatOMatic.h" #include "ChatProtocolMessages.h" #include "ReplicantMenuItem.h" #include "Utils.h" diff --git a/application/views/RosterView.cpp b/application/views/RosterView.cpp index acc6481..20b0393 100644 --- a/application/views/RosterView.cpp +++ b/application/views/RosterView.cpp @@ -20,7 +20,7 @@ #include "AppMessages.h" #include "AppPreferences.h" -#include "Cardie.h" +#include "ChatOMatic.h" #include "ChatProtocolMessages.h" #include "RosterItem.h" #include "RosterListView.h" diff --git a/application/windows/MainWindow.cpp b/application/windows/MainWindow.cpp index cf3547e..35294bf 100644 --- a/application/windows/MainWindow.cpp +++ b/application/windows/MainWindow.cpp @@ -23,7 +23,7 @@ #include "AccountsWindow.h" #include "AppMessages.h" #include "AppPreferences.h" -#include "Cardie.h" +#include "ChatOMatic.h" #include "ChatProtocolAddOn.h" #include "ChatProtocolMessages.h" #include "ConversationItem.h" diff --git a/application/windows/RosterWindow.cpp b/application/windows/RosterWindow.cpp index f836fa2..31441df 100644 --- a/application/windows/RosterWindow.cpp +++ b/application/windows/RosterWindow.cpp @@ -114,7 +114,6 @@ RosterWindow::MessageReceived(BMessage* message) fMessage->AddString("user_id", user_id); fMessage->AddInt64("instance", instance); fTarget->SendMessage(fMessage); - fMessage->PrintToStream(); PostMessage(B_QUIT_REQUESTED); break; } diff --git a/data/icons/AppIcon b/data/icons/AppIcon new file mode 100644 index 0000000000000000000000000000000000000000..5e6c4141667c03099cd97e9086a42d2679e03432 GIT binary patch literal 11997 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 literal 0 HcmV?d00001 diff --git a/data/icons/AppIcon.png b/data/icons/AppIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..4c634e2ece31f6d0788e18257b3b5c6e9e29e2f2 GIT binary patch literal 1492 zcmV;_1uOcAP)NklbBmbyYwYp10`ThSt=rBX^M)6U$FcYoZWv=z#r$Y#&4 zIrpCTJkNRWd(IsAKW?G_71#p)0%U+H;8%cgz2G+k^_!nvCw)D2a(bRxAv-G{l!ZSp6W}$jA}cC~F=1fyLl53} z|N8ZhP*NNL83bzW`=k3xUIxFK(Ir+hunVuw3xY zXTbyDodZdM41uHp8$27QwFPTIWlrU>YcV2`%6;fP4B)oRb-JbOHLylW?vc zrKf@pqKv>b5eNY(0A*?fdZ6M10SLXzRJS!)32?Z1uj*D7Vso+27gbZ3=3sy zKND5}WtnIzhzeMK{{mbGQ93;O6I`(x#tYmGyuWho#`V>;#{++TVeevJK#!9!E=pLI zzu7LN-Y`LrB(|L^oRFjU>C$*S@xtmSHivF2|1lykYmja_1Y-I0>h#vnP&Sgla=%45eo*H z8;|qIiWS_wV8QI7X!M@C*494&e;b{F!++ecZT9VpmS9@ntlo_6(AtvZ^_|c2i$p!k zescperv(wmMqED=G!1|bQqw%h_Feg`DlaE!7=(+8m|k9vVVZ~t&4-fQw(*HEnOA^3 z{c;tV{_t6Ke0T6IWzN_eq#vBx>%p4p$Hg? zwhn{3?jKUO;~bAYUBxqx##wsj6pm)$tLD!q-!z#Vk5d$ngHkxQ!w0)->8wm%vIxhV z180X_{&QrIL+yi*bG(?r3j zzFOe;b{~*{>?bIUn0THb;^2wkIWl21eU0CWnxqe)2Z#WRfVc+Q->a@bhPsJ_4Dtd7 zrZGVp`Wm6-@vng47u(u6nM&mh-$Y9fur>SWEKq9zTbd5->!_)IZf>j~R5wz=nNYT^(DSn}0f9r2V6>Cxl-vTNZFH(Dt(> zYvtZ2>x9JP0vrd{1FL}tfY@c?djB+kzI?KLxvU`}KsWH`%f(Gp^A_;CEHrP_%CEEn u3%Cc^g#Wjj^U5a@nRK;5-y!b$w*LZ+(n7v_Zg!gh0000 #include -#include +#include #include #include #include @@ -85,7 +85,7 @@ status_t IrcProtocol::UpdateSettings(BMessage* settings) { fNick = settings->FindString("nick"); - fPartText = settings->GetString("part", "Cardie[0.1]: i've been liquified!"); + fPartText = settings->GetString("part", "Chat-O-Matic[0.1]: i've been liquified!"); fUser = settings->FindString("ident"); fRealName = settings->FindString("real_name"); fServer = settings->FindString("server"); @@ -1380,7 +1380,7 @@ IrcProtocol::_AccountTemplate() part.AddString("name", "part"); part.AddString("description", B_TRANSLATE("Part message:")); part.AddInt32("type", B_STRING_TYPE); - part.AddString("default", "Cardie[0.1]: i've been liquified!"); + part.AddString("default", "Chat-O-Matic[0.1]: i've been liquified!"); settings.AddMessage("setting", &part); return settings; diff --git a/protocols/irc/Makefile b/protocols/irc/Makefile index 9b7d874..8efa865 100644 --- a/protocols/irc/Makefile +++ b/protocols/irc/Makefile @@ -8,7 +8,7 @@ ## file:///system/develop/documentation/makefile-engine.html # The name of the binary. -NAME = cardie/irc +NAME = chat-o-matic/irc # The type of binary, must be one of: # APP: Application @@ -18,7 +18,7 @@ NAME = cardie/irc TYPE = SHARED # If you plan to use localization, specify the application's MIME signature. -APP_MIME_SIG = application/x-vnd.cardie.irc +APP_MIME_SIG = application/x-vnd.chat-o-matic.irc # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are diff --git a/protocols/irc/irc.rdef b/protocols/irc/irc.rdef index 6bc6b5b..6ce2928 100644 --- a/protocols/irc/irc.rdef +++ b/protocols/irc/irc.rdef @@ -7,7 +7,7 @@ resource app_version { variety = B_APPV_ALPHA, internal = 0, - short_info = "Cardie IRC add-on", + short_info = "Chat-O-Matic IRC add-on", long_info = "©2021 Jaidyn Levesque" }; diff --git a/protocols/purple/Makefile b/protocols/purple/Makefile index c29fada..62a7396 100644 --- a/protocols/purple/Makefile +++ b/protocols/purple/Makefile @@ -8,7 +8,7 @@ ## file:///system/develop/documentation/makefile-engine.html # The name of the binary. -NAME = cardie/purple +NAME = chat-o-matic/purple # The type of binary, must be one of: # APP: Application @@ -18,7 +18,7 @@ NAME = cardie/purple TYPE = APP # If you plan to use localization, specify the application's MIME signature. -APP_MIME_SIG = application/x-vnd.cardie.purple +APP_MIME_SIG = application/x-vnd.chat-o-matic.purple # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are # so that Pe and Eddie can fill them in for you. diff --git a/protocols/purple/Purple.h b/protocols/purple/Purple.h index f8f831f..33da253 100644 --- a/protocols/purple/Purple.h +++ b/protocols/purple/Purple.h @@ -19,7 +19,7 @@ #ifndef _PURPLE_H #define _PURPLE_H -#define PURPLE_SIGNATURE "application/x-vnd.cardie.purple" +#define PURPLE_SIGNATURE "application/x-vnd.chat-o-matic.purple" #define PURPLE_ADDON "purple" #endif // _PURPLE_H diff --git a/protocols/purple/PurpleApp.cpp b/protocols/purple/PurpleApp.cpp index 920215e..5f382f8 100644 --- a/protocols/purple/PurpleApp.cpp +++ b/protocols/purple/PurpleApp.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/protocols/purple/PurpleProtocol.cpp b/protocols/purple/PurpleProtocol.cpp index ac29725..91203b2 100644 --- a/protocols/purple/PurpleProtocol.cpp +++ b/protocols/purple/PurpleProtocol.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "Purple.h" diff --git a/protocols/purple/purple.rdef b/protocols/purple/purple.rdef index a48209b..ba8f7db 100644 --- a/protocols/purple/purple.rdef +++ b/protocols/purple/purple.rdef @@ -10,7 +10,7 @@ resource app_version { variety = B_APPV_ALPHA, internal = 0, - short_info = "Cardie libpurple add-on", + short_info = "Chat-O-Matic libpurple add-on", long_info = "©2021 Jaidyn Levesque" }; diff --git a/protocols/xmpp/JabberHandler.cpp b/protocols/xmpp/JabberHandler.cpp index 49cd010..1b32b30 100644 --- a/protocols/xmpp/JabberHandler.cpp +++ b/protocols/xmpp/JabberHandler.cpp @@ -434,8 +434,8 @@ JabberHandler::UpdateSettings(BMessage* msg) fClient->registerMessageSessionHandler(this); fClient->registerMUCInvitationHandler(new InviteHandler(fClient, this)); fClient->rosterManager()->registerRosterListener(this); - fClient->disco()->setVersion("Cardie", VERSION); - fClient->disco()->setIdentity("client", "cardie"); + fClient->disco()->setVersion("Chat-O-Matic", VERSION); + fClient->disco()->setIdentity("client", "chat-o-matic"); fClient->logInstance().registerLogHandler(gloox::LogLevelDebug, gloox::LogAreaAll, this); @@ -1354,7 +1354,7 @@ JabberHandler::_SettingsTemplate(const char* username, bool serverOption) resourceText.AddString("name", "resource"); resourceText.AddString("description", B_TRANSLATE("Resource:")); resourceText.AddInt32("type", 'CSTR'); - resourceText.AddString("default", "Cardie"); + resourceText.AddString("default", "Chat-O-Matic"); resourceText.AddString("error", B_TRANSLATE("You can't add an account " "without a resource.\nDon't worry― it can be whatever string you " "want.")); diff --git a/protocols/xmpp/Makefile b/protocols/xmpp/Makefile index 68ad989..1bdcc68 100644 --- a/protocols/xmpp/Makefile +++ b/protocols/xmpp/Makefile @@ -8,7 +8,7 @@ ## file:///system/develop/documentation/makefile-engine.html # The name of the binary. -NAME = cardie/jabber +NAME = chat-o-matic/jabber # The type of binary, must be one of: # APP: Application @@ -18,7 +18,7 @@ NAME = cardie/jabber TYPE = SHARED # If you plan to use localization, specify the application's MIME signature. -APP_MIME_SIG = application/x-vnd.cardie.xmpp +APP_MIME_SIG = application/x-vnd.chat-o-matic.xmpp # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are # so that Pe and Eddie can fill them in for you. diff --git a/protocols/xmpp/jabber.rdef b/protocols/xmpp/jabber.rdef index 4aa9658..f851d2d 100644 --- a/protocols/xmpp/jabber.rdef +++ b/protocols/xmpp/jabber.rdef @@ -7,7 +7,7 @@ resource app_version { variety = B_APPV_ALPHA, internal = 0, - short_info = "Cardie XMPP add-on", + short_info = "Chat-O-Matic XMPP add-on", long_info = "©2010 Pier Luigi Fiorini" };