anjuta r4542 - in trunk: . plugins/cvs-plugin plugins/subversion

[mcora svn gnome org]

Author: mcora
Date: Tue Jan  6 10:43:07 2009
New Revision: 4542
URL: http://svn.gnome.org/viewvc/anjuta?rev=4542&view=rev

Log:
	* plugins/cvs-plugin/cvs-interface.c: 
	* plugins/cvs-plugin/plugin.c: 
	* plugins/subversion/plugin.c: 
	Do not use glib 2.18 functions

Modified:
   trunk/ChangeLog
   trunk/plugins/cvs-plugin/cvs-interface.c
   trunk/plugins/cvs-plugin/plugin.c
   trunk/plugins/subversion/plugin.c

Modified: trunk/plugins/cvs-plugin/cvs-interface.c
==============================================================================
--- trunk/plugins/cvs-plugin/cvs-interface.c	(original)
+++ trunk/plugins/cvs-plugin/cvs-interface.c	Tue Jan  6 10:43:07 2009
@@ -88,10 +88,23 @@
 {
 	GFile* file;
 	GFileType type;
+	GFileInfo *file_info;
 
 	// FIXME check if filename can only be local file here
 	file = g_file_new_for_path(filename);
-	type = g_file_query_file_type(file, G_FILE_QUERY_INFO_NONE, NULL);
+	file_info = g_file_query_info (file, 
+			G_FILE_ATTRIBUTE_STANDARD_TYPE,
+			G_FILE_QUERY_INFO_NONE,
+			NULL, NULL);
+	if (file_info == NULL)
+	{
+		g_object_unref (G_OBJECT (file));
+		return FALSE;
+	}
+
+	type = g_file_info_get_attribute_uint32 (file_info, 
+			G_FILE_ATTRIBUTE_STANDARD_TYPE);
+	g_object_unref(G_OBJECT(file_info));
 	g_object_unref(G_OBJECT(file));
 	
 	return type == G_FILE_TYPE_DIRECTORY ? TRUE : FALSE;

Modified: trunk/plugins/cvs-plugin/plugin.c
==============================================================================
--- trunk/plugins/cvs-plugin/plugin.c	(original)
+++ trunk/plugins/cvs-plugin/plugin.c	Tue Jan  6 10:43:07 2009
@@ -173,6 +173,7 @@
 	GFileType type;
 	GFile *cvs_dir;
 	GFileEnumerator *en;
+	GFileInfo *file_info;
 	
 	GFile* file = G_FILE (g_value_get_object (value));
 	filename = g_file_get_path (file);
@@ -190,8 +191,18 @@
 	
 	/* If a directory is selected we check if it contains a "CVS" directory,
 	if it is a file we check if it's directory contains a "CVS" directory */
+	file_info = g_file_query_info (file,
+			G_FILE_ATTRIBUTE_STANDARD_TYPE,
+			G_FILE_QUERY_INFO_NONE, NULL, NULL);
 
-	type = g_file_query_file_type (file, G_FILE_QUERY_INFO_NONE, NULL);
+	if (file_info == NULL)
+	{
+		return;
+	}
+
+	type = g_file_info_get_attribute_uint32 (file_info, 
+			G_FILE_ATTRIBUTE_STANDARD_TYPE);
+	g_object_unref (file_info);
 	if (type == G_FILE_TYPE_DIRECTORY)
 	{
 		cvs_dir = g_file_get_child (file, "CVS");

Modified: trunk/plugins/subversion/plugin.c
==============================================================================
--- trunk/plugins/subversion/plugin.c	(original)
+++ trunk/plugins/subversion/plugin.c	Tue Jan  6 10:43:07 2009
@@ -213,6 +213,7 @@
 	GFile* svn_dir;
 	GFileType type;
 	GFileEnumerator *en;
+	GFileInfo *file_info;
 	
 	file = G_FILE(g_value_get_object (value));
 	filename = g_file_get_path (file);
@@ -230,7 +231,18 @@
 	
 	/* If a directory is selected we check if it contains a "Subversion" directory,
 	if it is a file we check if it's directory contains a "Subversion" directory */
-	type = g_file_query_file_type (file, G_FILE_QUERY_INFO_NONE, NULL);
+	file_info = g_file_query_info (file, 
+			G_FILE_ATTRIBUTE_STANDARD_TYPE,
+			G_FILE_QUERY_INFO_NONE,
+			NULL, NULL);
+	if (file_info == NULL)
+	{
+		return;
+	}
+
+	type = g_file_info_get_attribute_uint32 (file_info, 
+			G_FILE_ATTRIBUTE_STANDARD_TYPE);
+	g_object_unref (G_OBJECT (file_info));
 	if (type == G_FILE_TYPE_DIRECTORY)
 	{
 		svn_dir = g_file_get_child (file, ".svn");