--- a/libpurple/protocols/jabber/jabber.c Mon Mar 20 21:12:08 2023 -0500
+++ b/libpurple/protocols/jabber/jabber.c Mon Mar 20 21:14:42 2023 -0500
@@ -49,7 +49,6 @@
#include "adhoccommands.h"
@@ -1560,7 +1559,7 @@
-jabber_tooltip_text(PurpleProtocolClient *client, PurpleBuddy *b,
+jabber_tooltip_text(G_GNUC_UNUSED PurpleProtocolClient *client, PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full)
@@ -1586,7 +1585,6 @@
PurplePresence *presence = purple_buddy_get_presence(b);
gboolean multiple_resources =
jb->resources && g_list_next(jb->resources);
JabberBuddyResource *top_jbr = jabber_buddy_find_resource(jb, NULL);
@@ -1607,34 +1605,6 @@
- status = purple_presence_get_status(presence, "mood");
- mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
- PurpleMood *moods = jabber_get_moods(client, account);
- const char *description = NULL;
- for (; moods->mood ; moods++) {
- if (purple_strequal(moods->mood, mood)) {
- description = moods->description;
- moodtext = purple_status_get_attr_string(status, PURPLE_MOOD_COMMENT);
- if(moodtext && *moodtext) {
- g_strdup_printf("%s (%s)", description ? _(description) : mood, moodtext);
- purple_notify_user_info_add_pair_html(user_info, _("Mood"), moodplustext);
- purple_notify_user_info_add_pair_html(user_info, _("Mood"),
- description ? _(description) : mood);
if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
PurpleStatus *tune = purple_presence_get_status(presence, "tune");
const char *title = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
@@ -1691,21 +1661,11 @@
"priority", _("Priority"), priority_value,
"message", _("Message"), purple_value_new(G_TYPE_STRING),
- "mood", _("Mood"), purple_value_new(G_TYPE_STRING),
- "moodtext", _("Mood Text"), purple_value_new(G_TYPE_STRING),
"nick", _("Nickname"), purple_value_new(G_TYPE_STRING),
"buzz", _("Allow Buzz"), buzz_enabled,
types = g_list_prepend(types, type);
- type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD,
- "mood", NULL, TRUE, TRUE, TRUE,
- PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new(G_TYPE_STRING),
- PURPLE_MOOD_COMMENT, _("Mood Comment"), purple_value_new(G_TYPE_STRING),
- types = g_list_prepend(types, type);
priority_value = purple_value_new(G_TYPE_INT);
g_value_set_int(priority_value, 1);
buzz_enabled = purple_value_new(G_TYPE_BOOLEAN);
@@ -1715,8 +1675,6 @@
_("Chatty"), TRUE, TRUE, FALSE,
"priority", _("Priority"), priority_value,
"message", _("Message"), purple_value_new(G_TYPE_STRING),
- "mood", _("Mood"), purple_value_new(G_TYPE_STRING),
- "moodtext", _("Mood Text"), purple_value_new(G_TYPE_STRING),
"nick", _("Nickname"), purple_value_new(G_TYPE_STRING),
"buzz", _("Allow Buzz"), buzz_enabled,
@@ -1731,8 +1689,6 @@
"priority", _("Priority"), priority_value,
"message", _("Message"), purple_value_new(G_TYPE_STRING),
- "mood", _("Mood"), purple_value_new(G_TYPE_STRING),
- "moodtext", _("Mood Text"), purple_value_new(G_TYPE_STRING),
"nick", _("Nickname"), purple_value_new(G_TYPE_STRING),
"buzz", _("Allow Buzz"), buzz_enabled,
@@ -1747,8 +1703,6 @@
"priority", _("Priority"), priority_value,
"message", _("Message"), purple_value_new(G_TYPE_STRING),
- "mood", _("Mood"), purple_value_new(G_TYPE_STRING),
- "moodtext", _("Mood Text"), purple_value_new(G_TYPE_STRING),
"nick", _("Nickname"), purple_value_new(G_TYPE_STRING),
"buzz", _("Allow Buzz"), buzz_enabled,
@@ -1761,8 +1715,6 @@
_("Do Not Disturb"), TRUE, TRUE, FALSE,
"priority", _("Priority"), priority_value,
"message", _("Message"), purple_value_new(G_TYPE_STRING),
- "mood", _("Mood"), purple_value_new(G_TYPE_STRING),
- "moodtext", _("Mood Text"), purple_value_new(G_TYPE_STRING),
"nick", _("Nickname"), purple_value_new(G_TYPE_STRING),
types = g_list_prepend(types, type);
@@ -2875,50 +2827,6 @@
-jabber_cmd_mood(PurpleConversation *conv, G_GNUC_UNUSED const char *cmd,
- char **args, G_GNUC_UNUSED char **error,
- G_GNUC_UNUSED gpointer data)
- PurpleAccount *account = purple_conversation_get_account(conv);
- JabberStream *js = purple_connection_get_protocol_data(purple_account_get_connection(account));
- if (!args || !args[0]) {
- /* No arguments; unset mood */
- ret = jabber_mood_set(js, NULL, NULL);
- /* At least one argument. Relying on the list of arguments
- * being NULL-terminated.
- ret = jabber_mood_set(js, args[0], args[1]);
- char *tmp = g_strjoin(" ", args[0], args[1], NULL);
- ret = jabber_mood_set(js, "undefined", tmp);
- return PURPLE_CMD_RET_OK;
- purple_conversation_write_system_message(conv,
- _("Failed to specify mood"),
- return PURPLE_CMD_RET_FAILED;
- /* account does not support PEP, can't set a mood */
- purple_conversation_write_system_message(conv,
- _("Account does not support PEP, can't set mood"),
- return PURPLE_CMD_RET_FAILED;
jabber_register_commands(PurpleProtocol *protocol)
@@ -3020,13 +2928,6 @@
_("ping <jid>: Ping a user/component/server."), NULL);
commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
- id = purple_cmd_register("mood", "ws", PURPLE_CMD_P_PROTOCOL,
- PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
- PURPLE_CMD_FLAG_PROTOCOL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS,
- proto_id, jabber_cmd_mood,
- _("mood <mood> [text]: Set current user mood"), NULL);
- commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
g_hash_table_insert(jabber_cmds, protocol, commands);
@@ -3382,7 +3283,6 @@
client_iface->normalize = jabber_client_normalize;
client_iface->find_blist_chat = jabber_find_blist_chat;
client_iface->offline_message = jabber_offline_message;
- client_iface->get_moods = jabber_get_moods;
--- a/libpurple/purpleprotocolclient.h Mon Mar 20 21:12:08 2023 -0500
+++ b/libpurple/purpleprotocolclient.h Mon Mar 20 21:14:42 2023 -0500
@@ -89,8 +89,6 @@
* The hash table should be destroyed
* by the caller when it's no longer
- * @get_moods: Returns an array of #PurpleMood's, with the last one having
* @get_max_message_size: Gets the maximum message size in bytes for the
* <sbr/>It may depend on connection-specific or
@@ -135,8 +133,6 @@
GHashTable *(*get_account_text_table)(PurpleProtocolClient *client, PurpleAccount *account);
- PurpleMood *(*get_moods)(PurpleProtocolClient *client, PurpleAccount *account);
gssize (*get_max_message_size)(PurpleProtocolClient *client, PurpleConversation *conv);
@@ -277,19 +273,6 @@
GHashTable *purple_protocol_client_get_account_text_table(PurpleProtocolClient *client, PurpleAccount *account);
- * purple_protocol_client_get_moods:
- * @client: The #PurpleProtocolClient instance.
- * @account: A #PurpleAccount instance.
- * Gets the mood's for @account.
- * Returns: (transfer none): A %NULL terminated array of #PurpleMood's.
-PurpleMood *purple_protocol_client_get_moods(PurpleProtocolClient *client, PurpleAccount *account);
* purple_protocol_client_get_max_message_size:
* @client: The #PurpleProtocolClient instance.
* @conv: A #PurpleConversation instance.
--- a/libpurple/status.c Mon Mar 20 21:12:08 2023 -0500
+++ b/libpurple/status.c Mon Mar 20 21:14:42 2023 -0500
@@ -110,7 +110,6 @@
-200, /* extended away */
-10, /* idle, special case. */
-5, /* idle time, special case. */
10 /* Offline messageable */
@@ -140,7 +139,6 @@
{ PURPLE_STATUS_EXTENDED_AWAY, "extended_away", N_("Extended away") },
{ PURPLE_STATUS_MOBILE, "mobile", N_("Mobile") },
{ PURPLE_STATUS_TUNE, "tune", N_("Listening to music"), },
- { PURPLE_STATUS_MOOD, "mood", N_("Feeling") },
@@ -1008,48 +1006,6 @@
/**************************************************************************
-* GBoxed code for PurpleMood
-**************************************************************************/
-purple_mood_copy(PurpleMood *mood)
- g_return_val_if_fail(mood != NULL, NULL);
- mood_copy = g_new(PurpleMood, 1);
- mood_copy->mood = g_strdup(mood->mood);
- mood_copy->description = g_strdup(mood->description);
-purple_mood_free(PurpleMood *mood)
- g_free((gchar *)mood->mood);
- g_free((gchar *)mood->description);
-purple_mood_get_type(void)
- type = g_boxed_type_register_static("PurpleMood",
- (GBoxedCopyFunc)purple_mood_copy,
- (GBoxedFreeFunc)purple_mood_free);
-/**************************************************************************
**************************************************************************/
--- a/libpurple/status.h Mon Mar 20 21:12:08 2023 -0500
+++ b/libpurple/status.h Mon Mar 20 21:14:42 2023 -0500
@@ -81,24 +81,6 @@
typedef struct _PurpleStatusAttribute PurpleStatusAttribute;
-#define PURPLE_TYPE_MOOD (purple_mood_get_type())
- * @mood: A string representing the mood.
- * @description: A short description of the mood.
- * A structure to represent a mood.
- const char *description;
* @PURPLE_STATUS_UNSET: The status is not set
@@ -110,7 +92,6 @@
* @PURPLE_STATUS_EXTENDED_AWAY: The status is extended away/do not disturb
* @PURPLE_STATUS_MOBILE: The status is mobile
* @PURPLE_STATUS_TUNE: The status includes a song title
- * @PURPLE_STATUS_MOOD: The status includes a mood
* @PURPLE_STATUS_NUM_PRIMITIVES: The number of #PurpleStatusPrimitive<!-- -->s
* A primitive defining the basic structure of a status type.
@@ -130,7 +111,6 @@
PURPLE_STATUS_EXTENDED_AWAY,
PURPLE_STATUS_NUM_PRIMITIVES, /*< skip >*/
@@ -207,9 +187,6 @@
#define PURPLE_TUNE_YEAR "tune_year"
-#define PURPLE_MOOD_NAME "mood"
-#define PURPLE_MOOD_COMMENT "moodtext"
/**************************************************************************/
@@ -564,19 +541,6 @@
GValue *purple_status_attribute_get_value(const PurpleStatusAttribute *attr);
/**************************************************************************/
-/**************************************************************************/
- * purple_mood_get_type:
- * The standard _get_type function for #PurpleMood.
- * Returns: The #GType for the #PurpleMood boxed structure.
-GType purple_mood_get_type(void);
-/**************************************************************************/
/**************************************************************************/
--- a/pidgin/pidginapplication.c Mon Mar 20 21:12:08 2023 -0500
+++ b/pidgin/pidginapplication.c Mon Mar 20 21:14:42 2023 -0500
@@ -48,7 +48,6 @@
#include "pidgindisplaywindow.h"
-#include "pidginmooddialog.h"
#include "pidginpluginsdialog.h"
#include "pidginpluginsmenu.h"
@@ -220,7 +219,6 @@
@@ -549,14 +547,6 @@
-pidgin_application_set_mood(G_GNUC_UNUSED GSimpleAction *simple,
- G_GNUC_UNUSED GVariant *parameter,
- G_GNUC_UNUSED gpointer data)
- pidgin_mood_dialog_show(NULL);
pidgin_application_show_status_manager(G_GNUC_UNUSED GSimpleAction *simple,
G_GNUC_UNUSED GVariant *parameter,
@@ -642,9 +632,6 @@
.activate = pidgin_application_room_list,
- .activate = pidgin_application_set_mood,
.name = "status-manager",
.activate = pidgin_application_show_status_manager,
--- a/po/POTFILES.in Mon Mar 20 21:12:08 2023 -0500
+++ b/po/POTFILES.in Mon Mar 20 21:14:42 2023 -0500
@@ -152,7 +152,6 @@
libpurple/protocols/jabber/tests/test_jabber_jutil.c
libpurple/protocols/jabber/tests/test_jabber_scram.c
libpurple/protocols/jabber/useravatar.c
-libpurple/protocols/jabber/usermood.c
libpurple/protocols/jabber/usernick.c
libpurple/protocols/jabber/usertune.c
libpurple/protocols/jabber/xdata.c
@@ -282,7 +281,6 @@
pidgin/pidgininvitedialog.c
-pidgin/pidginmooddialog.c
pidgin/pidginplugininfo.c
pidgin/pidginpluginsdialog.c
pidgin/pidginpluginsmenu.c