Remove all of the current Mood API

The functionality of the mood api is being moved into PurplePresence via the
soon to be added Emoji and Message properties. As such we have no need for the
existing API which is why we are removing all of it.

Testing Done:
Ran `ninja pidgin-pot all tests` successfully and verified there were no new warnings.

Reviewed at https://reviews.imfreedom.org/r/2366/

27 files changed, 1 insertions, 451 deletions

diff --git a/pidgin/meson.build b/pidgin/meson.build
index 0d2b511628..e525556833 100644
--- a/pidgin/meson.build
+++ b/pidgin/meson.build
@@ -45,7 +45,6 @@ libpidgin_SOURCES = [
 	'pidgininvitedialog.c',
 	'pidginkeypad.c',
 	'pidginmessage.c',
-	'pidginmooddialog.c',
 	'pidginnotificationaddcontact.c',
 	'pidginnotificationauthorizationrequest.c',
 	'pidginnotificationconnectionerror.c',
@@ -113,7 +112,6 @@ libpidgin_headers = [
 	'pidgininvitedialog.h',
 	'pidginkeypad.h',
 	'pidginmessage.h',
-	'pidginmooddialog.h',
 	'pidginnotificationaddcontact.h',
 	'pidginnotificationauthorizationrequest.h',
 	'pidginnotificationconnectionerror.h',
diff --git a/pidgin/pidginapplication.c b/pidgin/pidginapplication.c
index 177f67ae84..946288726c 100644
--- a/pidgin/pidginapplication.c
+++ b/pidgin/pidginapplication.c
@@ -48,7 +48,6 @@
 #include "pidgincore.h"
 #include "pidgindebug.h"
 #include "pidgindisplaywindow.h"
-#include "pidginmooddialog.h"
 #include "pidginpluginsdialog.h"
 #include "pidginpluginsmenu.h"
 #include "pidginprefs.h"
@@ -220,7 +219,6 @@ static const gchar *pidgin_application_online_actions[] = {
 	"add-group",
 	"get-user-info",
 	"new-message",
-	"set-mood",
 };
 
 /*< private >
@@ -549,14 +547,6 @@ pidgin_application_room_list(G_GNUC_UNUSED GSimpleAction *simple,
 }
 
 static void
-pidgin_application_set_mood(G_GNUC_UNUSED GSimpleAction *simple,
-                            G_GNUC_UNUSED GVariant *parameter,
-                            G_GNUC_UNUSED gpointer data)
-{
-	pidgin_mood_dialog_show(NULL);
-}
-
-static void
 pidgin_application_show_status_manager(G_GNUC_UNUSED GSimpleAction *simple,
                                        G_GNUC_UNUSED GVariant *parameter,
                                        gpointer data)
@@ -642,9 +632,6 @@ static GActionEntry app_entries[] = {
 		.name = "room-list",
 		.activate = pidgin_application_room_list,
 	}, {
-		.name = "set-mood",
-		.activate = pidgin_application_set_mood,
-	}, {
 		.name = "status-manager",
 		.activate = pidgin_application_show_status_manager,
 	}
diff --git a/pidgin/pidginiconname.c b/pidgin/pidginiconname.c
index 2ccebcd170..9de9067f7e 100644
--- a/pidgin/pidginiconname.c
+++ b/pidgin/pidginiconname.c
@@ -50,7 +50,6 @@ pidgin_icon_name_from_status_primitive(PurpleStatusPrimitive primitive,
 			break;
 		case PURPLE_STATUS_MOBILE:
 		case PURPLE_STATUS_TUNE:
-		case PURPLE_STATUS_MOOD:
 		case PURPLE_STATUS_UNSET:
 		default:
 			break;
diff --git a/pidgin/pidginmooddialog.c b/pidgin/pidginmooddialog.c
deleted file mode 100644
index 61e9ea1f93..0000000000
--- a/pidgin/pidginmooddialog.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#include "pidgin/pidginmooddialog.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "config.h"
-
-/*< private >
- * pidgin_mood_update_status:
- * @account: The #PurpleAccount instance.
- * @mood: The id of the new mood.
- * @text: The new status text.
- *
- * Updates the current status for @account with the given @mood and @text.
- */
-static void
-update_status_with_mood(PurpleAccount *account, const gchar *mood,
-                        const gchar *text)
-{
-	if (mood && *mood) {
-		if (text) {
-			purple_account_set_status(account, "mood", TRUE,
-			                          PURPLE_MOOD_NAME, mood,
-				    				  PURPLE_MOOD_COMMENT, text,
-			                          NULL);
-		} else {
-			purple_account_set_status(account, "mood", TRUE,
-			                          PURPLE_MOOD_NAME, mood,
-			                          NULL);
-		}
-	} else {
-		purple_account_set_status(account, "mood", FALSE, NULL);
-	}
-}
-
-/*< private
- * pidgin_mood_edit_cb:
- * @connection: The #PurpleConnection instance.
- * @page: The #PurpleRequestPage
- *
- * This a callback function for when the request dialog has been accepted.
- */
-static void
-pidgin_mood_dialog_edit_cb(PurpleConnection *connection,
-                           PurpleRequestPage *page)
-{
-	PurpleRequestFieldList *mood_field = NULL;
-	GList *l = NULL;
-	const gchar *mood = NULL;
-
-	mood_field = PURPLE_REQUEST_FIELD_LIST(purple_request_page_get_field(page,
-	                                                                     "mood"));
-	l = purple_request_field_list_get_selected(mood_field);
-
-	if(l == NULL) {
-		return;
-	}
-
-	mood = purple_request_field_list_get_data(mood_field, l->data);
-
-	if(connection != NULL) {
-		PurpleAccount *account = purple_connection_get_account(connection);
-		PurpleConnectionFlags flags;
-		const gchar *text = NULL;
-
-		flags = purple_connection_get_flags(connection);
-		if (flags & PURPLE_CONNECTION_FLAG_SUPPORT_MOOD_MESSAGES) {
-			text = purple_request_page_get_string(page, "text");
-		} else {
-			text = NULL;
-		}
-
-		update_status_with_mood(account, mood, text);
-	} else {
-		GListModel *manager_model = NULL;
-		guint n_items = 0;
-
-		manager_model = purple_account_manager_get_default_as_model();
-		n_items = g_list_model_get_n_items(manager_model);
-		for(guint index = 0; index < n_items; index++) {
-			PurpleAccount *account = NULL;
-
-			account = g_list_model_get_item(manager_model, index);
-			connection = purple_account_get_connection(account);
-			if(PURPLE_IS_CONNECTION(connection)) {
-				PurpleConnectionFlags flags;
-
-				flags = purple_connection_get_flags(connection);
-				if(flags & PURPLE_CONNECTION_FLAG_SUPPORT_MOODS) {
-					update_status_with_mood(account, mood, NULL);
-				}
-			}
-
-			g_object_unref(account);
-		}
-	}
-}
-
-/*< private >
- * pidgin_mood_get_global_moods:
- *
- * Returns an array of all global moods.
- *
- * This function should be in libpurple, and it needs a lot of cleanup.  It
- * should probably also be returning a GList of moods as that's easier to deal
- * with.
- *
- * Also, there is non-deterministic behavior here that the order of the
- * returned moods depends purely on the order that the accounts where connected
- * in.  This is probably okay, but we should look at fixing that somehow.
- *
- * Returns: (transfer full): A list of all global moods.
- */
-static PurpleMood *
-pidgin_mood_get_global_moods(void) {
-	PurpleAccountManager *manager = NULL;
-	GHashTable *global_moods = NULL;
-	GHashTable *mood_counts = NULL;
-	GList *accounts = NULL;
-	PurpleMood *result = NULL;
-	GList *out_moods = NULL;
-	int i = 0;
-	int num_accounts = 0;
-
-	global_moods = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-	mood_counts = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-
-	manager = purple_account_manager_get_default();
-	accounts = purple_account_manager_get_enabled(manager);
-	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
-		PurpleAccount *account = (PurpleAccount *) accounts->data;
-		if (purple_account_is_connected(account)) {
-			PurpleConnection *gc = purple_account_get_connection(account);
-
-			if (purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_SUPPORT_MOODS) {
-				PurpleProtocol *protocol = purple_connection_get_protocol(gc);
-				PurpleMood *mood = NULL;
-
-				for (mood = purple_protocol_client_get_moods(PURPLE_PROTOCOL_CLIENT(protocol), account) ;
-				    mood->mood != NULL ; mood++) {
-					int mood_count =
-							GPOINTER_TO_INT(g_hash_table_lookup(mood_counts, mood->mood));
-
-					if (!g_hash_table_contains(global_moods, mood->mood)) {
-						g_hash_table_insert(global_moods, (gpointer)mood->mood, mood);
-					}
-					g_hash_table_insert(mood_counts, (gpointer)mood->mood,
-					    GINT_TO_POINTER(mood_count + 1));
-				}
-
-				num_accounts++;
-			}
-		}
-	}
-
-	result = g_new0(PurpleMood, g_hash_table_size(global_moods) + 1);
-
-	out_moods = g_hash_table_get_values(global_moods);
-	while (out_moods) {
-		PurpleMood *mood = (PurpleMood *) out_moods->data;
-		int in_num_accounts =
-			GPOINTER_TO_INT(g_hash_table_lookup(mood_counts, mood->mood));
-
-		if (in_num_accounts == num_accounts) {
-			/* mood is present in all accounts supporting moods */
-			result[i].mood = mood->mood;
-			result[i].description = mood->description;
-			i++;
-		}
-		out_moods = g_list_delete_link(out_moods, out_moods);
-	}
-
-	g_hash_table_destroy(global_moods);
-	g_hash_table_destroy(mood_counts);
-
-	return result;
-}
-
-/*< private >
- * pidgin_mood_get_global_status:
- *
- * Get the currently selected mood name for all mood support accounts.  If no
- * mood is set, or accounts have different moods then %NULL is returned.
- *
- * Returns: The currently selected mood name or %NULL if a mood is not set, or
- *          accounts are using different moods.
- */
-static const gchar *
-pidgin_mood_get_global_status(void) {
-	PurpleAccountManager *manager = NULL;
-	GList *accounts = NULL;
-	const gchar *found_mood = NULL;
-
-	manager = purple_account_manager_get_default();
-	accounts = purple_account_manager_get_enabled(manager);
-	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
-		PurpleAccount *account = (PurpleAccount *) accounts->data;
-
-		if (purple_account_is_connected(account) &&
-		    (purple_connection_get_flags(purple_account_get_connection(account)) &
-		     PURPLE_CONNECTION_FLAG_SUPPORT_MOODS)) {
-			PurplePresence *presence = purple_account_get_presence(account);
-			PurpleStatus *status = purple_presence_get_status(presence, "mood");
-			const gchar *curr_mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
-
-			if (found_mood != NULL && !purple_strequal(curr_mood, found_mood)) {
-				/* found a different mood */
-				found_mood = NULL;
-				break;
-			} else {
-				found_mood = curr_mood;
-			}
-		}
-	}
-
-	return found_mood;
-}
-
-/******************************************************************************
- * Public API
- *****************************************************************************/
-void
-pidgin_mood_dialog_show(PurpleAccount *account) {
-	const gchar *current_mood;
-	PurpleRequestPage *page;
-	PurpleRequestGroup *group = NULL;
-	PurpleRequestField *field = NULL;
-	PurpleRequestFieldList *fieldlist = NULL;
-	PurpleConnection *gc = NULL;
-	PurpleProtocol *protocol = NULL;
-	PurpleMood *mood = NULL;
-	PurpleMood *global_moods = NULL;
-
-	if (account) {
-		PurplePresence *presence = purple_account_get_presence(account);
-		PurpleStatus *status = purple_presence_get_status(presence, "mood");
-		gc = purple_account_get_connection(account);
-		g_return_if_fail(purple_connection_get_protocol(gc) != NULL);
-		protocol = purple_connection_get_protocol(gc);
-		current_mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
-	} else {
-		current_mood = pidgin_mood_get_global_status();
-	}
-
-	page = purple_request_page_new();
-	group = purple_request_group_new(NULL);
-	field = purple_request_field_list_new("mood",
-	                                      _("Please select your mood from the list"));
-	fieldlist = PURPLE_REQUEST_FIELD_LIST(field);
-
-	purple_request_field_list_add_icon(fieldlist, _("None"), NULL, "");
-	if(current_mood == NULL) {
-		purple_request_field_list_add_selected(fieldlist, _("None"));
-	}
-
-	/* TODO: rlaager wants this sorted. */
-	/* TODO: darkrain wants it sorted post-translation */
-	if (account && PURPLE_IS_PROTOCOL_CLIENT(protocol)) {
-		mood = purple_protocol_client_get_moods(PURPLE_PROTOCOL_CLIENT(protocol), account);
-	}
-
-	if(mood == NULL) {
-		mood = global_moods = pidgin_mood_get_global_moods();
-	}
-
-	for ( ; mood != NULL && mood->mood != NULL ; mood++) {
-		char *path;
-
-		if (mood->description == NULL) {
-			continue;
-		}
-
-		path = pidgin_mood_get_icon_path(mood->mood);
-		purple_request_field_list_add_icon(fieldlist, _(mood->description),
-		                                   path, (gpointer)mood->mood);
-		g_free(path);
-
-		if (current_mood && purple_strequal(current_mood, mood->mood))
-			purple_request_field_list_add_selected(fieldlist, _(mood->description));
-	}
-	purple_request_group_add_field(group, field);
-
-	purple_request_page_add_group(page, group);
-
-	/* if the connection allows setting a mood message */
-	if (gc && (purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_SUPPORT_MOOD_MESSAGES)) {
-		group = purple_request_group_new(NULL);
-		field = purple_request_field_string_new("text", _("Message (optional)"),
-		                                        NULL, FALSE);
-		purple_request_group_add_field(group, field);
-		purple_request_page_add_group(page, group);
-	}
-
-	purple_request_fields(gc, _("Edit User Mood"), _("Edit User Mood"),
-	                      NULL, page,
-	                      _("OK"), G_CALLBACK(pidgin_mood_dialog_edit_cb),
-	                      _("Cancel"), NULL,
-	                      purple_request_cpar_from_connection(gc), gc);
-
-	g_free(global_moods);
-}
-
-gchar *
-pidgin_mood_get_icon_path(const gchar *mood) {
-	gchar *path;
-
-	if(purple_strequal(mood, "busy")) {
-		path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",
-			"hicolor", "16x16", "status", "user-busy.png", NULL);
-	} else if(purple_strequal(mood, "hiptop")) {
-		path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",
-			"hicolor", "16x16", "emblems", "emblem-hiptop.png",
-			NULL);
-	} else {
-		gchar *filename = g_strdup_printf("%s.png", mood);
-		path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
-			"emotes", "small", filename, NULL);
-		g_free(filename);
-	}
-
-	return path;
-}
-
diff --git a/pidgin/pidginmooddialog.h b/pidgin/pidginmooddialog.h
deleted file mode 100644
index 1c263c67fa..0000000000
--- a/pidgin/pidginmooddialog.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
-# error "only <pidgin.h> may be included directly"
-#endif
-
-#ifndef PIDGIN_MOOD_DIALOG_H
-#define PIDGIN_MOOD_DIALOG_H
-
-#include <glib.h>
-
-#include <gtk/gtk.h>
-
-#include <purple.h>
-
-G_BEGIN_DECLS
-
-/**
- * pidgin_mood_dialog_show:
- * @account: (nullable): The #PurpleAccount whose mood to set, or %NULL for the
- *           global mood.
- *
- * Presents a dialog to select the mood for @account or the global mood if
- * @account is %NULL.
- */
-void pidgin_mood_dialog_show(PurpleAccount *account);
-
-/**
- * pidgin_mood_get_icon_path:
- * @mood: The id of the mood.
- *
- * Gets the path to the icon for @mood.
- *
- * Returns: (transfer full): The location of the icon for @mood.
- */
-gchar *pidgin_mood_get_icon_path(const gchar *mood);
-
-G_END_DECLS
-
-#endif /* PIDGIN_MOOD_DIALOG_H */
-
diff --git a/pidgin/pixmaps/emotes/small/16/afraid.png b/pidgin/pixmaps/emotes/small/16/afraid.png
deleted file mode 100644
index b10a1a0abf..0000000000
--- a/pidgin/pixmaps/emotes/small/16/afraid.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/bathing.png b/pidgin/pixmaps/emotes/small/16/bathing.png
deleted file mode 100644
index 662eb2ac97..0000000000
--- a/pidgin/pixmaps/emotes/small/16/bathing.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/cinema.png b/pidgin/pixmaps/emotes/small/16/cinema.png
deleted file mode 100644
index e561cb0791..0000000000
--- a/pidgin/pixmaps/emotes/small/16/cinema.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/disappointed.png b/pidgin/pixmaps/emotes/small/16/disappointed.png
deleted file mode 100644
index 3b3e2a12b8..0000000000
--- a/pidgin/pixmaps/emotes/small/16/disappointed.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/embarrassed.png b/pidgin/pixmaps/emotes/small/16/embarrassed.png
deleted file mode 100644
index d93f44c044..0000000000
--- a/pidgin/pixmaps/emotes/small/16/embarrassed.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/grumpy.png b/pidgin/pixmaps/emotes/small/16/grumpy.png
deleted file mode 100644
index 51a3b81640..0000000000
--- a/pidgin/pixmaps/emotes/small/16/grumpy.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/hot.png b/pidgin/pixmaps/emotes/small/16/hot.png
deleted file mode 100644
index 3df80d4d78..0000000000
--- a/pidgin/pixmaps/emotes/small/16/hot.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/internet.png b/pidgin/pixmaps/emotes/small/16/internet.png
deleted file mode 100644
index 9281221f98..0000000000
--- a/pidgin/pixmaps/emotes/small/16/internet.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/invincible.png b/pidgin/pixmaps/emotes/small/16/invincible.png
deleted file mode 100644
index d6207f3de4..0000000000
--- a/pidgin/pixmaps/emotes/small/16/invincible.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/meson.build b/pidgin/pixmaps/emotes/small/16/meson.build
index c906fa285f..6d717f3e53 100644
--- a/pidgin/pixmaps/emotes/small/16/meson.build
+++ b/pidgin/pixmaps/emotes/small/16/meson.build
@@ -1,26 +1,3 @@
-# These are mood images that are NOT also used in the smiley theme.
-MOODS = [
-    'afraid.png',
-    'bathing.png',
-    'cinema.png',
-    'disappointed.png',
-    'embarrassed.png',
-    'grumpy.png',
-    'hot.png',
-    'internet.png',
-    'invincible.png',
-    'music.png',
-    'restroom.png',
-    'search.png',
-    'shopping.png',
-    'studying.png',
-    'suit.png',
-    'surfing.png',
-    'typing.png',
-    'working.png',
-    'writing.png'
-]
-
 SMILEYS = [
     'amorous.png',
     'angel.png',
@@ -94,4 +71,4 @@ custom_target('small-theme',
     install : true,
     install_dir : pidginsmileypixdir)
 
-install_data(MOODS + SMILEYS, install_dir : pidginsmileypixdir)
+install_data(SMILEYS, install_dir : pidginsmileypixdir)
diff --git a/pidgin/pixmaps/emotes/small/16/music.png b/pidgin/pixmaps/emotes/small/16/music.png
deleted file mode 100644
index 4b40b6eedf..0000000000
--- a/pidgin/pixmaps/emotes/small/16/music.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/restroom.png b/pidgin/pixmaps/emotes/small/16/restroom.png
deleted file mode 100644
index a642e7d53c..0000000000
--- a/pidgin/pixmaps/emotes/small/16/restroom.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/search.png b/pidgin/pixmaps/emotes/small/16/search.png
deleted file mode 100644
index 47bf89f81c..0000000000
--- a/pidgin/pixmaps/emotes/small/16/search.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/shopping.png b/pidgin/pixmaps/emotes/small/16/shopping.png
deleted file mode 100644
index 291107ae64..0000000000
--- a/pidgin/pixmaps/emotes/small/16/shopping.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/studying.png b/pidgin/pixmaps/emotes/small/16/studying.png
deleted file mode 100644
index 0a6053f86c..0000000000
--- a/pidgin/pixmaps/emotes/small/16/studying.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/suit.png b/pidgin/pixmaps/emotes/small/16/suit.png
deleted file mode 100644
index 3c0080f0dd..0000000000
--- a/pidgin/pixmaps/emotes/small/16/suit.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/surfing.png b/pidgin/pixmaps/emotes/small/16/surfing.png
deleted file mode 100644
index 727b352f72..0000000000
--- a/pidgin/pixmaps/emotes/small/16/surfing.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/typing.png b/pidgin/pixmaps/emotes/small/16/typing.png
deleted file mode 100644
index 7f60b0a25e..0000000000
--- a/pidgin/pixmaps/emotes/small/16/typing.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/working.png b/pidgin/pixmaps/emotes/small/16/working.png
deleted file mode 100644
index cc90d637df..0000000000
--- a/pidgin/pixmaps/emotes/small/16/working.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/writing.png b/pidgin/pixmaps/emotes/small/16/writing.png
deleted file mode 100644
index e8b5d0d53e..0000000000
--- a/pidgin/pixmaps/emotes/small/16/writing.png
+++ /dev/null
diff --git a/pidgin/plugins/unity/unity.c b/pidgin/plugins/unity/unity.c
index 89159f60ed..538ca5f3fb 100644
--- a/pidgin/plugins/unity/unity.c
+++ b/pidgin/plugins/unity/unity.c
@@ -349,7 +349,6 @@ status_changed_cb(PurpleSavedStatus *saved_status)
 
 	switch (purple_savedstatus_get_primitive_type(saved_status)) {
 	case PURPLE_STATUS_AVAILABLE:
-	case PURPLE_STATUS_MOOD:
 	case PURPLE_STATUS_TUNE:
 	case PURPLE_STATUS_UNSET:
 		status = MESSAGING_MENU_STATUS_AVAILABLE;
diff --git a/pidgin/resources/gtk/menus.ui b/pidgin/resources/gtk/menus.ui
index ac36573aba..9e24d4f44b 100644
--- a/pidgin/resources/gtk/menus.ui
+++ b/pidgin/resources/gtk/menus.ui
@@ -183,11 +183,6 @@ along with this program; if not, see <https://www.gnu.org/licenses/>.
           <attribute name="accel">&lt;Primary&gt;P</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Set _Mood</attribute>
-          <attribute name="action">app.set-mood</attribute>
-          <attribute name="accel">&lt;Primary&gt;D</attribute>
-        </item>
-        <item>
           <attribute name="label" translatable="yes">_Statuses</attribute>
           <attribute name="action">app.status-manager</attribute>
         </item>