1999-09-22 Federico Mena Quintero <federico@redhat.com>

* 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.
This commit is contained in:
Miguel de Icaza 1999-09-22 17:18:07 +00:00
parent 851413523a
commit cf73615d4d
3 changed files with 23 additions and 5 deletions

View File

@ -1,5 +1,11 @@
1999-09-22 Federico Mena Quintero <federico@redhat.com> 1999-09-22 Federico Mena Quintero <federico@redhat.com>
* 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 * gnome-open-dialog.c (gnome_open_dialog_new): Expand the tree
when we are done generating it. when we are done generating it.

View File

@ -447,8 +447,7 @@ panel_file_list_unselect_row (GtkWidget *widget, int row, int columns, GdkEvent
static void static void
panel_file_list_resize_callback (GtkCList *clist, gint column, gint width, WPanel *panel) panel_file_list_resize_callback (GtkCList *clist, gint column, gint width, WPanel *panel)
{ {
format_e *format = panel->format; int p;
int i, p;
p = column_width_pos[panel->list_type]; /* offset in column_width */ p = column_width_pos[panel->list_type]; /* offset in column_width */
g_assert (p >= 0); g_assert (p >= 0);
@ -1682,8 +1681,19 @@ display_mini_info (WPanel *panel)
static void static void
panel_chdir (GtkDTree *dtree, char *path, WPanel *panel) panel_chdir (GtkDTree *dtree, char *path, WPanel *panel)
{ {
if (!panel->dragging) if (panel->dragging)
do_panel_cd (panel, path, cd_exact); 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 static void

View File

@ -282,7 +282,9 @@ gtk_flist_button_press (GtkWidget *widget, GdkEventButton *event)
flist->dnd_select_pending = FALSE; flist->dnd_select_pending = FALSE;
flist->dnd_select_pending_state = 0; 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; retval = TRUE;
break; break;