[gimp] app: s/filepath/filename/ in order to avoid introducing new terminology
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: s/filepath/filename/ in order to avoid introducing new terminology
- Date: Fri, 20 May 2011 17:07:14 +0000 (UTC)
commit 9aae53802fc354867504ad5ae8b11ef98e3e93d9
Author: Michael Natterer <mitch gimp org>
Date: Fri May 20 19:06:57 2011 +0200
app: s/filepath/filename/ in order to avoid introducing new terminology
app/dialogs/dialogs.c | 32 ++++++++++++++++----------------
app/gui/session.c | 20 ++++++++++----------
2 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 1154f10..32a3a82 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -465,32 +465,32 @@ dialogs_ensure_factory_entry_on_recent_dock (GimpSessionInfo *info)
}
static char *
-dialogs_get_dockrc_filepath (void)
+dialogs_get_dockrc_filename (void)
{
- const gchar *filename;
+ const gchar *basename;
- filename = g_getenv ("GIMP_TESTING_DOCKRC_NAME");
- if (! filename)
- filename = "dockrc";
+ basename = g_getenv ("GIMP_TESTING_DOCKRC_NAME");
+ if (! basename)
+ basename = "dockrc";
- return gimp_personal_rc_file (filename);
+ return gimp_personal_rc_file (basename);
}
void
dialogs_load_recent_docks (Gimp *gimp)
{
- char *filepath;
+ gchar *filename;
GError *error = NULL;
g_return_if_fail (GIMP_IS_GIMP (gimp));
- filepath = dialogs_get_dockrc_filepath ();
+ filename = dialogs_get_dockrc_filename ();
if (gimp->be_verbose)
- g_print ("Parsing '%s'\n", gimp_filename_to_utf8 (filepath));
+ g_print ("Parsing '%s'\n", gimp_filename_to_utf8 (filename));
if (! gimp_config_deserialize_file (GIMP_CONFIG (global_recent_docks),
- filepath,
+ filename,
NULL, &error))
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
@@ -508,24 +508,24 @@ dialogs_load_recent_docks (Gimp *gimp)
gimp_list_reverse (GIMP_LIST (global_recent_docks));
- g_free (filepath);
+ g_free (filename);
}
void
dialogs_save_recent_docks (Gimp *gimp)
{
- gchar *filepath;
+ gchar *filename;
GError *error = NULL;
g_return_if_fail (GIMP_IS_GIMP (gimp));
- filepath = dialogs_get_dockrc_filepath ();
+ filename = dialogs_get_dockrc_filename ();
if (gimp->be_verbose)
- g_print ("Writing '%s'\n", gimp_filename_to_utf8 (filepath));
+ g_print ("Writing '%s'\n", gimp_filename_to_utf8 (filename));
if (! gimp_config_serialize_to_file (GIMP_CONFIG (global_recent_docks),
- filepath,
+ filename,
"recently closed docks",
"end of recently closed docks",
NULL, &error))
@@ -534,7 +534,7 @@ dialogs_save_recent_docks (Gimp *gimp)
g_clear_error (&error);
}
- g_free (filepath);
+ g_free (filename);
}
GtkWidget *
diff --git a/app/gui/session.c b/app/gui/session.c
index 0381dc0..3f06bdb 100644
--- a/app/gui/session.c
+++ b/app/gui/session.c
@@ -364,22 +364,22 @@ session_clear (Gimp *gimp,
static gchar *
session_filename (Gimp *gimp)
{
- const gchar *filename;
- gchar *filepath;
+ const gchar *basename;
+ gchar *filename;
- filename = g_getenv ("GIMP_TESTING_SESSIONRC_NAME");
- if (! filename)
- filename = "sessionrc";
+ basename = g_getenv ("GIMP_TESTING_SESSIONRC_NAME");
+ if (! basename)
+ basename = "sessionrc";
- filepath = gimp_personal_rc_file (filename);
+ filename = gimp_personal_rc_file (basename);
if (gimp->session_name)
{
- gchar *tmp = g_strconcat (filepath, ".", gimp->session_name, NULL);
+ gchar *tmp = g_strconcat (filename, ".", gimp->session_name, NULL);
- g_free (filepath);
- filepath = tmp;
+ g_free (filename);
+ filename = tmp;
}
- return filepath;
+ return filename;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]