--- a/pidgin/gtkconv.c Sat Aug 08 23:41:28 2020 -0500
+++ b/pidgin/gtkconv.c Sat Aug 08 23:42:30 2020 -0500
@@ -1844,7 +1844,6 @@
PidginConversation *gtkconv;
PurpleConversation *old_conv;
- PurpleConnectionFlags features;
g_return_if_fail(conv != NULL);
--- a/pidgin/gtkprefs.c Sat Aug 08 23:41:28 2020 -0500
+++ b/pidgin/gtkprefs.c Sat Aug 08 23:42:30 2020 -0500
@@ -1656,8 +1656,6 @@
bind_interface_page(PidginPrefsWindow *win)
win->iface.im.hide_new.type = PURPLE_PREF_STRING;
win->iface.im.hide_new.key = PIDGIN_PREFS_ROOT "/conversations/im/hide_new";
--- a/pidgin/gtkstatusbox.c Sat Aug 08 23:41:28 2020 -0500
+++ b/pidgin/gtkstatusbox.c Sat Aug 08 23:42:30 2020 -0500
@@ -1163,7 +1163,6 @@
pidgin_status_box_list_position (PidginStatusBox *status_box, int *x, int *y, int *width, int *height)
GtkRequisition popup_req;
--- a/pidgin/gtkutils.c Sat Aug 08 23:41:28 2020 -0500
+++ b/pidgin/gtkutils.c Sat Aug 08 23:42:30 2020 -0500
@@ -944,7 +944,6 @@
- PurpleConversation *conv;
--- a/pidgin/pidginaccountsmenu.c Sat Aug 08 23:41:28 2020 -0500
+++ b/pidgin/pidginaccountsmenu.c Sat Aug 08 23:42:30 2020 -0500
@@ -78,10 +78,14 @@
GtkWidget *item = NULL, *submenu = NULL;
+ gboolean found = FALSE; /* if the account is in the disabled list, delete its widget */
- if (g_hash_table_lookup_extended(menu->disabled_items, account, NULL, &item)) {
- g_clear_pointer(&item, gtk_widget_destroy);
+ found = g_hash_table_lookup_extended(menu->disabled_items, account, NULL, + g_clear_pointer(&data, gtk_widget_destroy); g_hash_table_remove(menu->disabled_items, account);
@@ -103,10 +107,14 @@
+ gboolean found = FALSE; /* if the account is in the enabled list, delete its widget */
- if (g_hash_table_lookup_extended(menu->account_items, account, NULL, &item)) {
- g_clear_pointer(&item, gtk_widget_destroy);
+ found = g_hash_table_lookup_extended(menu->account_items, account, NULL, + g_clear_pointer(&data, gtk_widget_destroy); g_hash_table_remove(menu->account_items, account);