AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove GtkFileSystemError, use GtkFileChooserError instead. (#538378,

Browse Source 
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
This commit is contained in:
Carlos Garnacho 2008-06-17 23:33:48 +00:00 committed by Carlos Garnacho
parent 5bca232e78
commit 6bb24bf6c8
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-18 Carlos Garnacho <carlos@imendio.com>
* gtk/gtkfilesystem.[ch]: Remove GtkFileSystemError, use
GtkFileChooserError instead. (#538378, patch by Matthias Clasen)
2008-06-17 Michael Natterer <mitch@imendio.com> 2008-06-17 Michael Natterer <mitch@imendio.com>
* examples/gtkdial/gtkdial.[ch]: undeprecate. * examples/gtkdial/gtkdial.[ch]: undeprecate.

18
gtk/gtkfilesystem.c
View File

@ -134,12 +134,6 @@ static void gtk_folder_add_file (GtkFolder *folder,
GFileInfo *info); GFileInfo *info);
GQuark
_gtk_file_system_error_quark (void)
{
return g_quark_from_static_string ("gtk-file-system-error-quark");
}
/* GtkFileSystemBookmark methods */ /* GtkFileSystemBookmark methods */
void void
_gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark) _gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark)
@ -641,8 +635,8 @@ _gtk_file_system_parse (GtkFileSystem *file_system,
if (!parent_file) if (!parent_file)
{ {
g_set_error (error, g_set_error (error,
GTK_FILE_SYSTEM_ERROR, GTK_FILE_CHOOSER_ERROR,
GTK_FILE_SYSTEM_ERROR_NONEXISTENT, GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
"Could not get parent file"); "Could not get parent file");
*folder = NULL; *folder = NULL;
*file_part = NULL; *file_part = NULL;
@ -989,8 +983,8 @@ _gtk_file_system_insert_bookmark (GtkFileSystem *file_system,
gchar *uri = g_file_get_uri (file); gchar *uri = g_file_get_uri (file);
g_set_error (error, g_set_error (error,
GTK_FILE_SYSTEM_ERROR, GTK_FILE_CHOOSER_ERROR,
GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS, GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS,
"%s already exists in the bookmarks list", "%s already exists in the bookmarks list",
uri); uri);
@ -1052,8 +1046,8 @@ _gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
gchar *uri = g_file_get_uri (file); gchar *uri = g_file_get_uri (file);
g_set_error (error, g_set_error (error,
GTK_FILE_SYSTEM_ERROR, GTK_FILE_CHOOSER_ERROR,
GTK_FILE_SYSTEM_ERROR_NONEXISTENT, GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
"%s does not exist in the bookmarks list", "%s does not exist in the bookmarks list",
uri); uri);

17
gtk/gtkfilesystem.h
View File

@ -41,23 +41,6 @@ G_BEGIN_DECLS
#define GTK_IS_FOLDER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GTK_TYPE_FOLDER)) #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)) #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 GtkFileSystemClass GtkFileSystemClass;
typedef struct GtkFileSystem GtkFileSystem; typedef struct GtkFileSystem GtkFileSystem;
typedef struct GtkFolderClass GtkFolderClass; typedef struct GtkFolderClass GtkFolderClass;