anjuta r4033 - in trunk: . plugins/file-manager

[jhs svn gnome org]

Author: jhs
Date: Sat Jun 28 18:45:56 2008
New Revision: 4033
URL: http://svn.gnome.org/viewvc/anjuta?rev=4033&view=rev

Log:
2008-06-28  Johannes Schmid  <jhs gnome org>

  Patch from Yuriy Penkin:
	* configure.in:
	* plugins/file-manager/Makefile.am:
	* plugins/file-manager/plugin.c (file_manager_set_default_uri):
	#539726 â Completing port to GIO

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/file-manager/Makefile.am
   trunk/plugins/file-manager/plugin.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jun 28 18:45:56 2008
@@ -182,9 +182,9 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-PKG_CHECK_MODULES(GTHREAD, gio-2.0 >= $GIO_REQUIRED)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)

Modified: trunk/plugins/file-manager/Makefile.am
==============================================================================
--- trunk/plugins/file-manager/Makefile.am	(original)
+++ trunk/plugins/file-manager/Makefile.am	Sat Jun 28 18:45:56 2008
@@ -22,7 +22,8 @@
 # Include paths
 AM_CPPFLAGS = \
 	$(LIBANJUTA_CFLAGS) \
-	$(GDL_CFLAGS) 
+	$(GDL_CFLAGS) \
+	$(GIO_CFLAGS)
 
 # Where to install the plugin
 plugindir = $(anjuta_plugin_dir)
@@ -46,7 +47,8 @@
 # Plugin dependencies
 libfile_manager_la_LIBADD = \
 	$(LIBANJUTA_LIBS) \
-	$(GDL_LIBS) 
+	$(GDL_LIBS) \
+	$(GIO_LIBS)
 
 file-view-marshal.h: file-view-marshal.list
 	@GLIB_GENMARSHAL@ \

Modified: trunk/plugins/file-manager/plugin.c
==============================================================================
--- trunk/plugins/file-manager/plugin.c	(original)
+++ trunk/plugins/file-manager/plugin.c	Sat Jun 28 18:45:56 2008
@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <glade/glade-xml.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
+#include <gio/gio.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-preferences.h>
@@ -77,11 +77,14 @@
 static void
 file_manager_set_default_uri (AnjutaFileManager* file_manager)
 {
-	gchar* uri = 
-		uri = gnome_vfs_get_uri_from_local_path(anjuta_preferences_get (file_manager->prefs, PREF_ROOT));
+	GFile *file;	
+
+	file = g_file_new_for_path (anjuta_preferences_get (file_manager->prefs, PREF_ROOT));
+	char *uri = g_file_get_uri (file);
 	g_object_set (G_OBJECT (file_manager->fv), "base_uri", uri, NULL);
 	file_manager->have_project = FALSE;
 	g_free (uri);
+	g_object_unref (file);
 }
 
 static void