--- a/ChangeLog.API Mon Oct 18 01:36:58 2021 -0500
+++ b/ChangeLog.API Mon Oct 18 01:40:57 2021 -0500
@@ -801,6 +801,7 @@
* pidgin_dialog_get_vbox_with_properties
* pidgin_dialogs_alias_contact
* pidgin_make_mini_dialog_with_custom_icon; use
pidgin_mini_dialog_new_with_custom_icon instead.
* pidgin_make_pretty_arrows
--- a/pidgin/gtkblist.c Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/gtkblist.c Mon Oct 18 01:40:57 2021 -0500
@@ -47,7 +47,6 @@
#include "pidgin/pidgincore.h"
#include "pidgin/pidgindebug.h"
#include "pidgin/pidgingdkpixbuf.h"
-#include "pidgin/pidginlog.h"
#include "pidgin/pidginmooddialog.h"
#include "pidgin/pidginplugininfo.h"
#include "pidginscrollbook.h"
@@ -691,49 +690,6 @@
gtk_tree_path_free(path);
-static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node)
- PurpleAccount *account;
- pidgin_set_cursor(gtkblist->window, GDK_WATCH);
- if (PURPLE_IS_BUDDY(node)) {
- PurpleBuddy *b = (PurpleBuddy*) node;
- name = g_strdup(purple_buddy_get_name(b));
- account = purple_buddy_get_account(b);
- } else if (PURPLE_IS_CHAT(node)) {
- PurpleChat *c = PURPLE_CHAT(node);
- PurpleProtocol *protocol = NULL;
- type = PURPLE_LOG_CHAT;
- account = purple_chat_get_account(c);
- protocol = purple_account_get_protocol(account);
- name = purple_protocol_chat_get_name(PURPLE_PROTOCOL_CHAT(protocol),
- purple_chat_get_components(c));
- } else if (PURPLE_IS_CONTACT(node)) {
- pidgin_log_show_contact(PURPLE_CONTACT(node));
- pidgin_clear_cursor(gtkblist->window);
- pidgin_clear_cursor(gtkblist->window);
- /* This callback should not have been registered for a node
- * that doesn't match the type of one of the blocks above. */
- pidgin_log_show(type, name, account);
- pidgin_clear_cursor(gtkblist->window);
static void gtk_blist_menu_showoffline_cb(GtkWidget *w, PurpleBlistNode *node)
if (PURPLE_IS_BUDDY(node))
@@ -1529,15 +1485,6 @@
- if (node->parent && node->parent->child->next &&
- !sub && !contact_expanded) {
- pidgin_new_menu_item(menu, _("View _Log"), NULL,
- G_CALLBACK(gtk_blist_menu_showlog_cb), contact);
- pidgin_new_menu_item(menu, _("View _Log"), NULL,
- G_CALLBACK(gtk_blist_menu_showlog_cb), buddy);
if (!purple_blist_node_is_transient(node)) {
gboolean show_offline = purple_blist_node_get_bool(node, "show_offline");
pidgin_new_menu_item(menu,
@@ -1752,8 +1699,6 @@
pidgin_new_check_item(menu, _("Persistent"),
G_CALLBACK(gtk_blist_menu_persistent_cb), node,
- pidgin_new_menu_item(menu, _("View _Log"), NULL,
- G_CALLBACK(gtk_blist_menu_showlog_cb), node);
pidgin_append_blist_node_proto_menu(menu, purple_account_get_connection(purple_chat_get_account(c)), node);
pidgin_append_blist_node_extended_menu(menu, node);
@@ -1779,12 +1724,6 @@
- pidgin_new_menu_item(menu, _("View _Log"), NULL,
- G_CALLBACK(gtk_blist_menu_showlog_cb),
- pidgin_separator(menu);
pidgin_new_menu_item(menu, _("_Alias..."), NULL,
G_CALLBACK(gtk_blist_menu_alias_cb), node);
pidgin_new_menu_item(menu, _("_Remove"), NULL,
--- a/pidgin/gtkconv.c Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/gtkconv.c Mon Oct 18 01:40:57 2021 -0500
@@ -58,7 +58,6 @@
#include "pidgingdkpixbuf.h"
#include "pidgininfopane.h"
#include "pidgininvitedialog.h"
#include "pidginmenutray.h"
#include "pidginmessage.h"
#include "pidginpresenceicon.h"
@@ -596,56 +595,6 @@
-menu_view_log_cb(GtkAction *action, gpointer data)
- PidginConvWindow *win = data;
- PurpleConversation *conv;
- PidginBuddyList *gtkblist;
- PurpleAccount *account;
- conv = pidgin_conv_window_get_active_conversation(win);
- if (PURPLE_IS_IM_CONVERSATION(conv))
- else if (PURPLE_IS_CHAT_CONVERSATION(conv))
- type = PURPLE_LOG_CHAT;
- gtkblist = pidgin_blist_get_default_gtk_blist();
- pidgin_set_cursor(gtkblist->window, GDK_WATCH);
- pidgin_set_cursor(win->window, GDK_WATCH);
- name = purple_conversation_get_name(conv);
- account = purple_conversation_get_account(conv);
- buddies = purple_blist_find_buddies(account, name);
- for (cur = buddies; cur != NULL; cur = cur->next)
- PurpleBlistNode *node = cur->data;
- if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
- pidgin_log_show_contact((PurpleContact *)node->parent);
- pidgin_clear_cursor(gtkblist->window);
- pidgin_clear_cursor(win->window);
- pidgin_log_show(type, name, account);
- pidgin_clear_cursor(gtkblist->window);
- pidgin_clear_cursor(win->window);
menu_initiate_media_call_cb(GtkAction *action, gpointer data)
@@ -1644,7 +1593,6 @@
{ "ConversationMenu", NULL, N_("_Conversation"), NULL, NULL, NULL },
- { "ViewLog", NULL, N_("View _Log"), NULL, NULL, G_CALLBACK(menu_view_log_cb) },
{ "SaveAs", NULL, N_("_Save As..."), NULL, NULL, G_CALLBACK(menu_save_as_cb) },
@@ -1676,7 +1624,6 @@
"<menubar name='Conversation'>"
"<menu action='ConversationMenu'>"
- "<menuitem action='ViewLog'/>"
"<menuitem action='SaveAs'/>"
@@ -2050,10 +1997,6 @@
menuitem = gtk_ui_manager_get_widget(win->menu->ui, "/Conversation/ConversationMenu");
g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menubar_activated), win);
- gtk_ui_manager_get_action(win->menu->ui,
- "/Conversation/ConversationMenu/ViewLog");
gtk_ui_manager_get_action(win->menu->ui,
--- a/pidgin/gtkdialogs.c Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/gtkdialogs.c Mon Oct 18 01:40:57 2021 -0500
@@ -41,7 +41,6 @@
#include "pidgindialog.h"
static GList *dialogwindows = NULL;
@@ -271,95 +270,6 @@
-pidgin_dialogs_log_cb(gpointer data, PurpleRequestFields *fields)
- PurpleAccount *account;
- account = purple_request_fields_get_account(fields, "account");
- username = g_strdup(purple_normalize(account,
- purple_request_fields_get_string(fields, "screenname")));
- if (username != NULL && *username != '\0' && account != NULL)
- PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
- pidgin_set_cursor(gtkblist->window, GDK_WATCH);
- buddies = purple_blist_find_buddies(account, username);
- for (cur = buddies; cur != NULL; cur = cur->next)
- PurpleBlistNode *node = cur->data;
- if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
- pidgin_log_show_contact((PurpleContact *)node->parent);
- pidgin_clear_cursor(gtkblist->window);
- pidgin_log_show(PURPLE_LOG_IM, username, account);
- pidgin_clear_cursor(gtkblist->window);
- * TODO - This needs to deal with logs of all types, not just IM logs.
-pidgin_dialogs_log(void)
- PurpleRequestFields *fields;
- PurpleRequestFieldGroup *group;
- PurpleRequestField *field;
- fields = purple_request_fields_new();
- group = purple_request_field_group_new(NULL);
- purple_request_fields_add_group(fields, group);
- field = purple_request_field_string_new("screenname", _("_Name"), NULL, FALSE);
- purple_request_field_set_type_hint(field, "screenname-all");
- purple_request_field_set_required(field, TRUE);
- purple_request_field_group_add_field(group, field);
- field = purple_request_field_account_new("account", _("_Account"), NULL);
- /* purple_request_field_account_new() only sets a default value if you're
- * connected, and it sets it from the list of connected accounts. Since
- * we're going to set show_all here, it makes sense to use the first
- * account, not the first connected account. */
- if (purple_accounts_get_all() != NULL) {
- purple_request_field_account_set_default_value(field, purple_accounts_get_all()->data);
- purple_request_field_account_set_value(field, purple_accounts_get_all()->data);
- purple_request_field_set_type_hint(field, "account");
- purple_request_field_account_set_show_all(field, TRUE);
- purple_request_field_set_visible(field,
- (purple_accounts_get_all() != NULL &&
- purple_accounts_get_all()->next != NULL));
- purple_request_field_set_required(field, TRUE);
- purple_request_field_group_add_field(group, field);
- purple_blist_get_default(), _("View User Log"), NULL,
- _("Please enter the username or alias of the person "
- "whose log you would like to view."),
- fields, _("OK"), G_CALLBACK(pidgin_dialogs_log_cb), _("Cancel"),
pidgin_dialogs_alias_buddy_cb(PurpleBuddy *buddy, const char *new_alias)
purple_buddy_set_local_alias(buddy, new_alias);
--- a/pidgin/libpidgin.c Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/libpidgin.c Mon Oct 18 01:40:57 2021 -0500
@@ -50,7 +50,6 @@
#include "pidginapplication.h"
#include "pidginplugininfo.h"
#include "pidginprivate.h"
@@ -239,7 +238,6 @@
--- a/pidgin/meson.build Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/meson.build Mon Oct 18 01:40:57 2021 -0500
@@ -47,7 +47,6 @@
@@ -114,7 +113,6 @@
--- a/pidgin/pidginapplication.c Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/pidginapplication.c Mon Oct 18 01:40:57 2021 -0500
@@ -44,7 +44,6 @@
#include "pidginmooddialog.h"
#include "pidgin/pidginpluginsdialog.h"
@@ -280,20 +279,6 @@
pidgin_mood_dialog_show(NULL);
-pidgin_application_system_log(GSimpleAction *simple, GVariant *parameter,
-pidgin_application_view_user_log(GSimpleAction *simple, GVariant *parameter,
static GActionEntry app_entries[] = {
@@ -346,12 +331,6 @@
.activate = pidgin_application_set_mood,
- .activate = pidgin_application_system_log,
- .name = "view-user-log",
- .activate = pidgin_application_view_user_log,
--- a/pidgin/resources/BuddyList/window.ui Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/resources/BuddyList/window.ui Mon Oct 18 01:40:57 2021 -0500
@@ -80,16 +80,6 @@
- <object class="GtkMenuItem" id="view_user_log">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="action-name">app.view-user-log</property>
- <property name="label" translatable="yes">View User _Log...</property>
- <property name="use-underline">True</property>
- <accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<object class="GtkSeparatorMenuItem">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -288,15 +278,6 @@
<property name="use-underline">True</property>
- <object class="GtkMenuItem" id="system_log">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="action-name">app.system-log</property>
- <property name="label" translatable="yes">System _Log</property>
- <property name="use-underline">True</property>
--- a/pidgin/resources/Conversations/menu.ui Mon Oct 18 01:36:58 2021 -0500
+++ b/pidgin/resources/Conversations/menu.ui Mon Oct 18 01:40:57 2021 -0500
@@ -46,10 +46,6 @@
<attribute name="accel"><Primary>F</attribute>
- <attribute name="label" translatable="yes">View _Log</attribute>
- <attribute name="action">win.view-log</attribute>
<attribute name="label" translatable="yes">_Save As...</attribute>
<attribute name="action">win.save-as</attribute>
--- a/po/POTFILES.in Mon Oct 18 01:36:58 2021 -0500
+++ b/po/POTFILES.in Mon Oct 18 01:40:57 2021 -0500
@@ -355,7 +355,6 @@
pidgin/pidgininvitedialog.c
pidgin/pidginmooddialog.c