[file-roller: 63/123] renamed _g_path_get_base_name as _g_path_get_basename
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller: 63/123] renamed _g_path_get_base_name as _g_path_get_basename
- Date: Mon, 6 Aug 2012 13:46:09 +0000 (UTC)
commit 99649b2bc0836620e193779b6c613f47a4aa8803
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Jul 28 10:12:30 2012 +0200
renamed _g_path_get_base_name as _g_path_get_basename
src/fr-window.c | 2 +-
src/glib-utils.c | 2 +-
src/glib-utils.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/fr-window.c b/src/fr-window.c
index ebbd9d8..b57c112 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -6799,7 +6799,7 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
GFileInfo *info;
GFileType file_type;
- base_name = _g_path_get_base_name ((char *) odata->current_file->data, odata->edata->base_dir, odata->edata->junk_paths);
+ base_name = _g_path_get_basename ((char *) odata->current_file->data, odata->edata->base_dir, odata->edata->junk_paths);
e_base_name = g_uri_escape_string (base_name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
dest_uri = g_strdup_printf ("%s/%s", odata->edata->extract_to_dir, e_base_name);
file = g_file_new_for_uri (dest_uri);
diff --git a/src/glib-utils.c b/src/glib-utils.c
index d32e2f0..de9cdf8 100644
--- a/src/glib-utils.c
+++ b/src/glib-utils.c
@@ -1001,7 +1001,7 @@ _g_path_is_parent_of (const char *dirname,
const char *
-_g_path_get_base_name (const char *path,
+_g_path_get_basename (const char *path,
const char *base_dir,
gboolean junk_paths)
{
diff --git a/src/glib-utils.h b/src/glib-utils.h
index 54137c5..0904a3b 100644
--- a/src/glib-utils.h
+++ b/src/glib-utils.h
@@ -137,7 +137,7 @@ char * _g_path_remove_ending_separator(const char *path);
char * _g_path_remove_extension (const char *path);
gboolean _g_path_is_parent_of (const char *dirname,
const char *filename);
-const char * _g_path_get_base_name (const char *path,
+const char * _g_path_get_basename (const char *path,
const char *base_dir,
gboolean junk_paths);
gboolean _g_filename_is_hidden (const char *name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]