Only in gtk+-1.2.8: Makefile Only in gtk+-1.2.8: config.cache Only in gtk+-1.2.8: config.h Only in gtk+-1.2.8: config.log Only in gtk+-1.2.8: config.status Only in gtk+-1.2.8/docs: Makefile Only in gtk+-1.2.8/docs: gtk-config.1 Only in gtk+-1.2.8/gdk: .libs Only in gtk+-1.2.8/gdk: Makefile Only in gtk+-1.2.8/gdk: gdk.lo Only in gtk+-1.2.8/gdk: gdk.o Only in gtk+-1.2.8/gdk: gdkcc.lo Only in gtk+-1.2.8/gdk: gdkcc.o Only in gtk+-1.2.8/gdk: gdkcolor.lo Only in gtk+-1.2.8/gdk: gdkcolor.o Only in gtk+-1.2.8/gdk: gdkcursor.lo Only in gtk+-1.2.8/gdk: gdkcursor.o Only in gtk+-1.2.8/gdk: gdkdnd.lo Only in gtk+-1.2.8/gdk: gdkdnd.o Only in gtk+-1.2.8/gdk: gdkdraw.lo Only in gtk+-1.2.8/gdk: gdkdraw.o Only in gtk+-1.2.8/gdk: gdkevents.lo Only in gtk+-1.2.8/gdk: gdkevents.o Only in gtk+-1.2.8/gdk: gdkfont.lo Only in gtk+-1.2.8/gdk: gdkfont.o Only in gtk+-1.2.8/gdk: gdkgc.lo Only in gtk+-1.2.8/gdk: gdkgc.o Only in gtk+-1.2.8/gdk: gdkglobals.lo Only in gtk+-1.2.8/gdk: gdkglobals.o Only in gtk+-1.2.8/gdk: gdkim.lo Only in gtk+-1.2.8/gdk: gdkim.o Only in gtk+-1.2.8/gdk: gdkimage.lo Only in gtk+-1.2.8/gdk: gdkimage.o Only in gtk+-1.2.8/gdk: gdkinput.lo Only in gtk+-1.2.8/gdk: gdkinput.o Only in gtk+-1.2.8/gdk: gdkpixmap.lo Only in gtk+-1.2.8/gdk: gdkpixmap.o Only in gtk+-1.2.8/gdk: gdkproperty.lo Only in gtk+-1.2.8/gdk: gdkproperty.o Only in gtk+-1.2.8/gdk: gdkrectangle.lo Only in gtk+-1.2.8/gdk: gdkrectangle.o Only in gtk+-1.2.8/gdk: gdkregion.lo Only in gtk+-1.2.8/gdk: gdkregion.o Only in gtk+-1.2.8/gdk: gdkrgb.lo Only in gtk+-1.2.8/gdk: gdkrgb.o Only in gtk+-1.2.8/gdk: gdkselection.lo Only in gtk+-1.2.8/gdk: gdkselection.o Only in gtk+-1.2.8/gdk: gdkvisual.lo Only in gtk+-1.2.8/gdk: gdkvisual.o Only in gtk+-1.2.8/gdk: gdkwindow.lo Only in gtk+-1.2.8/gdk: gdkwindow.o Only in gtk+-1.2.8/gdk: gdkxid.lo Only in gtk+-1.2.8/gdk: gdkxid.o Only in gtk+-1.2.8/gdk: gxid_lib.lo Only in gtk+-1.2.8/gdk: gxid_lib.o Only in gtk+-1.2.8/gdk: libgdk.la Only in gtk+-1.2.8/gtk: .libs Only in gtk+-1.2.8/gtk: Makefile Only in gtk+-1.2.8/gtk: fnmatch.lo Only in gtk+-1.2.8/gtk: fnmatch.o Only in gtk+-1.2.8/gtk: gtkaccelgroup.lo Only in gtk+-1.2.8/gtk: gtkaccelgroup.o Only in gtk+-1.2.8/gtk: gtkaccellabel.lo Only in gtk+-1.2.8/gtk: gtkaccellabel.o Only in gtk+-1.2.8/gtk: gtkadjustment.lo Only in gtk+-1.2.8/gtk: gtkadjustment.o Only in gtk+-1.2.8/gtk: gtkalignment.lo Only in gtk+-1.2.8/gtk: gtkalignment.o Only in gtk+-1.2.8/gtk: gtkarg.lo Only in gtk+-1.2.8/gtk: gtkarg.o Only in gtk+-1.2.8/gtk: gtkarrow.lo Only in gtk+-1.2.8/gtk: gtkarrow.o Only in gtk+-1.2.8/gtk: gtkaspectframe.lo Only in gtk+-1.2.8/gtk: gtkaspectframe.o Only in gtk+-1.2.8/gtk: gtkbbox.lo Only in gtk+-1.2.8/gtk: gtkbbox.o Only in gtk+-1.2.8/gtk: gtkbin.lo Only in gtk+-1.2.8/gtk: gtkbin.o Only in gtk+-1.2.8/gtk: gtkbindings.lo Only in gtk+-1.2.8/gtk: gtkbindings.o Only in gtk+-1.2.8/gtk: gtkbox.lo Only in gtk+-1.2.8/gtk: gtkbox.o Only in gtk+-1.2.8/gtk: gtkbutton.lo Only in gtk+-1.2.8/gtk: gtkbutton.o Only in gtk+-1.2.8/gtk: gtkcalendar.lo Only in gtk+-1.2.8/gtk: gtkcalendar.o Only in gtk+-1.2.8/gtk: gtkcheckbutton.lo Only in gtk+-1.2.8/gtk: gtkcheckbutton.o Only in gtk+-1.2.8/gtk: gtkcheckmenuitem.lo Only in gtk+-1.2.8/gtk: gtkcheckmenuitem.o Only in gtk+-1.2.8/gtk: gtkclist.lo Only in gtk+-1.2.8/gtk: gtkclist.o Only in gtk+-1.2.8/gtk: gtkcolorsel.lo Only in gtk+-1.2.8/gtk: gtkcolorsel.o Only in gtk+-1.2.8/gtk: gtkcombo.lo Only in gtk+-1.2.8/gtk: gtkcombo.o Only in gtk+-1.2.8/gtk: gtkcontainer.lo Only in gtk+-1.2.8/gtk: gtkcontainer.o Only in gtk+-1.2.8/gtk: gtkctree.lo Only in gtk+-1.2.8/gtk: gtkctree.o Only in gtk+-1.2.8/gtk: gtkcurve.lo Only in gtk+-1.2.8/gtk: gtkcurve.o Only in gtk+-1.2.8/gtk: gtkdata.lo Only in gtk+-1.2.8/gtk: gtkdata.o Only in gtk+-1.2.8/gtk: gtkdialog.lo Only in gtk+-1.2.8/gtk: gtkdialog.o Only in gtk+-1.2.8/gtk: gtkdnd.lo Only in gtk+-1.2.8/gtk: gtkdnd.o Only in gtk+-1.2.8/gtk: gtkdrawingarea.lo Only in gtk+-1.2.8/gtk: gtkdrawingarea.o Only in gtk+-1.2.8/gtk: gtkeditable.lo Only in gtk+-1.2.8/gtk: gtkeditable.o Only in gtk+-1.2.8/gtk: gtkentry.lo Only in gtk+-1.2.8/gtk: gtkentry.o Only in gtk+-1.2.8/gtk: gtkeventbox.lo Only in gtk+-1.2.8/gtk: gtkeventbox.o diff -bBur gtk+-1.2.8-orig/gtk/gtkfilesel.c gtk+-1.2.8/gtk/gtkfilesel.c --- gtk+-1.2.8-orig/gtk/gtkfilesel.c Thu Jan 27 08:39:54 2000 +++ gtk+-1.2.8/gtk/gtkfilesel.c Tue Oct 17 15:55:37 2000 @@ -322,6 +322,7 @@ static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); +static void gtk_file_selection_home (GtkWidget *widget, gpointer data); @@ -567,6 +568,17 @@ gtk_widget_show (filesel->fileop_ren_file); } + if (!filesel->fileop_home) + { + filesel->fileop_home = gtk_button_new_with_label (_("Home")); + gtk_signal_connect (GTK_OBJECT (filesel->fileop_home), "clicked", + (GtkSignalFunc) gtk_file_selection_home, + (gpointer) filesel); + gtk_box_pack_start (GTK_BOX (filesel->button_area), + filesel->fileop_home, TRUE, TRUE, 0); + gtk_widget_show (filesel->fileop_home); + } + gtk_widget_queue_resize(GTK_WIDGET(filesel)); } @@ -576,6 +588,11 @@ g_return_if_fail (filesel != NULL); g_return_if_fail (GTK_IS_FILE_SELECTION (filesel)); + if (filesel->fileop_home) + { + gtk_widget_destroy (filesel->fileop_home); + filesel->fileop_home = NULL; + } if (filesel->fileop_ren_file) { gtk_widget_destroy (filesel->fileop_ren_file); @@ -1082,6 +1099,28 @@ } +static void +gtk_file_selection_home (GtkWidget *widget, gpointer data) +{ + GtkFileSelection *fs = data; + char *home_dir = getenv("HOME"); + + g_return_if_fail (fs != NULL); + g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); + + if (home_dir == NULL) { + /* Pop up error dialog */ + gtk_file_selection_fileop_error (fs, "No home directory found."); + return; + } + + home_dir = g_strconcat(home_dir, "/", NULL); + + gtk_file_selection_populate (fs, home_dir, FALSE); + + g_free(home_dir); /* Does gtk_file_selection_populate keep it? */ +} + static gint gtk_file_selection_key_press (GtkWidget *widget, GdkEventKey *event, @@ -1281,11 +1320,16 @@ break; default: + /* gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); + */ break; } else + gtk_file_selection_populate (fs, filename, FALSE); + /* gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); + */ g_free (filename); } @@ -1431,8 +1475,22 @@ } else { + if (fs->selection_entry) { + gchar * basename; + basename = g_basename(gtk_entry_get_text(GTK_ENTRY(fs->selection_entry))); + if (basename == NULL) { + g_print("NULL basename"); + } else if (basename != gtk_entry_get_text(GTK_ENTRY(fs->selection_entry))) { + basename = strdup(basename); + gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), basename); + g_free(basename); + } + } + + /* if (fs->selection_entry) gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), ""); + */ } if (!did_recurse) Only in gtk+-1.2.8/gtk: gtkfilesel.c~ diff -bBur gtk+-1.2.8-orig/gtk/gtkfilesel.h gtk+-1.2.8/gtk/gtkfilesel.h --- gtk+-1.2.8-orig/gtk/gtkfilesel.h Sun Feb 13 00:59:45 2000 +++ gtk+-1.2.8/gtk/gtkfilesel.h Tue Oct 17 15:00:54 2000 @@ -74,6 +74,7 @@ GtkWidget *button_area; GtkWidget *action_area; + GtkWidget *fileop_home; }; struct _GtkFileSelectionClass Only in gtk+-1.2.8/gtk: gtkfilesel.lo Only in gtk+-1.2.8/gtk: gtkfilesel.o Only in gtk+-1.2.8/gtk: gtkfixed.lo Only in gtk+-1.2.8/gtk: gtkfixed.o Only in gtk+-1.2.8/gtk: gtkfontsel.lo Only in gtk+-1.2.8/gtk: gtkfontsel.o Only in gtk+-1.2.8/gtk: gtkframe.lo Only in gtk+-1.2.8/gtk: gtkframe.o Only in gtk+-1.2.8/gtk: gtkgamma.lo Only in gtk+-1.2.8/gtk: gtkgamma.o Only in gtk+-1.2.8/gtk: gtkgc.lo Only in gtk+-1.2.8/gtk: gtkgc.o Only in gtk+-1.2.8/gtk: gtkhandlebox.lo Only in gtk+-1.2.8/gtk: gtkhandlebox.o Only in gtk+-1.2.8/gtk: gtkhbbox.lo Only in gtk+-1.2.8/gtk: gtkhbbox.o Only in gtk+-1.2.8/gtk: gtkhbox.lo Only in gtk+-1.2.8/gtk: gtkhbox.o Only in gtk+-1.2.8/gtk: gtkhpaned.lo Only in gtk+-1.2.8/gtk: gtkhpaned.o Only in gtk+-1.2.8/gtk: gtkhruler.lo Only in gtk+-1.2.8/gtk: gtkhruler.o Only in gtk+-1.2.8/gtk: gtkhscale.lo Only in gtk+-1.2.8/gtk: gtkhscale.o Only in gtk+-1.2.8/gtk: gtkhscrollbar.lo Only in gtk+-1.2.8/gtk: gtkhscrollbar.o Only in gtk+-1.2.8/gtk: gtkhseparator.lo Only in gtk+-1.2.8/gtk: gtkhseparator.o Only in gtk+-1.2.8/gtk: gtkimage.lo Only in gtk+-1.2.8/gtk: gtkimage.o Only in gtk+-1.2.8/gtk: gtkinputdialog.lo Only in gtk+-1.2.8/gtk: gtkinputdialog.o Only in gtk+-1.2.8/gtk: gtkinvisible.lo Only in gtk+-1.2.8/gtk: gtkinvisible.o Only in gtk+-1.2.8/gtk: gtkitem.lo Only in gtk+-1.2.8/gtk: gtkitem.o Only in gtk+-1.2.8/gtk: gtkitemfactory.lo Only in gtk+-1.2.8/gtk: gtkitemfactory.o Only in gtk+-1.2.8/gtk: gtklabel.lo Only in gtk+-1.2.8/gtk: gtklabel.o Only in gtk+-1.2.8/gtk: gtklayout.lo Only in gtk+-1.2.8/gtk: gtklayout.o Only in gtk+-1.2.8/gtk: gtklist.lo Only in gtk+-1.2.8/gtk: gtklist.o Only in gtk+-1.2.8/gtk: gtklistitem.lo Only in gtk+-1.2.8/gtk: gtklistitem.o Only in gtk+-1.2.8/gtk: gtkmain.lo Only in gtk+-1.2.8/gtk: gtkmain.o Only in gtk+-1.2.8/gtk: gtkmarshal.lo Only in gtk+-1.2.8/gtk: gtkmarshal.o Only in gtk+-1.2.8/gtk: gtkmenu.lo Only in gtk+-1.2.8/gtk: gtkmenu.o Only in gtk+-1.2.8/gtk: gtkmenubar.lo Only in gtk+-1.2.8/gtk: gtkmenubar.o Only in gtk+-1.2.8/gtk: gtkmenufactory.lo Only in gtk+-1.2.8/gtk: gtkmenufactory.o Only in gtk+-1.2.8/gtk: gtkmenuitem.lo Only in gtk+-1.2.8/gtk: gtkmenuitem.o Only in gtk+-1.2.8/gtk: gtkmenushell.lo Only in gtk+-1.2.8/gtk: gtkmenushell.o Only in gtk+-1.2.8/gtk: gtkmisc.lo Only in gtk+-1.2.8/gtk: gtkmisc.o Only in gtk+-1.2.8/gtk: gtknotebook.lo Only in gtk+-1.2.8/gtk: gtknotebook.o Only in gtk+-1.2.8/gtk: gtkobject.lo Only in gtk+-1.2.8/gtk: gtkobject.o Only in gtk+-1.2.8/gtk: gtkoptionmenu.lo Only in gtk+-1.2.8/gtk: gtkoptionmenu.o Only in gtk+-1.2.8/gtk: gtkpacker.lo Only in gtk+-1.2.8/gtk: gtkpacker.o Only in gtk+-1.2.8/gtk: gtkpaned.lo Only in gtk+-1.2.8/gtk: gtkpaned.o Only in gtk+-1.2.8/gtk: gtkpixmap.lo Only in gtk+-1.2.8/gtk: gtkpixmap.o Only in gtk+-1.2.8/gtk: gtkplug.lo Only in gtk+-1.2.8/gtk: gtkplug.o Only in gtk+-1.2.8/gtk: gtkpreview.lo Only in gtk+-1.2.8/gtk: gtkpreview.o Only in gtk+-1.2.8/gtk: gtkprogress.lo Only in gtk+-1.2.8/gtk: gtkprogress.o Only in gtk+-1.2.8/gtk: gtkprogressbar.lo Only in gtk+-1.2.8/gtk: gtkprogressbar.o Only in gtk+-1.2.8/gtk: gtkradiobutton.lo Only in gtk+-1.2.8/gtk: gtkradiobutton.o Only in gtk+-1.2.8/gtk: gtkradiomenuitem.lo Only in gtk+-1.2.8/gtk: gtkradiomenuitem.o Only in gtk+-1.2.8/gtk: gtkrange.lo Only in gtk+-1.2.8/gtk: gtkrange.o Only in gtk+-1.2.8/gtk: gtkrc.lo Only in gtk+-1.2.8/gtk: gtkrc.o Only in gtk+-1.2.8/gtk: gtkruler.lo Only in gtk+-1.2.8/gtk: gtkruler.o Only in gtk+-1.2.8/gtk: gtkscale.lo Only in gtk+-1.2.8/gtk: gtkscale.o Only in gtk+-1.2.8/gtk: gtkscrollbar.lo Only in gtk+-1.2.8/gtk: gtkscrollbar.o Only in gtk+-1.2.8/gtk: gtkscrolledwindow.lo Only in gtk+-1.2.8/gtk: gtkscrolledwindow.o Only in gtk+-1.2.8/gtk: gtkselection.lo Only in gtk+-1.2.8/gtk: gtkselection.o Only in gtk+-1.2.8/gtk: gtkseparator.lo Only in gtk+-1.2.8/gtk: gtkseparator.o Only in gtk+-1.2.8/gtk: gtksignal.lo Only in gtk+-1.2.8/gtk: gtksignal.o Only in gtk+-1.2.8/gtk: gtksocket.lo Only in gtk+-1.2.8/gtk: gtksocket.o Only in gtk+-1.2.8/gtk: gtkspinbutton.lo Only in gtk+-1.2.8/gtk: gtkspinbutton.o Only in gtk+-1.2.8/gtk: gtkstatusbar.lo Only in gtk+-1.2.8/gtk: gtkstatusbar.o Only in gtk+-1.2.8/gtk: gtkstyle.lo Only in gtk+-1.2.8/gtk: gtkstyle.o Only in gtk+-1.2.8/gtk: gtktable.lo Only in gtk+-1.2.8/gtk: gtktable.o Only in gtk+-1.2.8/gtk: gtktearoffmenuitem.lo Only in gtk+-1.2.8/gtk: gtktearoffmenuitem.o Only in gtk+-1.2.8/gtk: gtktext.lo Only in gtk+-1.2.8/gtk: gtktext.o Only in gtk+-1.2.8/gtk: gtkthemes.lo Only in gtk+-1.2.8/gtk: gtkthemes.o Only in gtk+-1.2.8/gtk: gtktipsquery.lo Only in gtk+-1.2.8/gtk: gtktipsquery.o Only in gtk+-1.2.8/gtk: gtktogglebutton.lo Only in gtk+-1.2.8/gtk: gtktogglebutton.o Only in gtk+-1.2.8/gtk: gtktoolbar.lo Only in gtk+-1.2.8/gtk: gtktoolbar.o Only in gtk+-1.2.8/gtk: gtktooltips.lo Only in gtk+-1.2.8/gtk: gtktooltips.o Only in gtk+-1.2.8/gtk: gtktree.lo Only in gtk+-1.2.8/gtk: gtktree.o Only in gtk+-1.2.8/gtk: gtktreeitem.lo Only in gtk+-1.2.8/gtk: gtktreeitem.o Only in gtk+-1.2.8/gtk: gtktypeutils.lo Only in gtk+-1.2.8/gtk: gtktypeutils.o Only in gtk+-1.2.8/gtk: gtkvbbox.lo Only in gtk+-1.2.8/gtk: gtkvbbox.o Only in gtk+-1.2.8/gtk: gtkvbox.lo Only in gtk+-1.2.8/gtk: gtkvbox.o Only in gtk+-1.2.8/gtk: gtkviewport.lo Only in gtk+-1.2.8/gtk: gtkviewport.o Only in gtk+-1.2.8/gtk: gtkvpaned.lo Only in gtk+-1.2.8/gtk: gtkvpaned.o Only in gtk+-1.2.8/gtk: gtkvruler.lo Only in gtk+-1.2.8/gtk: gtkvruler.o Only in gtk+-1.2.8/gtk: gtkvscale.lo Only in gtk+-1.2.8/gtk: gtkvscale.o Only in gtk+-1.2.8/gtk: gtkvscrollbar.lo Only in gtk+-1.2.8/gtk: gtkvscrollbar.o Only in gtk+-1.2.8/gtk: gtkvseparator.lo Only in gtk+-1.2.8/gtk: gtkvseparator.o Only in gtk+-1.2.8/gtk: gtkwidget.lo Only in gtk+-1.2.8/gtk: gtkwidget.o Only in gtk+-1.2.8/gtk: gtkwindow.lo Only in gtk+-1.2.8/gtk: gtkwindow.o Only in gtk+-1.2.8/gtk: libgtk.la Only in gtk+-1.2.8/gtk: simple Only in gtk+-1.2.8/gtk: simple.o Only in gtk+-1.2.8/gtk: testdnd Only in gtk+-1.2.8/gtk: testdnd.o Only in gtk+-1.2.8/gtk: testgtk Only in gtk+-1.2.8/gtk: testgtk.o Only in gtk+-1.2.8/gtk: testinput Only in gtk+-1.2.8/gtk: testinput.o Only in gtk+-1.2.8/gtk: testrgb Only in gtk+-1.2.8/gtk: testrgb.o Only in gtk+-1.2.8/gtk: testselection Only in gtk+-1.2.8/gtk: testselection.o Only in gtk+-1.2.8: gtk-config Only in gtk+-1.2.8/intl: libintl.h Only in gtk+-1.2.8/intl: po2tbl.sed Only in gtk+-1.2.8: libtool Only in gtk+-1.2.8/po: Makefile Only in gtk+-1.2.8/po: Makefile.in Only in gtk+-1.2.8/po: POTFILES Only in gtk+-1.2.8: stamp-h