Add collection_by_index_add_filelist() to remove dependency from menu

Fix memory leak.

Author: qarkai

src/collect-io.cc

@@ -1156,4 +1156,18 @@ void collect_manager_list(GList **names_exc, GList **names_inc, GList **paths)
 			}
 		}
 }
+
+gchar *collection_manager_path_by_index(gint index)
+{
+	if (index < 0) return nullptr;
+
+	GList *collection_list = nullptr;
+	collect_manager_list(&collection_list, nullptr, nullptr);
+
+	auto *collection_name = static_cast<gchar *>(g_list_nth_data(collection_list, index));
+	gchar *path = collection_path(collection_name);
+	g_list_free_full(collection_list, g_free);
+
+	return path;
+}
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

src/collect-io.h

@@ -57,6 +57,7 @@ void collect_manager_flush();
 
 void collect_manager_notify_cb(FileData *fd, NotifyType type, gpointer data);
 void collect_manager_list(GList **names_exc, GList **names_inc, GList **paths);
+gchar *collection_manager_path_by_index(gint index);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

src/collect.cc

@@ -414,6 +414,20 @@ GList *collection_contents_fd(const gchar *name)
 	return list;
 }
 
+/**
+ * @brief Add file selection list to a collection
+ * @param[in] index Index to the collection list, or -1 for new collection
+ * @param[in] list List of ::_FileData
+ *
+ */
+void collection_by_index_add_filelist(gint index, GList *list)
+{
+	g_autofree gchar *path = collection_manager_path_by_index(index);
+	CollectWindow *cw = collection_window_new(path);
+
+	collection_table_add_filelist(cw->table, list);
+}
+
 /*
  *-------------------------------------------------------------------
  * please use these to actually add/remove stuff

src/collect.h

@@ -135,6 +135,7 @@ gboolean is_collection(const gchar *param);
 gchar *collection_path(const gchar *param);
 GString *collection_contents(const gchar *name, GString *contents) G_GNUC_WARN_UNUSED_RESULT;
 GList *collection_contents_fd(const gchar *name);
+void collection_by_index_add_filelist(gint index, GList *list);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

src/dupe.cc

@@ -34,7 +34,6 @@
 #include <glib-object.h>
 
 #include "cache.h"
-#include "collect-table.h"
 #include "collect.h"
 #include "compat-deprecated.h"
 #include "compat.h"
@@ -3172,9 +3171,8 @@ static void dupe_window_edit_selected(DupeWindow *dw, const gchar *key)
 
 static void dupe_window_collection_from_selection(DupeWindow *dw)
 {
-	CollectWindow *w = collection_window_new(nullptr);
 	g_autoptr(FileDataList) list = dupe_listview_get_selection(dw->listview);
-	collection_table_add_filelist(w->table, list);
+	collection_by_index_add_filelist(-1, list);
 }
 
 static void dupe_window_append_file_list(DupeWindow *dw, gint on_second)
@@ -3330,7 +3328,7 @@ static void dupe_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
 	auto *dw = static_cast<DupeWindow *>(submenu_item_get_data(widget));
 
 	g_autoptr(FileDataList) selection_list = dupe_listview_get_selection(dw->listview);
-	pop_menu_collections(selection_list, data);
+	collection_by_index_add_filelist(GPOINTER_TO_INT(data), selection_list);
 }
 
 static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di)

src/img-view.cc

@@ -1322,7 +1322,7 @@ static void image_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
 	fd = image_get_fd(imd);
 
 	g_autoptr(FileDataList) selection_list = g_list_append(nullptr, fd);
-	pop_menu_collections(selection_list, data);
+	collection_by_index_add_filelist(GPOINTER_TO_INT(data), selection_list);
 }
 
 static GtkWidget *view_popup_menu(ViewWindow *vw)

src/layout-image.cc

@@ -754,7 +754,7 @@ static void layout_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
 	auto *lw = static_cast<LayoutWindow *>(submenu_item_get_data(widget));
 
 	g_autoptr(FileDataList) selection_list = g_list_append(nullptr, layout_image_get_fd(lw));
-	pop_menu_collections(selection_list, data);
+	collection_by_index_add_filelist(GPOINTER_TO_INT(data), selection_list);
 }
 
 static void li_pop_menu_selectable_toolbars_toggle_cb(GtkWidget *, gpointer)

src/menu.cc

@@ -24,8 +24,6 @@
 #include <gdk/gdk.h>
 
 #include "collect-io.h"
-#include "collect-table.h"
-#include "collect.h"
 #include "editors.h"
 #include "intl.h"
 #include "pixbuf-util.h"
@@ -332,29 +330,12 @@ GtkWidget *submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data)
 /**
  * @brief Add submenu consisting of "New collection", and list of existing collections to a right-click menu.
  * @param[in] menu
+ * @param[out] menu_item
  * @param[in] func
- * @param[in] collection_list Type gchar
  * @param[in] data
  *
  *  Used by all image windows
  */
