From 778b99a403c1a69e33f96cd140666fe7278195e5 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 6 May 2005 21:00:01 +0000 Subject: [PATCH] Merged from gtk-2-6: 2005-05-06 Federico Mena Quintero Merged from gtk-2-6: * gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime types if this is an AFS directory. (fill_in_names): If we are in an AFS directory, set the MIME type blindly to "x-directory/normal". --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ autogen.sh | 13 ++++++++++++- gtk/gtkfilesystemunix.c | 12 ++++++++---- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f13ed46251..14188fddb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-05-06 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime + types if this is an AFS directory. + (fill_in_names): If we are in an AFS directory, set the MIME type + blindly to "x-directory/normal". + 2005-05-06 Matthias Clasen * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f13ed46251..14188fddb6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-05-06 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime + types if this is an AFS directory. + (fill_in_names): If we are in an AFS directory, set the MIME type + blindly to "x-directory/normal". + 2005-05-06 Matthias Clasen * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f13ed46251..14188fddb6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-05-06 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilesystemunix.c (fill_in_mime_type): Don't fill the mime + types if this is an AFS directory. + (fill_in_names): If we are in an AFS directory, set the MIME type + blindly to "x-directory/normal". + 2005-05-06 Matthias Clasen * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always diff --git a/autogen.sh b/autogen.sh index 10a7fdad97..eb87eace89 100755 --- a/autogen.sh +++ b/autogen.sh @@ -98,15 +98,26 @@ $ACLOCAL $ACLOCAL_FLAGS || exit $? libtoolize --force || exit $? gtkdocize || exit $? +echo START AUTOHEADER autoheader || exit $? +echo END AUTOHEADER +echo START AUTOMAKE $AUTOMAKE --add-missing || exit $? +echo END AUTOMAKE +echo START_AUTOCONF +echo `which autoconf` +set > /home/federico/kk autoconf || exit $? +echo END_AUTOCONF cd $ORIGDIR || exit $? if test -z "$AUTOGEN_SUBDIR_MODE"; then +echo START CONFIGURE $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? - +echo END CONFIGURE echo echo "Now type 'make' to compile $PROJECT." +else +echo CONFIGURE NOT RUN fi diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 54e02aa3ef..82355e1cf3 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -2135,7 +2135,10 @@ fill_in_names (GtkFileFolderUnix *folder_unix, GError **error) entry = g_new0 (struct stat_info_entry, 1); if (folder_unix->is_network_dir) - entry->statbuf.st_mode = S_IFDIR; + { + entry->statbuf.st_mode = S_IFDIR; + entry->mime_type = g_strdup ("x-directory/normal"); + } g_hash_table_insert (folder_unix->stat_info, g_strdup (basename), @@ -2214,9 +2217,10 @@ fill_in_mime_type (GtkFileFolderUnix *folder_unix) g_assert (folder_unix->stat_info != NULL); - g_hash_table_foreach_remove (folder_unix->stat_info, - cb_fill_in_mime_type, - folder_unix); + if (!folder_unix->is_network_dir) + g_hash_table_foreach_remove (folder_unix->stat_info, + cb_fill_in_mime_type, + folder_unix); folder_unix->have_mime_type = TRUE; }