diff --git a/ChangeLog b/ChangeLog index 63e103b76d..bdb42524a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen + + * gtk/gtkfilechooserdefault.c: Don't construct errors from + the GTK_FILE_SYSTEM_ERROR domain. Partial fix for #162911. + Wed Jan 5 11:42:49 2005 Søren Sandmann * gtk/gtkviewport.c (gtk_viewport_realize): @@ -5,8 +10,6 @@ Wed Jan 5 11:42:49 2005 Søren Sandmann the windows to None instead of adding EXPOSURE_MASK, as suggested by Owen in #162112. -2005-01-05 Matthias Clasen - * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update the user time when receiving a WM_DELETE message. (#162980, Elijah Newren) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 63e103b76d..bdb42524a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen + + * gtk/gtkfilechooserdefault.c: Don't construct errors from + the GTK_FILE_SYSTEM_ERROR domain. Partial fix for #162911. + Wed Jan 5 11:42:49 2005 Søren Sandmann * gtk/gtkviewport.c (gtk_viewport_realize): @@ -5,8 +10,6 @@ Wed Jan 5 11:42:49 2005 Søren Sandmann the windows to None instead of adding EXPOSURE_MASK, as suggested by Owen in #162112. -2005-01-05 Matthias Clasen - * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update the user time when receiving a WM_DELETE message. (#162980, Elijah Newren) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 63e103b76d..bdb42524a4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen + + * gtk/gtkfilechooserdefault.c: Don't construct errors from + the GTK_FILE_SYSTEM_ERROR domain. Partial fix for #162911. + Wed Jan 5 11:42:49 2005 Søren Sandmann * gtk/gtkviewport.c (gtk_viewport_realize): @@ -5,8 +10,6 @@ Wed Jan 5 11:42:49 2005 Søren Sandmann the windows to None instead of adding EXPOSURE_MASK, as suggested by Owen in #162112. -2005-01-05 Matthias Clasen - * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update the user time when receiving a WM_DELETE message. (#162980, Elijah Newren) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 63e103b76d..bdb42524a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-01-05 Matthias Clasen + + * gtk/gtkfilechooserdefault.c: Don't construct errors from + the GTK_FILE_SYSTEM_ERROR domain. Partial fix for #162911. + Wed Jan 5 11:42:49 2005 Søren Sandmann * gtk/gtkviewport.c (gtk_viewport_realize): @@ -5,8 +10,6 @@ Wed Jan 5 11:42:49 2005 Søren Sandmann the windows to None instead of adding EXPOSURE_MASK, as suggested by Owen in #162112. -2005-01-05 Matthias Clasen - * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Update the user time when receiving a WM_DELETE message. (#162980, Elijah Newren) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index d135196917..6e29c0c4cc 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1128,8 +1128,8 @@ check_is_folder (GtkFileSystem *file_system, const GtkFilePath *path, GError **e if (!is_folder) g_set_error (error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_NOT_FOLDER, + GTK_FILE_CHOOSER_ERROR, + GTK_FILE_COOSER_ERROR_BAD_FILENAME, "%s: %s", gtk_file_info_get_display_name (info), g_strerror (ENOTDIR)); @@ -2582,8 +2582,8 @@ shortcuts_drop_uris (GtkFileChooserDefault *impl, GError *error; g_set_error (&error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_INVALID_URI, + GTK_FILE_CHOOSER_ERROR, + GTK_FILE_CHOOSER_ERROR_BAD_FILENAME, _("Could not add a bookmark for '%s' " "because it is an invalid path name."), uri); @@ -4489,8 +4489,8 @@ gtk_file_chooser_default_set_current_folder (GtkFileChooser *chooser, !gtk_file_system_path_is_local (impl->file_system, path)) { g_set_error (error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_FAILED, + GTK_FILE_CHOOSER_ERROR, + GTK_FILE_CHOOSER_ERROR_BAD_FILENAME, _("Cannot change to folder because it is not local")); return FALSE;