Commit e2240850 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero

Fixes to problems reported by Iain Holmes:

2003-11-19  Federico Mena Quintero  <federico@ximian.com>

	Fixes to problems reported by Iain Holmes:

	* gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
	throw up an error dialog if the desktop doesn't exist.
	(error_message): Handle the case where there is no real toplevel
	yet.
	(list_model_filter_func): Always let folders pass through (patch
	by Dave Malcolm).
parent 11ff1a2a
2003-11-19 Federico Mena Quintero <federico@ximian.com>
Fixes to problems reported by Iain Holmes:
* gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
throw up an error dialog if the desktop doesn't exist.
(error_message): Handle the case where there is no real toplevel
yet.
(list_model_filter_func): Always let folders pass through (patch
by Dave Malcolm).
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
......
2003-11-19 Federico Mena Quintero <federico@ximian.com>
Fixes to problems reported by Iain Holmes:
* gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
throw up an error dialog if the desktop doesn't exist.
(error_message): Handle the case where there is no real toplevel
yet.
(list_model_filter_func): Always let folders pass through (patch
by Dave Malcolm).
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
......
2003-11-19 Federico Mena Quintero <federico@ximian.com>
Fixes to problems reported by Iain Holmes:
* gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
throw up an error dialog if the desktop doesn't exist.
(error_message): Handle the case where there is no real toplevel
yet.
(list_model_filter_func): Always let folders pass through (patch
by Dave Malcolm).
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
......
2003-11-19 Federico Mena Quintero <federico@ximian.com>
Fixes to problems reported by Iain Holmes:
* gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
throw up an error dialog if the desktop doesn't exist.
(error_message): Handle the case where there is no real toplevel
yet.
(list_model_filter_func): Always let folders pass through (patch
by Dave Malcolm).
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
......
2003-11-19 Federico Mena Quintero <federico@ximian.com>
Fixes to problems reported by Iain Holmes:
* gtk/gtkfilechooserdefault.c (shortcuts_append_desktop): Do not
throw up an error dialog if the desktop doesn't exist.
(error_message): Handle the case where there is no real toplevel
yet.
(list_model_filter_func): Always let folders pass through (patch
by Dave Malcolm).
Wed Nov 19 23:19:23 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.[ch] (gtk_combo_box_scroll_event): move function
......
......@@ -354,8 +354,10 @@ error_message (GtkFileChooserDefault *impl,
GtkWidget *dialog;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (impl));
if (!GTK_WIDGET_TOPLEVEL (toplevel))
toplevel = NULL;
dialog = gtk_message_dialog_new (toplevel ? GTK_WINDOW (toplevel) : NULL,
dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
......@@ -557,7 +559,6 @@ shortcuts_append_desktop (GtkFileChooserDefault *impl)
{
char *name;
GtkFilePath *path;
GError *error;
/* FIXME: What is the Right Way of finding the desktop directory? */
......@@ -565,10 +566,10 @@ shortcuts_append_desktop (GtkFileChooserDefault *impl)
path = gtk_file_system_filename_to_path (impl->file_system, name);
g_free (name);
error = NULL;
impl->has_desktop = shortcuts_insert_path (impl, -1, path, FALSE, NULL, &error);
if (!impl->has_desktop)
error_getting_info_dialog (impl, path, error);
impl->has_desktop = shortcuts_insert_path (impl, -1, path, FALSE, NULL, NULL);
/* We do not actually pop up an error dialog if there is no desktop directory
* because some people may really not want to have one.
*/
gtk_file_path_free (path);
}
......@@ -1470,6 +1471,9 @@ list_model_filter_func (GtkFileSystemModel *model,
if (!impl->current_filter)
return TRUE;
if (gtk_file_info_get_is_folder (file_info))
return TRUE;
filter_info.contains = GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE;
needed = gtk_file_filter_get_needed (impl->current_filter);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment