--- a/finch/gntblist.c Thu Oct 14 23:48:51 2021 -0500
+++ b/finch/gntblist.c Mon Oct 18 01:20:33 2021 -0500
@@ -34,7 +34,6 @@
@@ -1281,43 +1280,6 @@
-static void showlog_cb(PurpleBlistNode *sel, PurpleBlistNode *node)
- PurpleAccount *account;
- 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 = (PurpleChat*) 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)) {
- finch_log_show_contact((PurpleContact *)node);
- /* This callback should not have been registered for a node
- * that doesn't match the type of one of the blocks above. */
- finch_log_show(type, name, account);
/* Xeroxed from gtkdialogs.c:purple_gtkdialogs_remove_group_cb*/
remove_group(PurpleGroup *group)
@@ -1575,10 +1537,6 @@
add_custom_action(GNT_MENU(context), _("Toggle Tag"),
PURPLE_CALLBACK(finch_blist_toggle_tag_buddy), node);
- if (!PURPLE_IS_GROUP(node)) {
- add_custom_action(GNT_MENU(context), _("View Log"),
- PURPLE_CALLBACK(showlog_cb), node);
/* Set the position for the popup */
@@ -2737,71 +2695,6 @@
-view_log_select_cb(gpointer data, PurpleRequestFields *fields)
- PurpleAccount *account;
- PurpleContact *contact;
- account = purple_request_fields_get_account(fields, "account");
- name = purple_request_fields_get_string(fields, "screenname");
- buddy = purple_blist_find_buddy(account, name);
- contact = purple_buddy_get_contact(buddy);
- finch_log_show_contact(contact);
- finch_log_show(PURPLE_LOG_IM, name, account);
-view_log_cb(GntMenuItem *item, gpointer n)
- 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_set_type_hint(field, "account");
- 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_request_field_account_set_show_all(field, TRUE);
- purple_blist_get_default(), _("View Log"), NULL,
- _("Please enter the username or alias of the person "
- "whose log you would like to view."),
- fields, _("OK"), G_CALLBACK(view_log_select_cb), _("Cancel"),
-view_all_logs_cb(GntMenuItem *item, gpointer n)
- finch_log_show(PURPLE_LOG_IM, NULL, NULL);
menu_add_buddy_cb(GntMenuItem *item, gpointer null)
purple_blist_request_add_buddy(NULL, NULL, NULL, NULL);
@@ -2861,16 +2754,6 @@
gnt_menu_add_item(GNT_MENU(sub), item);
gnt_menuitem_set_callback(GNT_MENU_ITEM(item), join_chat_select, NULL);
- item = gnt_menuitem_new(_("View Log..."));
- gnt_menuitem_set_id(GNT_MENU_ITEM(item), "view-log");
- gnt_menu_add_item(GNT_MENU(sub), item);
- gnt_menuitem_set_callback(GNT_MENU_ITEM(item), view_log_cb, NULL);
- item = gnt_menuitem_new(_("View All Logs"));
- gnt_menuitem_set_id(GNT_MENU_ITEM(item), "view-all-logs");
- gnt_menu_add_item(GNT_MENU(sub), item);
- gnt_menuitem_set_callback(GNT_MENU_ITEM(item), view_all_logs_cb, NULL);
item = gnt_menuitem_new(_("Show"));
gnt_menu_add_item(GNT_MENU(sub), item);
subsub = gnt_menu_new(GNT_MENU_POPUP);
--- a/finch/gntconv.c Thu Oct 14 23:48:51 2021 -0500
+++ b/finch/gntconv.c Mon Oct 18 01:20:33 2021 -0500
@@ -36,7 +36,6 @@
@@ -536,45 +535,6 @@
-view_log_cb(GntMenuItem *n, gpointer ggc)
- PurpleConversation *conv;
- PurpleAccount *account;
- conv = fc->active_conv;
- if (PURPLE_IS_IM_CONVERSATION(conv))
- else if (PURPLE_IS_CHAT_CONVERSATION(conv))
- type = PURPLE_LOG_CHAT;
- 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;
- (purple_blist_node_get_sibling_prev(node) || purple_blist_node_get_sibling_next(node))) {
- finch_log_show_contact((PurpleContact *)purple_blist_node_get_parent(node));
- finch_log_show(type, name, account);
generate_send_to_menu(FinchConv *ggc)
GntWidget *sub, *menu = ggc->menu;
@@ -694,10 +654,6 @@
gnt_menuitem_set_callback(item, invite_cb, ggc);
- item = gnt_menuitem_new(_("View Log..."));
- gnt_menu_add_item(GNT_MENU(sub), item);
- gnt_menuitem_set_callback(item, view_log_cb, ggc);
item = gnt_menuitem_check_new(_("Enable Logging"));
gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
purple_conversation_is_logging(ggc->active_conv));
--- a/finch/gntui.c Thu Oct 14 23:48:51 2021 -0500
+++ b/finch/gntui.c Mon Oct 18 01:20:33 2021 -0500
@@ -34,7 +34,6 @@
@@ -79,9 +78,6 @@
purple_request_set_ui_ops(finch_request_get_ui_ops());
purple_xfers_set_ui_ops(finch_xfers_get_ui_ops());
@@ -125,8 +121,6 @@
purple_request_set_ui_ops(NULL);
purple_xfers_set_ui_ops(NULL);
--- a/finch/meson.build Thu Oct 14 23:48:51 2021 -0500
+++ b/finch/meson.build Mon Oct 18 01:20:33 2021 -0500
@@ -90,7 +90,6 @@
@@ -112,7 +111,6 @@
--- a/po/POTFILES.in Thu Oct 14 23:48:51 2021 -0500
+++ b/po/POTFILES.in Mon Oct 18 01:20:33 2021 -0500
@@ -5,7 +5,6 @@