summaryrefslogtreecommitdiff
path: root/eel/eel-vfs-extensions.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
committerStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
commitdc66bc40724191f0068869773576dc4edf042c6f (patch)
tree74b9684feea188736b21f2c829f29befaaf2e9da /eel/eel-vfs-extensions.c
parent935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent1466df20591105550738a1d0784a623af9909abf (diff)
downloadcaja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2
caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'eel/eel-vfs-extensions.c')
-rw-r--r--eel/eel-vfs-extensions.c30
1 files changed, 1 insertions, 29 deletions
diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c
index 27db2a46..9c786965 100644
--- a/eel/eel-vfs-extensions.c
+++ b/eel/eel-vfs-extensions.c
@@ -27,11 +27,11 @@
*/
#include <config.h>
-#include "eel-i18n.h"
#include "eel-vfs-extensions.h"
#include "eel-glib-extensions.h"
#include "eel-lib-self-check-functions.h"
#include <glib.h>
+#include <glib/gi18n-lib.h>
#include <gio/gio.h>
#include "eel-string.h"
@@ -99,34 +99,6 @@ eel_make_valid_utf8 (const char *name)
return g_string_free (string, FALSE);
}
-/**
- * eel_format_uri_for_display:
- *
- * Filter, modify, unescape and change URIs to make them appropriate
- * to display to users. The conversion is done such that the roundtrip
- * to UTf8 is reversible.
- *
- * Rules:
- * file: URI's without fragments should appear as local paths
- * file: URI's with fragments should appear as file: URI's
- * All other URI's appear as expected
- *
- * @uri: a URI
- *
- * returns a g_malloc'd UTF8 string
- **/
-char *
-eel_format_uri_for_display (const char *uri)
-{
- GFile *file;
- char *res;
-
- file = g_file_new_for_uri (uri);
- res = g_file_get_parse_name (file);
- g_object_unref (file);
- return res;
-}
-
char *
eel_filename_strip_extension (const char * filename_with_extension)
{