-static void add_collection_list(GtkWidget *menu, GCallback func, GList *collection_list, gpointer)
-{
-	GList *work;
-	gint index = 0; /* index to existing collection list menu item selected */
-
-	work = collection_list;
-	while (work)
-		{
-		auto collection_name = static_cast<const gchar *>(work->data);
-
-		menu_item_add(menu, collection_name, func,
-													GINT_TO_POINTER(index));
-		work = work->next;
-		index++;
-		}
-}
-
 GtkWidget *submenu_add_collections(GtkWidget *menu, GtkWidget **menu_item,
 										GCallback func, gpointer data)
 {
@@ -367,49 +348,25 @@ GtkWidget *submenu_add_collections(GtkWidget *menu, GtkWidget **menu_item,
 	submenu = gtk_menu_new();
 	g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
 
-	menu_item_add_icon_sensitive(submenu, _("New collection"),
-	                             PIXBUF_INLINE_COLLECTION, TRUE, G_CALLBACK(func), GINT_TO_POINTER(-1));
+	menu_item_add_icon_sensitive(submenu, _("New collection"), PIXBUF_INLINE_COLLECTION,
+	                             TRUE, G_CALLBACK(func), GINT_TO_POINTER(-1));
 	menu_item_add_divider(submenu);
 
 	collect_manager_list(&collection_list,nullptr,nullptr);
-	add_collection_list(submenu, func, collection_list, data);
+
+	gint index = 0; /* index to existing collection list menu item selected */
+	for (GList *work = collection_list; work; work = work->next, index++)
+		{
+		auto *collection_name = static_cast<gchar *>(work->data);
+		menu_item_add(submenu, collection_name, func, GINT_TO_POINTER(index));
+		}
 
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 	if (menu_item) *menu_item = item;
 
-	g_list_free(collection_list);
+	g_list_free_full(collection_list, g_free);
 
 	return submenu;
 }
 
-/**
- * @brief Add file selection list to a collection
- * @param[in] selection_list Selection list of ::_FileData
- * @param[in] data Index to the collection list menu item selected, or -1 for new collection
- *
- *
- */
-void pop_menu_collections(GList *selection_list, gpointer data)
-{
-	CollectWindow *cw;
-	gchar *collection_name;
-	GList *collection_list = nullptr;
-	const gint index = GPOINTER_TO_INT(data);
-
-	if (index >= 0)
-		{
-		collect_manager_list(&collection_list, nullptr, nullptr);
-		collection_name = static_cast<gchar *>(g_list_nth_data(collection_list, index));
-		g_autofree gchar *name = collection_path(collection_name);
-		cw = collection_window_new(name);
-		g_list_free_full(collection_list, g_free);
-		}
-	else
-		{
-		cw = collection_window_new(nullptr);
-		}
-
-	collection_table_add_filelist(cw->table, selection_list);
-}
-
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

src/menu.h

@@ -47,6 +47,5 @@ GtkWidget *submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data);
 
 GtkWidget *submenu_add_collections(GtkWidget *menu, GtkWidget **menu_item,
 										GCallback func, gpointer data);
-void pop_menu_collections(GList *selection_list, gpointer data);
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

src/pan-view/pan-view.cc

@@ -35,6 +35,7 @@
 #include "bar-exif.h"
 #include "cache-loader.h"
 #include "cache.h"
+#include "collect.h"
 #include "compat.h"
 #include "dnd.h"
 #include "editors.h"
@@ -2281,7 +2282,7 @@ static void pan_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
 	auto *pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
 
 	g_autoptr(FileDataList) selection_list = g_list_append(nullptr, pan_menu_click_fd(pw));
-	pop_menu_collections(selection_list, data);
+	collection_by_index_add_filelist(GPOINTER_TO_INT(data), selection_list);
 }
 
 static GtkWidget *pan_popup_menu(PanWindow *pw)