callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from gtk-2-6:

Browse Source 
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".
This commit is contained in:
Federico Mena Quintero
2005-05-06 21:00:01 +00:00
committed by Federico Mena Quintero
parent 1d50b80aed
commit 778b99a403
5 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2005-05-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always

9
ChangeLog.pre-2-10
View File

@ -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> 2005-05-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always

9
ChangeLog.pre-2-8
View File

@ -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> 2005-05-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always

13
autogen.sh
View File

@ -98,15 +98,26 @@ $ACLOCAL $ACLOCAL_FLAGS || exit $?
libtoolize --force || exit $? libtoolize --force || exit $?
gtkdocize || exit $? gtkdocize || exit $?
echo START AUTOHEADER
autoheader || exit $? autoheader || exit $?
echo END AUTOHEADER
echo START AUTOMAKE
$AUTOMAKE --add-missing || exit $? $AUTOMAKE --add-missing || exit $?
echo END AUTOMAKE
echo START_AUTOCONF
echo `which autoconf`
set > /home/federico/kk
autoconf || exit $? autoconf || exit $?
echo END_AUTOCONF
cd $ORIGDIR || exit $? cd $ORIGDIR || exit $?
if test -z "$AUTOGEN_SUBDIR_MODE"; then if test -z "$AUTOGEN_SUBDIR_MODE"; then
echo START CONFIGURE
$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
echo END CONFIGURE
echo echo
echo "Now type 'make' to compile $PROJECT." echo "Now type 'make' to compile $PROJECT."
else
echo CONFIGURE NOT RUN
fi fi

12
gtk/gtkfilesystemunix.c
View File

@ -2135,7 +2135,10 @@ fill_in_names (GtkFileFolderUnix *folder_unix, GError **error)
entry = g_new0 (struct stat_info_entry, 1); entry = g_new0 (struct stat_info_entry, 1);
if (folder_unix->is_network_dir) 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_hash_table_insert (folder_unix->stat_info,
g_strdup (basename), g_strdup (basename),
@ -2214,9 +2217,10 @@ fill_in_mime_type (GtkFileFolderUnix *folder_unix)
g_assert (folder_unix->stat_info != NULL); g_assert (folder_unix->stat_info != NULL);
g_hash_table_foreach_remove (folder_unix->stat_info, if (!folder_unix->is_network_dir)
cb_fill_in_mime_type, g_hash_table_foreach_remove (folder_unix->stat_info,
folder_unix); cb_fill_in_mime_type,
folder_unix);
folder_unix->have_mime_type = TRUE; folder_unix->have_mime_type = TRUE;
} }