[gnome-commander] Hand over the current file list to edit_copy_fnames, fixing #65
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Hand over the current file list to edit_copy_fnames, fixing #65
- Date: Mon, 13 Apr 2020 20:57:32 +0000 (UTC)
commit 12e6c79f4d1110edeb0bbd01aa218dcc96e32185
Author: Uwe Scholz <u scholz83 gmx de>
Date: Mon Apr 13 22:48:29 2020 +0200
Hand over the current file list to edit_copy_fnames, fixing #65
src/gnome-cmd-file-popmenu.cc | 1 -
src/gnome-cmd-user-actions.cc | 9 +++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/gnome-cmd-file-popmenu.cc b/src/gnome-cmd-file-popmenu.cc
index 6b6e378e..58d1da6b 100644
--- a/src/gnome-cmd-file-popmenu.cc
+++ b/src/gnome-cmd-file-popmenu.cc
@@ -689,7 +689,6 @@ GtkWidget *gnome_cmd_file_popmenu_new (GnomeCmdFileList *fl)
open_uiinfo[j].user_data = fl;
for (gint j=0; other_uiinfo[j].type != GNOME_APP_UI_ENDOFINFO; ++j)
- if (other_uiinfo[j].type == GNOME_APP_UI_ITEM)
other_uiinfo[j].user_data = fl;
open_uiinfo[0].label = get_default_application_action_name(files, (gchar **)
&open_uiinfo[0].pixmap_info); // must be freed after gnome_app_fill_menu ()
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index f7d780b3..3577ba29 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -1060,13 +1060,18 @@ void edit_filter (GtkMenuItem *menuitem, gpointer not_used)
}
-void edit_copy_fnames (GtkMenuItem *menuitem, gpointer not_used)
+void edit_copy_fnames (GtkMenuItem *menuitem, gpointer fileList)
{
GdkModifierType mask;
+ GnomeCmdFileList *fl;
gdk_window_get_pointer (NULL, NULL, NULL, &mask);
- GnomeCmdFileList *fl = get_fl (ACTIVE);
+ if ((GnomeCmdFileList*) fileList == nullptr)
+ {
+ fileList = get_fl (ACTIVE);
+ }
+ fl = (GnomeCmdFileList*) fileList;
GList *sfl = fl->get_selected_files();
sfl = fl->sort_selection(sfl);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]