Mercurial > pidgin3 / changeset

--- a/finch/gntblist.c	Mon Nov 27 20:55:41 2017 -0600
+++ b/finch/gntblist.c	Thu Dec 07 20:45:20 2017 -0600
@@ -127,10 +127,6 @@
 static void add_chat(PurpleChat *chat, FinchBlist *ggblist);
 static void add_node(PurpleBlistNode *node, FinchBlist *ggblist);
 static void node_update(PurpleBuddyList *list, PurpleBlistNode *node);
-#if 0
-static gboolean is_contact_online(PurpleContact *contact);
-static gboolean is_group_online(PurpleGroup *group);
-#endif
 static void draw_tooltip(FinchBlist *ggblist);
 static void tooltip_for_buddy(PurpleBuddy *buddy, GString *str, gboolean full);
 static gboolean remove_typing_cb(gpointer null);
@@ -385,27 +381,6 @@
 		fnode = purple_blist_node_get_ui_data(node);
 		if (fnode && fnode->signed_timer)
 			flag |= GNT_TEXT_FLAG_BLINK;
-	} else if (PURPLE_IS_GROUP(node)) {
-		/* If the node is collapsed, then check to see if any of the priority buddies of
-		 * any of the contacts within this group recently signed on/off, and set the blink
-		 * flag appropriately. */
-		/* XXX: Refs #5444 */
-		/* XXX: there's no way I can ask if the node is expanded or not? *sigh*
-		 * API addition would be necessary */
-#if 0
-		if (!gnt_tree_get_expanded(GNT_TREE(ggblist->tree), node)) {
-			for (node = purple_blist_node_get_first_child(node); node;
-					node = purple_blist_node_get_sibling_next(node)) {
-				PurpleBlistNode *pnode;
-				pnode = purple_contact_get_priority_buddy((PurpleContact*)node);
-				fnode = purple_blist_node_get_ui_data(node);
-				if (fnode && fnode->signed_timer) {
-					flag |= GNT_TEXT_FLAG_BLINK;
-					break;
-				}
-			}
-		}
-#endif
 	}
 
 	return flag;
@@ -418,37 +393,6 @@
 	gnt_tree_set_row_color(GNT_TREE(ggblist->tree), node, get_display_color(node));
 }
 
-#if 0
-static gboolean
-is_contact_online(PurpleContact *contact)
-{
-	PurpleBlistNode *node;
-	for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)contact)); node;
-			node = purple_blist_node_get_sibling_next(node)) {
-		FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
-		if (PURPLE_BUDDY_IS_ONLINE((PurpleBuddy*)node) ||
-				(fnode && fnode->signed_timer))
-			return TRUE;
-	}
-	return FALSE;
-}
-
-static gboolean
-is_group_online(PurpleGroup *group)
-{
-	PurpleBlistNode *node;
-	for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)group)); node;
-			node = purple_blist_node_get_sibling_next(node)) {
-		if (PURPLE_IS_CHAT(node) &&
-				purple_account_is_connected(((PurpleChat *)node)->account))
-			return TRUE;
-		else if (is_contact_online((PurpleContact*)node))
-			return TRUE;
-	}
-	return FALSE;
-}
-#endif
-
 static void
 new_node(PurpleBlistNode *node)
 {
@@ -999,20 +943,6 @@
 		blist_update_row_flags((PurpleBlistNode*)contact);
 }
 
-#if 0
-static void
-buddy_signed_on(PurpleBuddy *buddy, FinchBlist *ggblist)
-{
-	add_node((PurpleBlistNode*)buddy, ggblist);
-}
-
-static void
-buddy_signed_off(PurpleBuddy *buddy, FinchBlist *ggblist)
-{
-	node_remove(purple_blist_get_buddy_list(), (PurpleBlistNode*)buddy);
-}
-#endif
-
 PurpleBlistUiOps *finch_blist_get_ui_ops()
 {
 	return &blist_ui_ops;
@@ -3127,17 +3057,6 @@
 	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", finch_blist_get_handle(),
 				PURPLE_CALLBACK(buddy_signed_on_off), ggblist);
 
-#if 0
-	/* These I plan to use to indicate unread-messages etc. */
-	purple_signal_connect(purple_conversations_get_handle(), "received-im-msg", finch_blist_get_handle(),
-				PURPLE_CALLBACK(received_im_msg), list);
-	purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg", finch_blist_get_handle(),
-				PURPLE_CALLBACK(sent_im_msg), NULL);
-
-	purple_signal_connect(purple_conversations_get_handle(), "received-chat-msg", finch_blist_get_handle(),
-				PURPLE_CALLBACK(received_chat_msg), list);
-#endif
-
 	g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "context-menu", G_CALLBACK(context_menu), ggblist);

