Merged from gtk-2-6:

2005-05-06  Federico Mena Quintero  <federico@ximian.com>

	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".

diff --git a/ChangeLog b/ChangeLog
index f13ed46251c4d718c3dc1a53b2615e18a1761afe..14188fddb6ceeefd5e16dd8427e829270f8cb34f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-06  Federico Mena Quintero  <federico@ximian.com>
+
+       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  <mclasen@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f13ed46251c4d718c3dc1a53b2615e18a1761afe..14188fddb6ceeefd5e16dd8427e829270f8cb34f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-05-06  Federico Mena Quintero  <federico@ximian.com>
+
+       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  <mclasen@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f13ed46251c4d718c3dc1a53b2615e18a1761afe..14188fddb6ceeefd5e16dd8427e829270f8cb34f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-05-06  Federico Mena Quintero  <federico@ximian.com>
+
+       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  <mclasen@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always

diff --git a/autogen.sh b/autogen.sh
index 10a7fdad97a6df4181a661f620b692d5a70e0fea..eb87eace895b5a3db094d3e62f53fbb757fd5eb4 100755 (executable)
--- 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 54e02aa3ef0840d0c5901bead67a6563ac78fe92..82355e1cf3b9eb9e7d5be50d2469716ee83ebb93 100644 (file)
--- 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;
 }