1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
--- ROX-Filer/src/dnd.c 2011-10-09 16:31:59.000000000 +0200
+++ ROX-Filer/src/dnd.c.fixed 2025-08-18 19:42:38.718165397 +0200
@@ -119,10 +119,10 @@
#undef N_
#define N_(x) x
static GtkItemFactoryEntry menu_def[] = {
-{N_("Copy"), NULL, menuitem_response, MENU_COPY, NULL},
-{N_("Move"), NULL, menuitem_response, MENU_MOVE, NULL},
-{N_("Link (relative)"), NULL, menuitem_response, MENU_LINK_REL, NULL},
-{N_("Link (absolute)"), NULL, menuitem_response, MENU_LINK_ABS, NULL},
+{N_("Copy"), NULL, (GtkItemFactoryCallback) menuitem_response, MENU_COPY, NULL},
+{N_("Move"), NULL, (GtkItemFactoryCallback) menuitem_response, MENU_MOVE, NULL},
+{N_("Link (relative)"), NULL, (GtkItemFactoryCallback) menuitem_response, MENU_LINK_REL, NULL},
+{N_("Link (absolute)"), NULL, (GtkItemFactoryCallback) menuitem_response, MENU_LINK_ABS, NULL},
};
static GtkWidget *dnd_menu = NULL;
--- ROX-Filer/src/icon.c 2011-10-09 16:31:59.000000000 +0200
+++ ROX-Filer/src/icon.c.fixed 2025-08-18 19:44:47.981094754 +0200
@@ -129,20 +129,20 @@
#define N_(x) x
static GtkItemFactoryEntry menu_def[] = {
{N_("ROX-Filer"), NULL, NULL, 0, "<Branch>"},
-{">" N_("About ROX-Filer..."), NULL, menu_rox_help, HELP_ABOUT, "<StockItem>", GTK_STOCK_DIALOG_INFO},
-{">" N_("Show Help Files"), NULL, menu_rox_help, HELP_DIR, "<StockItem>", GTK_STOCK_HELP},
-{">" N_("Manual"), NULL, menu_rox_help, HELP_MANUAL, NULL},
+{">" N_("About ROX-Filer..."), NULL, (GtkItemFactoryCallback) menu_rox_help, HELP_ABOUT, "<StockItem>", GTK_STOCK_DIALOG_INFO},
+{">" N_("Show Help Files"), NULL, (GtkItemFactoryCallback) menu_rox_help, HELP_DIR, "<StockItem>", GTK_STOCK_HELP},
+{">" N_("Manual"), NULL, (GtkItemFactoryCallback) menu_rox_help, HELP_MANUAL, NULL},
{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Options..."), NULL, menu_show_options, 0, "<StockItem>", GTK_STOCK_PREFERENCES},
-{">" N_("Home Directory"), NULL, open_home, 0, "<StockItem>", GTK_STOCK_HOME},
+{">" N_("Options..."), NULL, (GtkItemFactoryCallback) menu_show_options, 0, "<StockItem>", GTK_STOCK_PREFERENCES},
+{">" N_("Home Directory"), NULL, (GtkItemFactoryCallback) open_home, 0, "<StockItem>", GTK_STOCK_HOME},
{N_("File"), NULL, NULL, 0, "<Branch>"},
-{">" N_("Shift Open"), NULL, file_op, ACTION_SHIFT, NULL},
-{">" N_("Properties"), NULL, file_op, ACTION_PROPERTIES, "<StockItem>", GTK_STOCK_PROPERTIES},
-{">" N_("Set Run Action..."), NULL, file_op, ACTION_RUN_ACTION, "<StockItem>", GTK_STOCK_EXECUTE},
-{">" N_("Set Icon..."), NULL, file_op, ACTION_SET_ICON, NULL},
-{N_("Edit Item"), NULL, file_op, ACTION_EDIT, "<StockItem>", GTK_STOCK_PROPERTIES},
-{N_("Show Location"), NULL, file_op, ACTION_LOCATION, "<StockItem>", GTK_STOCK_JUMP_TO},
-{N_("Remove Item(s)"), NULL, remove_items, 0, "<StockItem>", GTK_STOCK_REMOVE},
+{">" N_("Shift Open"), NULL, (GtkItemFactoryCallback) file_op, ACTION_SHIFT, NULL},
+{">" N_("Properties"), NULL, (GtkItemFactoryCallback) file_op, ACTION_PROPERTIES, "<StockItem>", GTK_STOCK_PROPERTIES},
+{">" N_("Set Run Action..."), NULL, (GtkItemFactoryCallback) file_op, ACTION_RUN_ACTION, "<StockItem>", GTK_STOCK_EXECUTE},
+{">" N_("Set Icon..."), NULL, (GtkItemFactoryCallback) file_op, ACTION_SET_ICON, NULL},
+{N_("Edit Item"), NULL, (GtkItemFactoryCallback) file_op, ACTION_EDIT, "<StockItem>", GTK_STOCK_PROPERTIES},
+{N_("Show Location"), NULL, (GtkItemFactoryCallback) file_op, ACTION_LOCATION, "<StockItem>", GTK_STOCK_JUMP_TO},
+{N_("Remove Item(s)"), NULL, (GtkItemFactoryCallback) remove_items, 0, "<StockItem>", GTK_STOCK_REMOVE},
{"", NULL, NULL, 0, "<Separator>"},
};
--- ROX-Filer/src/menu.c.old 2011-10-09 16:31:59.000000000 +0200
+++ ROX-Filer/src/menu.c 2025-08-18 19:38:02.868855418 +0200
@@ -183,81 +183,81 @@
static GtkItemFactoryEntry filer_menu_def[] = {
{N_("Display"), NULL, NULL, 0, "<Branch>"},
-{">" N_("Icons View"), NULL, view_type, VIEW_TYPE_COLLECTION, NULL},
+{">" N_("Icons View"), NULL, (GtkItemFactoryCallback) view_type, VIEW_TYPE_COLLECTION, NULL},
{">" N_("Icons, With..."), NULL, NULL, 0, "<Branch>"},
-{">>" N_("Sizes"), NULL, set_with, DETAILS_SIZE, NULL},
-{">>" N_("Permissions"), NULL, set_with, DETAILS_PERMISSIONS, NULL},
-{">>" N_("Types"), NULL, set_with, DETAILS_TYPE, NULL},
-{">>" N_("Times"), NULL, set_with, DETAILS_TIMES, NULL},
-{">" N_("List View"), NULL, view_type, VIEW_TYPE_DETAILS, "<StockItem>", ROX_STOCK_SHOW_DETAILS},
-{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Bigger Icons"), "equal", change_size, 1, "<StockItem>", GTK_STOCK_ZOOM_IN},
-{">" N_("Smaller Icons"), "minus", change_size, -1, "<StockItem>", GTK_STOCK_ZOOM_OUT},
-{">" N_("Automatic"), NULL, change_size_auto, 0, "<ToggleItem>"},
-{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Sort by Name"), NULL, set_sort, SORT_NAME, NULL},
-{">" N_("Sort by Type"), NULL, set_sort, SORT_TYPE, NULL},
-{">" N_("Sort by Date"), NULL, set_sort, SORT_DATE, NULL},
-{">" N_("Sort by Size"), NULL, set_sort, SORT_SIZE, NULL},
-{">" N_("Sort by Owner"), NULL, set_sort, SORT_OWNER, NULL},
-{">" N_("Sort by Group"), NULL, set_sort, SORT_GROUP, NULL},
-{">" N_("Reversed"), NULL, reverse_sort, 0, "<ToggleItem>"},
-{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Show Hidden"), "<Ctrl>H", hidden, 0, "<ToggleItem>"},
-{">" N_("Filter Files..."), NULL, mini_buffer, MINI_FILTER, NULL},
-{">" N_("Filter Directories With Files"), NULL, filter_directories, 0, "<ToggleItem>"},
-{">" N_("Show Thumbnails"), NULL, show_thumbs, 0, "<ToggleItem>"},
-{">" N_("Refresh"), NULL, refresh, 0, "<StockItem>", GTK_STOCK_REFRESH},
-{">" N_("Save Current Display Settings..."), NULL, save_settings, 0, NULL},
+{">>" N_("Sizes"), NULL, (GtkItemFactoryCallback) set_with, DETAILS_SIZE, NULL},
+{">>" N_("Permissions"), NULL, (GtkItemFactoryCallback) set_with, DETAILS_PERMISSIONS, NULL},
+{">>" N_("Types"), NULL, (GtkItemFactoryCallback) set_with, DETAILS_TYPE, NULL},
+{">>" N_("Times"), NULL, (GtkItemFactoryCallback) set_with, DETAILS_TIMES, NULL},
+{">" N_("List View"), NULL, (GtkItemFactoryCallback) view_type, VIEW_TYPE_DETAILS, "<StockItem>", ROX_STOCK_SHOW_DETAILS},
+{">", NULL, NULL, 0, "<Separator>"},
+{">" N_("Bigger Icons"), "equal", (GtkItemFactoryCallback) change_size, 1, "<StockItem>", GTK_STOCK_ZOOM_IN},
+{">" N_("Smaller Icons"), "minus", (GtkItemFactoryCallback) change_size, -1, "<StockItem>", GTK_STOCK_ZOOM_OUT},
+{">" N_("Automatic"), NULL, (GtkItemFactoryCallback) change_size_auto, 0, "<ToggleItem>"},
+{">", NULL, NULL, 0, "<Separator>"},
+{">" N_("Sort by Name"), NULL, (GtkItemFactoryCallback) set_sort, SORT_NAME, NULL},
+{">" N_("Sort by Type"), NULL, (GtkItemFactoryCallback) set_sort, SORT_TYPE, NULL},
+{">" N_("Sort by Date"), NULL, (GtkItemFactoryCallback) set_sort, SORT_DATE, NULL},
+{">" N_("Sort by Size"), NULL, (GtkItemFactoryCallback) set_sort, SORT_SIZE, NULL},
+{">" N_("Sort by Owner"), NULL, (GtkItemFactoryCallback) set_sort, SORT_OWNER, NULL},
+{">" N_("Sort by Group"), NULL, (GtkItemFactoryCallback) set_sort, SORT_GROUP, NULL},
+{">" N_("Reversed"), NULL, (GtkItemFactoryCallback) reverse_sort, 0, "<ToggleItem>"},
+{">", NULL, NULL, 0, "<Separator>"},
+{">" N_("Show Hidden"), "<Ctrl>H", (GtkItemFactoryCallback) hidden, 0, "<ToggleItem>"},
+{">" N_("Filter Files..."), NULL, (GtkItemFactoryCallback) mini_buffer, MINI_FILTER, NULL},
+{">" N_("Filter Directories With Files"), NULL, (GtkItemFactoryCallback) filter_directories, 0, "<ToggleItem>"},
+{">" N_("Show Thumbnails"), NULL, (GtkItemFactoryCallback) show_thumbs, 0, "<ToggleItem>"},
+{">" N_("Refresh"), NULL, (GtkItemFactoryCallback) refresh, 0, "<StockItem>", GTK_STOCK_REFRESH},
+{">" N_("Save Current Display Settings..."), NULL, (GtkItemFactoryCallback) save_settings, 0, NULL},
{N_("File"), NULL, NULL, 0, "<Branch>"},
-{">" N_("Copy..."), "<Ctrl>C", file_op, FILE_COPY_ITEM, "<StockItem>", GTK_STOCK_COPY},
-{">" N_("Rename..."), NULL, file_op, FILE_RENAME_ITEM, NULL},
-{">" N_("Link..."), NULL, file_op, FILE_LINK_ITEM, NULL},
-{">" N_("Delete"), "<Ctrl>X", file_op, FILE_DELETE, "<StockItem>", GTK_STOCK_DELETE},
-{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Shift Open"), NULL, file_op, FILE_OPEN_FILE},
-{">" N_("Send To..."), NULL, file_op, FILE_SEND_TO, NULL},
-{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Set Run Action..."), "asterisk", file_op, FILE_RUN_ACTION, "<StockItem>", GTK_STOCK_EXECUTE},
-{">" N_("Set Icon..."), NULL, file_op, FILE_SET_ICON, NULL},
-{">" N_("Properties"), "<Ctrl>P", file_op, FILE_PROPERTIES, "<StockItem>", GTK_STOCK_PROPERTIES},
-{">" N_("Count"), NULL, file_op, FILE_USAGE, NULL},
-{">" N_("Set Type..."), NULL, file_op, FILE_SET_TYPE, NULL},
-{">" N_("Permissions"), NULL, file_op, FILE_CHMOD_ITEMS, NULL},
+{">" N_("Copy..."), "<Ctrl>C", (GtkItemFactoryCallback) file_op, FILE_COPY_ITEM, "<StockItem>", GTK_STOCK_COPY},
+{">" N_("Rename..."), NULL, (GtkItemFactoryCallback) file_op, FILE_RENAME_ITEM, NULL},
+{">" N_("Link..."), NULL, (GtkItemFactoryCallback) file_op, FILE_LINK_ITEM, NULL},
+{">" N_("Delete"), "<Ctrl>X", (GtkItemFactoryCallback) file_op, FILE_DELETE, "<StockItem>", GTK_STOCK_DELETE},
+{">", NULL, NULL, 0, "<Separator>"},
+{">" N_("Shift Open"), NULL, (GtkItemFactoryCallback) file_op, FILE_OPEN_FILE},
+{">" N_("Send To..."), NULL, (GtkItemFactoryCallback) file_op, FILE_SEND_TO, NULL},
+{">", NULL, NULL, 0, "<Separator>"},
+{">" N_("Set Run Action..."), "asterisk", (GtkItemFactoryCallback) file_op, FILE_RUN_ACTION, "<StockItem>", GTK_STOCK_EXECUTE},
+{">" N_("Set Icon..."), NULL, (GtkItemFactoryCallback) file_op, FILE_SET_ICON, NULL},
+{">" N_("Properties"), "<Ctrl>P", (GtkItemFactoryCallback) file_op, FILE_PROPERTIES, "<StockItem>", GTK_STOCK_PROPERTIES},
+{">" N_("Count"), NULL, (GtkItemFactoryCallback) file_op, FILE_USAGE, NULL},
+{">" N_("Set Type..."), NULL, (GtkItemFactoryCallback) file_op, FILE_SET_TYPE, NULL},
+{">" N_("Permissions"), NULL, (GtkItemFactoryCallback) file_op, FILE_CHMOD_ITEMS, NULL},
{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Find"), "<Ctrl>F", file_op, FILE_FIND, "<StockItem>", GTK_STOCK_FIND},
+{">" N_("Find"), "<Ctrl>F", (GtkItemFactoryCallback) file_op, FILE_FIND, "<StockItem>", GTK_STOCK_FIND},
{N_("Select"), NULL, NULL, 0, "<Branch>"},
-{">" N_("Select All"), "<Ctrl>A", select_all, 0, NULL},
-{">" N_("Clear Selection"), NULL, clear_selection, 0, NULL},
-{">" N_("Invert Selection"), NULL, invert_selection, 0, NULL},
-{">" N_("Select by Name..."), "period", mini_buffer, MINI_SELECT_BY_NAME, NULL},
-{">" N_("Select If..."), "<Shift>question", mini_buffer, MINI_SELECT_IF, NULL},
-{N_("Options..."), NULL, menu_show_options, 0, "<StockItem>", GTK_STOCK_PREFERENCES},
+{">" N_("Select All"), "<Ctrl>A", (GtkItemFactoryCallback) select_all, 0, NULL},
+{">" N_("Clear Selection"), NULL, (GtkItemFactoryCallback) clear_selection, 0, NULL},
+{">" N_("Invert Selection"), NULL, (GtkItemFactoryCallback) invert_selection, 0, NULL},
+{">" N_("Select by Name..."), "period", (GtkItemFactoryCallback) mini_buffer, MINI_SELECT_BY_NAME, NULL},
+{">" N_("Select If..."), "<Shift>question", (GtkItemFactoryCallback) mini_buffer, MINI_SELECT_IF, NULL},
+{N_("Options..."), NULL, (GtkItemFactoryCallback) menu_show_options, 0, "<StockItem>", GTK_STOCK_PREFERENCES},
{N_("New"), NULL, NULL, 0, "<Branch>"},
-{">" N_("Directory"), NULL, new_directory, 0, NULL},
-{">" N_("Blank file"), NULL, new_file, 0, "<StockItem>", GTK_STOCK_NEW},
-{">" N_("Customise Menu..."), NULL, customise_new, 0, NULL},
+{">" N_("Directory"), NULL, (GtkItemFactoryCallback) new_directory, 0, NULL},
+{">" N_("Blank file"), NULL, (GtkItemFactoryCallback) new_file, 0, "<StockItem>", GTK_STOCK_NEW},
+{">" N_("Customise Menu..."), NULL, (GtkItemFactoryCallback) customise_new, 0, NULL},
{N_("Window"), NULL, NULL, 0, "<Branch>"},
-{">" N_("Parent, New Window"), NULL, open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
-{">" N_("Parent, Same Window"), NULL, open_parent_same, 0, NULL},
-{">" N_("New Window"), NULL, new_window, 0, NULL},
-{">" N_("Home Directory"), "<Ctrl>Home", home_directory, 0, "<StockItem>", GTK_STOCK_HOME},
-{">" N_("Show Bookmarks"), "<Ctrl>B", show_bookmarks, 0, "<StockItem>", ROX_STOCK_BOOKMARKS},
-{">" N_("Show Log"), NULL, show_log, 0, "<StockItem>", GTK_STOCK_INFO},
-{">" N_("Follow Symbolic Links"), NULL, follow_symlinks, 0, NULL},
-{">" N_("Resize Window"), "<Ctrl>E", resize, 0, NULL},
-/* {">" N_("New, As User..."), NULL, new_user, 0, NULL}, */
+{">" N_("Parent, New Window"), NULL, (GtkItemFactoryCallback) open_parent, 0, "<StockItem>", GTK_STOCK_GO_UP},
+{">" N_("Parent, Same Window"), NULL, (GtkItemFactoryCallback) open_parent_same, 0, NULL},
+{">" N_("New Window"), NULL, (GtkItemFactoryCallback) new_window, 0, NULL},
+{">" N_("Home Directory"), "<Ctrl>Home", (GtkItemFactoryCallback) home_directory, 0, "<StockItem>", GTK_STOCK_HOME},
+{">" N_("Show Bookmarks"), "<Ctrl>B", (GtkItemFactoryCallback) show_bookmarks, 0, "<StockItem>", ROX_STOCK_BOOKMARKS},
+{">" N_("Show Log"), NULL, (GtkItemFactoryCallback) show_log, 0, "<StockItem>", GTK_STOCK_INFO},
+{">" N_("Follow Symbolic Links"), NULL, (GtkItemFactoryCallback) follow_symlinks, 0, NULL},
+{">" N_("Resize Window"), "<Ctrl>E", (GtkItemFactoryCallback) resize, 0, NULL},
+/* {">" N_("New, As User..."), NULL, (GtkItemFactoryCallback) new_user, 0, NULL}, */
-{">" N_("Close Window"), "<Ctrl>Q", close_window, 0, "<StockItem>", GTK_STOCK_CLOSE},
+{">" N_("Close Window"), "<Ctrl>Q", (GtkItemFactoryCallback) close_window, 0, "<StockItem>", GTK_STOCK_CLOSE},
{">", NULL, NULL, 0, "<Separator>"},
-{">" N_("Enter Path..."), "slash", mini_buffer, MINI_PATH, NULL},
-{">" N_("Shell Command..."), "<Shift>exclam", mini_buffer, MINI_SHELL, NULL},
-{">" N_("Terminal Here"), "grave", xterm_here, FALSE, NULL},
-{">" N_("Switch to Terminal"), NULL, xterm_here, TRUE, NULL},
+{">" N_("Enter Path..."), "slash", (GtkItemFactoryCallback) mini_buffer, MINI_PATH, NULL},
+{">" N_("Shell Command..."), "<Shift>exclam", (GtkItemFactoryCallback) mini_buffer, MINI_SHELL, NULL},
+{">" N_("Terminal Here"), "grave", (GtkItemFactoryCallback) xterm_here, FALSE, NULL},
+{">" N_("Switch to Terminal"), NULL, (GtkItemFactoryCallback) xterm_here, TRUE, NULL},
{N_("Help"), NULL, NULL, 0, "<Branch>"},
-{">" N_("About ROX-Filer..."), NULL, menu_rox_help, HELP_ABOUT, NULL},
-{">" N_("Show Help Files"), "F1", menu_rox_help, HELP_DIR, "<StockItem>", GTK_STOCK_HELP},
-{">" N_("Manual"), NULL, menu_rox_help, HELP_MANUAL, NULL},
+{">" N_("About ROX-Filer..."), NULL, (GtkItemFactoryCallback) menu_rox_help, HELP_ABOUT, NULL},
+{">" N_("Show Help Files"), "F1", (GtkItemFactoryCallback) menu_rox_help, HELP_DIR, "<StockItem>", GTK_STOCK_HELP},
+{">" N_("Manual"), NULL, (GtkItemFactoryCallback) menu_rox_help, HELP_MANUAL, NULL},
};
|