diff --git a/ChangeLog b/ChangeLog index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dd2d481518..f1c8ee13c6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Fri Mar 8 14:22:43 2002 Owen Taylor + + * gtk/gtkfilesel.c (gtk_file_selection_init): Some packing + tweaks. + + * configure.in: Include GLIB_LIBS when checking + for bind_textdomain_codeset, to catch the case where + it is in -lintl. + Thu Mar 7 16:46:58 2002 Jonathan Blandford * gtk/gtktreeview.c (validate_visible_area): get rid of really diff --git a/configure.in b/configure.in index 51b263e699..ff49a9c178 100644 --- a/configure.in +++ b/configure.in @@ -316,7 +316,7 @@ if test "x$enable_rebuilds" = "xyes" && \ fi AC_SUBST(REBUILD) -AC_CHECK_FUNCS(lstat mkstemp bind_textdomain_codeset) +AC_CHECK_FUNCS(lstat mkstemp) # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable AC_MSG_CHECKING(for sigsetjmp) @@ -414,6 +414,14 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, *** GLIB is always available from ftp://ftp.gtk.org/.]), gobject gmodule gthread) +dnl +dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. +dnl +gtk_save_LIBS=$LIBS +LIBS="$LIBS $GLIB_LIBS" +AC_CHECK_FUNCS(bind_textdomain_codeset) +LIBS=$gtk_save_LIBS + AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H)) AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H)) AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 1d4ccdaecf..b6cfc5f105 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -82,7 +82,7 @@ #include "gtkdnd.h" #include "gtkeventbox.h" -#define WANT_HPANAED 1 +#define WANT_HPANED 1 #include "gtkhpaned.h" #ifdef G_OS_WIN32 @@ -637,6 +637,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) GtkWidget *pulldown_hbox; GtkWidget *scrolled_win; GtkWidget *eventbox; + GtkWidget *spacer; GtkDialog *dialog; GtkListStore *model; @@ -674,18 +675,29 @@ gtk_file_selection_init (GtkFileSelection *filesel) FALSE, FALSE, 0); /* The horizontal box containing the directory and file listboxes */ + + spacer = gtk_hbox_new (FALSE, 0); + gtk_widget_set_size_request (spacer, -1, 5); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0); + gtk_widget_show (spacer); + list_hbox = gtk_hbox_new (FALSE, 5); gtk_box_pack_start (GTK_BOX (filesel->main_vbox), list_hbox, TRUE, TRUE, 0); gtk_widget_show (list_hbox); - if (WANT_HPANAED) + if (WANT_HPANED) list_container = g_object_new (GTK_TYPE_HPANED, "visible", TRUE, "parent", list_hbox, - "border_width", 5, + "border_width", 0, NULL); else list_container = list_hbox; + spacer = gtk_hbox_new (FALSE, 0); + gtk_widget_set_size_request (spacer, -1, 5); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0); + gtk_widget_show (spacer); + /* The directories list */ model = gtk_list_store_new (1, G_TYPE_STRING);