--- a/finch/gntplugin.c	Mon Nov 27 20:55:41 2017 -0600
+++ b/finch/gntplugin.c	Thu Dec 07 20:45:20 2017 -0600
@@ -446,95 +446,6 @@
 	}
 }
 
-#if 0
-static void
-install_selected_file_cb(gpointer handle, const char *filename)
-{
-	/* Try to init the selected file.
-	 * If it succeeds, try to make a copy of the file in $USERDIR/plugins/.
-	 * If the copy succeeds, unload and destroy the plugin in the original
-	 *  location and init+load the new one.
-	 * Select the plugin in the plugin list.
-	 */
-	char *path;
-	PurplePlugin *plugin;
-
-	g_return_if_fail(plugins.window);
-
-	plugin = purple_plugin_probe(filename);
-	if (!plugin) {
-		purple_notify_error(handle, _("Error loading plugin"),
-				_("The selected file is not a valid plugin."),
-				_("Please open the debug window and try again to see the exact error message."), NULL);
-		return;
-	}
-	if (g_list_find(gnt_tree_get_rows(GNT_TREE(plugins.tree)), plugin)) {
-		purple_plugin_load(plugin);
-		gnt_tree_set_choice(GNT_TREE(plugins.tree), plugin, purple_plugin_is_loaded(plugin));
-		gnt_tree_set_selected(GNT_TREE(plugins.tree), plugin);
-		return;
-	}
-
-	path = g_build_filename(purple_user_dir(), "plugins", NULL);
-	if (purple_build_dir(path, S_IRUSR | S_IWUSR | S_IXUSR) == 0) {
-		char *content = NULL;
-		gsize length = 0;
-
-		if (g_file_get_contents(filename, &content, &length, NULL)) {
-			char *file = g_path_get_basename(filename);
-			g_free(path);
-			path = g_build_filename(purple_user_dir(), "plugins", file, NULL);
-			if (purple_util_write_data_to_file_absolute(path, content, length)) {
-				purple_plugin_destroy(plugin);
-				plugin = purple_plugin_probe(path);
-				if (!plugin) {
-					purple_debug_warning("gntplugin", "This is really strange. %s can be loaded, but %s can't!\n",
-							filename, path);
-					g_unlink(path);
-					plugin = purple_plugin_probe(filename);
-				}
-			} else {
-			}
-		}
-		g_free(content);
-	}
-	g_free(path);
-
-	purple_plugin_load(plugin);
-
-	if (plugin->info->type == PURPLE_PLUGIN_LOADER) {
-		GList *cur;
-		for (cur = PURPLE_PLUGIN_LOADER_INFO(plugin)->exts; cur != NULL;
-				cur = cur->next)
-			purple_plugins_probe(cur->data);
-		return;
-	}
-
-	if (plugin->info->type != PURPLE_PLUGIN_STANDARD ||
-			(plugin->info->flags & PURPLE_PLUGIN_FLAG_INVISIBLE) ||
-			plugin->error)
-		return;
-
-	gnt_tree_add_choice(GNT_TREE(plugins.tree), plugin,
-			gnt_tree_create_row(GNT_TREE(plugins.tree), plugin->info->name), NULL, NULL);
-	gnt_tree_set_choice(GNT_TREE(plugins.tree), plugin, purple_plugin_is_loaded(plugin));
-	gnt_tree_set_row_flags(GNT_TREE(plugins.tree), plugin, GNT_TEXT_FLAG_BOLD);
-	gnt_tree_set_selected(GNT_TREE(plugins.tree), plugin);
-}
-
-static void
-install_plugin_cb(GntWidget *w, gpointer null)
-{
-	static int handle;
-
-	purple_request_close_with_handle(&handle);
-	purple_request_file(&handle, _("Select plugin to install"), NULL,
-			FALSE, G_CALLBACK(install_selected_file_cb), NULL,
-			NULL, &handle);
-	g_signal_connect_swapped(G_OBJECT(w), "destroy", G_CALLBACK(purple_request_close_with_handle), &handle);
-}
-#endif
-
 void finch_plugins_show_all(void)
 {
 	GntWidget *window, *tree, *box, *aboot, *button;
@@ -603,13 +514,6 @@
 	box = gnt_hbox_new(FALSE);
 	gnt_box_add_widget(GNT_BOX(window), box);
 
-#if 0
-	button = gnt_button_new(_("Install Plugin..."));
-	gnt_box_add_widget(GNT_BOX(box), button);
-	gnt_util_set_trigger_widget(GNT_WIDGET(tree), GNT_KEY_INS, button);
-	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(install_plugin_cb), NULL);
-#endif
-
 	button = gnt_button_new(_("Close"));
 	gnt_box_add_widget(GNT_BOX(box), button);
 	g_signal_connect_swapped(G_OBJECT(button), "activate",