From 3fd39ad792e4eae8752afac8f0c65c80510e3c65 Mon Sep 17 00:00:00 2001 From: jaka Date: Sat, 16 May 1998 13:01:23 +0000 Subject: [PATCH] 1998-05-16 Jaka Mocnik * gscreen.c (create_popup_submenu): fixed bug which caused it to require 0 instead of 1 marked files for F_SINGLE file_actions. * gscreen.c (file_popup): first item in the menu displays "..." when multiple files are selected. --- gnome/ChangeLog | 7 +++++++ gnome/gscreen.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 2672cac61..391eaf981 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,10 @@ +1998-05-16 Jaka Mocnik + + * gscreen.c (create_popup_submenu): fixed bug which caused it to require + 0 instead of 1 marked files for F_SINGLE file_actions. + * gscreen.c (file_popup): first item in the menu displays "..." when + multiple files are selected. + Thu May 14 23:31:15 1998 Tom Tromey * gmain.c (session_save_state): Use "+" instead of "%s" in format diff --git a/gnome/gscreen.c b/gnome/gscreen.c index 921e3949b..9b0d79b18 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -553,9 +553,9 @@ create_popup_submenu (WPanel *panel, int row, char *filename) /* Items with F_ALL bypass any other condition */ if (!(file_actions [i].flags & F_ALL)){ - /* Items with F_SINGLE require that no marked files exist */ + /* Items with F_SINGLE require that ONLY ONE marked files exist */ if (file_actions [i].flags & F_SINGLE){ - if (panel->marked) + if (panel->marked > 1) continue; } @@ -677,7 +677,7 @@ file_popup (GdkEvent *event, WPanel *panel, int row, char *filename) GtkWidget *submenu; GtkWidget *item; - item = gtk_menu_item_new_with_label (filename); + item = gtk_menu_item_new_with_label ( (panel->marked > 1)?"...":filename ); gtk_widget_show (item); gtk_menu_append (GTK_MENU (menu), item);