Index: plugins/sourceview/Makefile.am
===================================================================
--- plugins/sourceview/Makefile.am	(revision 4586)
+++ plugins/sourceview/Makefile.am	(working copy)
@@ -25,7 +25,7 @@
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GNOME_PRINT_UI_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(PLUGIN_SOURCEVIEW_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
@@ -75,7 +75,7 @@
 # Plugin dependencies
 libanjuta_sourceview_la_LIBADD = \
 	$(GNOME_PRINT_UI_LIBS) \
-	$(GNOME_VFS_LIBS) \
+	$(GIO_LIBS) \
 	$(PLUGIN_SOURCEVIEW_LIBS) \
 	$(GLADE_LIBS) \
 	$(LIBANJUTA_LIBS)
Index: plugins/patch/plugin.c
===================================================================
--- plugins/patch/plugin.c	(revision 4586)
+++ plugins/patch/plugin.c	(working copy)
@@ -16,7 +16,6 @@
  */
 
 #include <config.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-plugin.h>
Index: plugins/search/search-replace_backend.c
===================================================================
--- plugins/search/search-replace_backend.c	(revision 4586)
+++ plugins/search/search-replace_backend.c	(working copy)
@@ -830,7 +830,7 @@
 			anjuta_shell_get (ANJUTA_PLUGIN(sr->docman)->shell,
 							  "project_root_uri", G_TYPE_STRING,
 							  &dir_uri, NULL);
-			// FIXME : Replace Standard UNIX IO functions by gnome-vfs 
+			// FIXME : Replace Standard UNIX IO functions by gio 
 			if (dir_uri)			
 				dir = anjuta_util_get_local_path_from_uri(dir_uri);
 			
Index: plugins/valgrind/preferences.c
===================================================================
--- plugins/valgrind/preferences.c	(revision 4586)
+++ plugins/valgrind/preferences.c	(working copy)
@@ -30,7 +30,6 @@
 
 #include <string.h>
 #include <gconf/gconf-client.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libanjuta/anjuta-debug.h>
 
 #define EDITOR_KEY      "/apps/anjuta/valgrind/editor"
Index: plugins/valgrind/vggeneralprefs.c
===================================================================
--- plugins/valgrind/vggeneralprefs.c	(revision 4586)
+++ plugins/valgrind/vggeneralprefs.c	(working copy)
@@ -36,7 +36,6 @@
 
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-utils.h>
 
Index: plugins/valgrind/vgdefaultview.c
===================================================================
--- plugins/valgrind/vgdefaultview.c	(revision 4586)
+++ plugins/valgrind/vgdefaultview.c	(working copy)
@@ -674,7 +674,7 @@
  * We can only load local files. Support to VFS would require to change all the
  * I/O [i.e. fopen/fwrite/etc...] calls for this plugin. I hope day somebody
  * will write a gnomelib wrapper that supports old I/O methos.
- * Perhaps a solution would be to save the file grabbed by the gnome_vfs to /tmp
+ * Perhaps a solution would be to save the file grabbed by the gvfs to /tmp
  * and then open it with the I/O fopen/fwrite.
  */
  
Index: plugins/gtodo/Makefile.am
===================================================================
--- plugins/gtodo/Makefile.am	(revision 4586)
+++ plugins/gtodo/Makefile.am	(working copy)
@@ -28,7 +28,7 @@
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GTK_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DDATADIR="\"$(anjuta_data_dir)\"" \
@@ -38,7 +38,7 @@
 
 libanjuta_gtodo_la_LIBADD = \
 	$(GTK_LIBS) \
-	$(GNOME_VFS_LIBS) \
+	$(GIO_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBANJUTA_LIBS)
 
Index: plugins/indent/indent-util.c
===================================================================
--- plugins/indent/indent-util.c	(revision 4586)
+++ plugins/indent/indent-util.c	(working copy)
@@ -21,7 +21,6 @@
 
 #include <sys/wait.h>
 
-#include <libgnomevfs/gnome-vfs.h>
 #include <gconf/gconf-client.h>
 
 #include <libanjuta/anjuta-utils.h>
@@ -492,37 +491,21 @@
 gchar *
 indent_get_buffer(void)
 {
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle;
-	GnomeVFSFileInfo info;
+	GFile *file;
 	gchar *read_buf = NULL;
-	gchar *text_uri;
+	GError *error = NULL;
+	gsize *size;
 
-	text_uri = gnome_vfs_get_uri_from_local_path(INDENT_FILE_OUTPUT);
-	result = gnome_vfs_get_file_info(text_uri, &info,
-	                                 GNOME_VFS_FILE_INFO_DEFAULT |
-	                                 GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS);
-	if(result != GNOME_VFS_OK )
+	file = g_file_new_for_path (INDENT_FILE_OUTPUT);
+	if (!g_file_load_contents (file, NULL,
+		&read_buf, &size, 
+		NULL, &error))
 	{
-		DEBUG_PRINT("Cannot get info: %s\n", text_uri);
-		return NULL;
+		read_buf = NULL;
+		DEBUG_PRINT ("Error reading file: %s", error->message);
 	}
-	if((result = gnome_vfs_open (&handle, text_uri,
-								 GNOME_VFS_OPEN_READ)) != GNOME_VFS_OK)
-	{
-		DEBUG_PRINT("Cannot open: %s\n", text_uri);
-		return NULL;
-	}
-	read_buf = g_new0(char, info.size + 1);
-	
-	result = gnome_vfs_read (handle, read_buf, info.size, NULL);
-	if(!(result == GNOME_VFS_OK || result == GNOME_VFS_ERROR_EOF))
-	{
-		g_free (read_buf);
-		DEBUG_PRINT("No file: %s\n", text_uri);	
-		return NULL;
-	}
-	gnome_vfs_close (handle);
+	g_object_unref (file);
+
 	return read_buf;
 }
 
Index: plugins/document-manager/Makefile.am
===================================================================
--- plugins/document-manager/Makefile.am	(revision 4586)
+++ plugins/document-manager/Makefile.am	(working copy)
@@ -23,7 +23,7 @@
 	$(DEPRECATED_FLAGS) \
 	$(GDL_CFLAGS) \
 	$(GNOME_PRINT_UI_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-document-manager\"
 
@@ -32,7 +32,7 @@
 libanjuta_document_manager_la_LIBADD = \
 	$(GDL_LIBS) \
 	$(GNOME_PRINT_UI_LIBS) \
-	$(GNOME_VFS_LIBS) \
+	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_document_manager_la_SOURCES= \
Index: plugins/glade/anjuta-design-document.c
===================================================================
--- plugins/glade/anjuta-design-document.c	(revision 4586)
+++ plugins/glade/anjuta-design-document.c	(working copy)
@@ -29,8 +29,6 @@
 #include <libanjuta/interfaces/ianjuta-file-savable.h>
 #include <libanjuta/interfaces/ianjuta-document.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 enum
 {
 	PROP_0,
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 4589)
+++ ChangeLog	(working copy)
@@ -1,3 +1,19 @@
+2009-01-15  Jens Georg  <mail@jensge.org>
+
+	* plugins/document-manager/Makefile.am:
+	* plugins/glade/anjuta-design-document.c:
+	* plugins/gtodo/Makefile.am:
+	* plugins/indent/indent-util.c (indent_get_buffer):
+	* plugins/patch/plugin.c:
+	* plugins/search/search-replace_backend.c (create_search_entries):
+	* plugins/sourceview/Makefile.am:
+	* plugins/valgrind/preferences.c:
+	* plugins/valgrind/vgdefaultview.c:
+	* plugins/valgrind/vggeneralprefs.c:
+	
+	#511589 - mostly cosmetical changes like removing #include directives, 
+	makefile references etc.
+
 2009-01-14  Adam Dingle  <adam@medovina.org>
 
 	reviewed by: Massimo Cora'  <mcora@svn.gnome.org>
