gtk+ r20440 - in trunk: . gtk

[carlosg svn gnome org]

Author: carlosg
Date: Tue Jun 17 23:33:48 2008
New Revision: 20440
URL: http://svn.gnome.org/viewvc/gtk+?rev=20440&view=rev

Log:
2008-06-18  Carlos Garnacho  <carlos imendio com>

        * gtk/gtkfilesystem.[ch]: Remove GtkFileSystemError, use
        GtkFileChooserError instead. (#538378, patch by Matthias Clasen)


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilesystem.c
   trunk/gtk/gtkfilesystem.h

Modified: trunk/gtk/gtkfilesystem.c
==============================================================================
--- trunk/gtk/gtkfilesystem.c	(original)
+++ trunk/gtk/gtkfilesystem.c	Tue Jun 17 23:33:48 2008
@@ -134,12 +134,6 @@
 					     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 @@
       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 @@
       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 @@
       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);
 

Modified: trunk/gtk/gtkfilesystem.h
==============================================================================
--- trunk/gtk/gtkfilesystem.h	(original)
+++ trunk/gtk/gtkfilesystem.h	Tue Jun 17 23:33:48 2008
@@ -41,23 +41,6 @@
 #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;