From b166d210d547f65b4f1f7e97bc61cd4630b28917 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 12 Jun 2002 11:45:22 +0000 Subject: [PATCH] r1567: Bugfix: Symlinked items in the SendTo menu didn't use globicons correctly (spotted by Arnaud Calvo). --- ROX-Filer/Help/Changes | 2 ++ ROX-Filer/src/menu.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes index 87a1e026..b341bd6e 100644 --- a/ROX-Filer/Help/Changes +++ b/ROX-Filer/Help/Changes @@ -6,6 +6,8 @@ ~~~~~~~~~~~ Require version 2.0.1 or later of Gtk, due to bugs in 2.0.0. Changing the pinboard font realigns the icons. +Bugfix: Symlinked items in the SendTo menu didn't use globicons correctly + (spotted by Arnaud Calvo). 10-Jun-2002 ~~~~~~~~~~~ diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c index ae98042d..e23e4ba7 100644 --- a/ROX-Filer/src/menu.c +++ b/ROX-Filer/src/menu.c @@ -435,7 +435,7 @@ void show_style_menu(FilerWindow *filer_window, } #endif -static GList *menu_from_dir(GtkWidget *menu, const gchar *dname, +static GList *menu_from_dir(GtkWidget *menu, const gchar *dir_name, MenuIconStyle style, CallbackFn func, gboolean separator, gboolean strip_ext, gboolean recurse) @@ -445,6 +445,9 @@ static GList *menu_from_dir(GtkWidget *menu, const gchar *dname, DIR *dir; struct dirent *ent; GtkWidget *item; + char *dname = NULL; + + dname = pathdup(dir_name); dir = opendir(dname); if (!dir) @@ -545,6 +548,7 @@ static GList *menu_from_dir(GtkWidget *menu, const gchar *dname, closedir(dir); out: + g_free(dname); return widgets; } -- 2.11.4.GIT