From cf73615d4ddc8647f20be258b3d85af491c9d391 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Wed, 22 Sep 1999 17:18:07 +0000 Subject: [PATCH] 1999-09-22 Federico Mena Quintero * gscreen.c (panel_chdir): Clear the lists if the chdir operation was not successful. * gtkflist.c (gtk_flist_button_press): Only emit the open_row signal if we are not on the empty area. --- gnome/ChangeLog | 6 ++++++ gnome/gscreen.c | 18 ++++++++++++++---- gnome/gtkflist.c | 4 +++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 3367fe1a8..bb600642c 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,5 +1,11 @@ 1999-09-22 Federico Mena Quintero + * gscreen.c (panel_chdir): Clear the lists if the chdir operation + was not successful. + + * gtkflist.c (gtk_flist_button_press): Only emit the open_row + signal if we are not on the empty area. + * gnome-open-dialog.c (gnome_open_dialog_new): Expand the tree when we are done generating it. diff --git a/gnome/gscreen.c b/gnome/gscreen.c index c67df7bb3..8fca1aaec 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -447,8 +447,7 @@ panel_file_list_unselect_row (GtkWidget *widget, int row, int columns, GdkEvent static void panel_file_list_resize_callback (GtkCList *clist, gint column, gint width, WPanel *panel) { - format_e *format = panel->format; - int i, p; + int p; p = column_width_pos[panel->list_type]; /* offset in column_width */ g_assert (p >= 0); @@ -1682,8 +1681,19 @@ display_mini_info (WPanel *panel) static void panel_chdir (GtkDTree *dtree, char *path, WPanel *panel) { - if (!panel->dragging) - do_panel_cd (panel, path, cd_exact); + if (panel->dragging) + return; + + if (do_panel_cd (panel, path, cd_exact)) + return; /* success */ + + if (panel->list_type == list_icons) + gnome_icon_list_clear (ILIST_FROM_SW (panel->icons)); + else + gtk_clist_clear (CLIST_FROM_SW (panel->list)); + + strncpy (panel->cwd, path, sizeof (panel->cwd)); + show_dir (panel); } static void diff --git a/gnome/gtkflist.c b/gnome/gtkflist.c index f719e67ca..2b50f5328 100644 --- a/gnome/gtkflist.c +++ b/gnome/gtkflist.c @@ -282,7 +282,9 @@ gtk_flist_button_press (GtkWidget *widget, GdkEventButton *event) flist->dnd_select_pending = FALSE; flist->dnd_select_pending_state = 0; - gtk_signal_emit (GTK_OBJECT (flist), flist_signals[OPEN_ROW]); + if (on_row) + gtk_signal_emit (GTK_OBJECT (flist), flist_signals[OPEN_ROW]); + retval = TRUE; break;