gtranslator r3464 - in branches/GOBJECT_WORK: . src

[icq svn gnome org]

Author: icq
Date: Sun Jan 27 22:42:05 2008
New Revision: 3464
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3464&view=rev

Log:
2008-01-27  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * configure.ac:
        * src/application:
        * src/utils_gui.ch:
        * src/actions-file.c:
        Removed gnome-vfs dependency.



Modified:
   branches/GOBJECT_WORK/ChangeLog
   branches/GOBJECT_WORK/configure.ac
   branches/GOBJECT_WORK/src/actions-file.c
   branches/GOBJECT_WORK/src/application.c
   branches/GOBJECT_WORK/src/utils_gui.c

Modified: branches/GOBJECT_WORK/configure.ac
==============================================================================
--- branches/GOBJECT_WORK/configure.ac	(original)
+++ branches/GOBJECT_WORK/configure.ac	Sun Jan 27 22:42:05 2008
@@ -71,7 +71,7 @@
 dnl ==========================================================================
 
 GTK_REQUIRED=2.11.6
-GNOME_VFS_REQUIRED=1.9.4
+GCONF_REQUIRED=2.18.0
 LIBXML_REQUIRED=2.4.12
 LIBGLADE_REQUIRED=2.6.0
 SOURCEVIEW_REQUIRED=2.0.0
@@ -80,8 +80,7 @@
 GTKSPELL_OPTIONAL=2.0.2
 
 AC_SUBST(GTK_REQUIRED)
-AC_SUBST(GNOME_BUILD_REQUIRED)
-AC_SUBST(GNOME_VFS_REQUIRED)
+AC_SUBST(GCONF_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(LIBGLADE_REQUIRED)
 AC_SUBST(SOURCEVIEW_REQUIRED)
@@ -89,7 +88,7 @@
 AC_SUBST(GTKSPELL_OPTIONAL)
 
 PKG_CHECK_MODULES(GTRANSLATOR, [
-gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED 
+gconf-2.0 >= $GCONF_REQUIRED
 libxml-2.0 >= $LIBXML_REQUIRED 
 libglade-2.0 >= $LIBGLADE_REQUIRED
 gtksourceview-2.0 >= $SOURCEVIEW_REQUIRED

Modified: branches/GOBJECT_WORK/src/actions-file.c
==============================================================================
--- branches/GOBJECT_WORK/src/actions-file.c	(original)
+++ branches/GOBJECT_WORK/src/actions-file.c	Sun Jan 27 22:42:05 2008
@@ -515,7 +515,7 @@
 {
 	while (uris != NULL)
 	{
-		if (gnome_vfs_uris_match (u, (const gchar*)uris->data))
+		if (strcmp (u, (const gchar*)uris->data) == 0)
 			return TRUE;
 			
 		uris = g_slist_next (uris);

Modified: branches/GOBJECT_WORK/src/application.c
==============================================================================
--- branches/GOBJECT_WORK/src/application.c	(original)
+++ branches/GOBJECT_WORK/src/application.c	Sun Jan 27 22:42:05 2008
@@ -190,8 +190,6 @@
 	}
 	
 	g_object_unref(app);
-	
-	//gtk_main_quit();
 }
 
 /**

Modified: branches/GOBJECT_WORK/src/utils_gui.c
==============================================================================
--- branches/GOBJECT_WORK/src/utils_gui.c	(original)
+++ branches/GOBJECT_WORK/src/utils_gui.c	Sun Jan 27 22:42:05 2008
@@ -25,7 +25,6 @@
 
 #include <string.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
@@ -290,37 +289,12 @@
 
 gchar *
 gtranslator_utils_make_canonical_uri_from_shell_arg (const gchar *str)
-{	
-	gchar *uri;
-	gchar *canonical_uri;
-
+{
 	g_return_val_if_fail (str != NULL, NULL);
 	g_return_val_if_fail (*str != '\0', NULL);
-	
-	/* Note for the future: 
-	 *
-	 * <federico> paolo: and flame whoever tells 
-	 * you that file:///gnome/test_files/hÃllà 
-	 * doesn't work --- that's not a valid URI
-	 *
-	 * <paolo> federico: well, another solution that 
-	 * does not requires patch to _from_shell_args 
-	 * is to check that the string returned by it 
-	 * contains only ASCII chars
-	 * <federico> paolo: hmmmm, isn't there 
-	 * gnome_vfs_is_uri_valid() or something?
-	 * <paolo>: I will use gedit_utils_is_valid_uri ()
-	 *
-	 */
-	 
-	uri = gnome_vfs_make_uri_from_shell_arg (str);
-	canonical_uri = gnome_vfs_make_uri_canonical (uri);
-	g_free (uri);
-	
-	/* g_print ("URI: %s\n", canonical_uri); */
-	
-	if (gtranslator_utils_is_valid_uri (canonical_uri))
-		return canonical_uri;
+		
+	if (gtranslator_utils_is_valid_uri (str))
+		return g_strdup (str);
 	
 	return NULL;
 }