diff options
| author | Carlos Garnacho <carlos@imendio.com> | 2008-06-17 23:33:48 +0000 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@src.gnome.org> | 2008-06-17 23:33:48 +0000 |
| commit | 6bb24bf6c8f63f48b0646ddf1d4a149a2044d8b0 (patch) | |
| tree | 4a201aefd70ffe823d5db57daba7f6169fdef296 /gtk | |
| parent | 5bca232e7811fdbfc878b1793f66a830e9bfb3bb (diff) | |
| download | gtk+-6bb24bf6c8f63f48b0646ddf1d4a149a2044d8b0.tar.gz | |
Remove GtkFileSystemError, use GtkFileChooserError instead. (#538378,
2008-06-18 Carlos Garnacho <carlos@imendio.com>
* gtk/gtkfilesystem.[ch]: Remove GtkFileSystemError, use
GtkFileChooserError instead. (#538378, patch by Matthias Clasen)
svn path=/trunk/; revision=20440
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkfilesystem.c | 18 | ||||
| -rw-r--r-- | gtk/gtkfilesystem.h | 17 |
2 files changed, 6 insertions, 29 deletions
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 8112ffb93f..8ba538e8d9 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -134,12 +134,6 @@ static void gtk_folder_add_file (GtkFolder *folder, GFileInfo *info); -GQuark -_gtk_file_system_error_quark (void) -{ - return g_quark_from_static_string ("gtk-file-system-error-quark"); -} - /* GtkFileSystemBookmark methods */ void _gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark) @@ -641,8 +635,8 @@ _gtk_file_system_parse (GtkFileSystem *file_system, if (!parent_file) { g_set_error (error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_NONEXISTENT, + GTK_FILE_CHOOSER_ERROR, + GTK_FILE_CHOOSER_ERROR_NONEXISTENT, "Could not get parent file"); *folder = NULL; *file_part = NULL; @@ -989,8 +983,8 @@ _gtk_file_system_insert_bookmark (GtkFileSystem *file_system, gchar *uri = g_file_get_uri (file); g_set_error (error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS, + GTK_FILE_CHOOSER_ERROR, + GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS, "%s already exists in the bookmarks list", uri); @@ -1052,8 +1046,8 @@ _gtk_file_system_remove_bookmark (GtkFileSystem *file_system, gchar *uri = g_file_get_uri (file); g_set_error (error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_NONEXISTENT, + GTK_FILE_CHOOSER_ERROR, + GTK_FILE_CHOOSER_ERROR_NONEXISTENT, "%s does not exist in the bookmarks list", uri); diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h index b8ee00d252..fa708fe570 100644 --- a/gtk/gtkfilesystem.h +++ b/gtk/gtkfilesystem.h @@ -41,23 +41,6 @@ G_BEGIN_DECLS #define GTK_IS_FOLDER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GTK_TYPE_FOLDER)) #define GTK_FOLDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_FOLDER, GtkFolderClass)) -/* GError enumeration for GtkFileSystem - */ - -#define GTK_FILE_SYSTEM_ERROR (_gtk_file_system_error_quark ()) - -typedef enum -{ - GTK_FILE_SYSTEM_ERROR_NONEXISTENT, - GTK_FILE_SYSTEM_ERROR_NOT_FOLDER, - GTK_FILE_SYSTEM_ERROR_INVALID_URI, - GTK_FILE_SYSTEM_ERROR_BAD_FILENAME, - GTK_FILE_SYSTEM_ERROR_FAILED, - GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS -} GtkFileSystemError; - -GQuark _gtk_file_system_error_quark (void); - typedef struct GtkFileSystemClass GtkFileSystemClass; typedef struct GtkFileSystem GtkFileSystem; typedef struct GtkFolderClass GtkFolderClass; |