From 6671a385c3f4bce6ccdd35da4e2489f83aa0fae0 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 22 Mar 2018 15:50:37 +0000 Subject: [PATCH 5/7] Pidgin: Kill "transient_buddy" hack It's not clear what this ever achieved anyway. Let's kill it as we're about to try to do a better job... --- pidgin/gtkconv.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index 10eaf82..6b05536 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -2332,7 +2332,6 @@ pidgin_conv_switch_active_conversation(PurpleConversation *conv) gray_stuff_out(gtkconv); update_typing_icon(gtkconv); - g_object_set_data(G_OBJECT(entry), "transient_buddy", NULL); regenerate_options_items(gtkconv->win); gtk_window_set_title(GTK_WINDOW(gtkconv->win->window), @@ -3223,22 +3222,6 @@ populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolea return FALSE; buddy = purple_find_buddy(conv->account, conv->name); - - /* gotta remain bug-compatible :( libpurple < 2.0.2 didn't handle - * removing "isolated" buddy nodes well */ - if (purple_version_check(2, 0, 2) == NULL) { - if ((buddy == NULL) && (gtkconv->imhtml != NULL)) { - buddy = g_object_get_data(G_OBJECT(gtkconv->imhtml), "transient_buddy"); - } - - if ((buddy == NULL) && (gtkconv->imhtml != NULL)) { - buddy = purple_buddy_new(conv->account, conv->name, NULL); - purple_blist_node_set_flags((PurpleBlistNode *)buddy, - PURPLE_BLIST_NODE_FLAG_NO_SAVE); - g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy", - buddy, (GDestroyNotify)purple_buddy_destroy); - } - } } if (chat) @@ -4846,11 +4829,6 @@ pidgin_conv_create_tooltip(GtkWidget *tipwindow, gpointer userdata, int *w, int node = g_object_get_data(G_OBJECT(gtkconv->imhtml), "transient_chat"); } else { node = (PurpleBlistNode*)(purple_find_buddy(conv->account, conv->name)); -#if 0 - /* Using the transient blist nodes to show the tooltip doesn't quite work yet. */ - if (!node) - node = g_object_get_data(G_OBJECT(gtkconv->imhtml), "transient_buddy"); -#endif } if (node) -- 2.7.4