GNOME.org
 

[gnome-commander] noop: finfo -> f, part 3

commit bd8e06a3a7e26019adc3c6e8f3de4cb73b0820e0
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon May 11 19:08:18 2009 +0200

    noop: finfo -> f, part 3
---
 libgcmd/gnome-cmd-file-info.c           |    8 ++++----
 plugins/cvs/cvs-plugin.c                |   15 +++++++--------
 plugins/fileroller/file-roller-plugin.c |   10 +++++-----
 src/gnome-cmd-advrename-lexer.ll        |   12 ++++++------
 src/gnome-cmd-chmod-dialog.cc           |   17 ++++++++---------
 src/gnome-cmd-chown-dialog.cc           |   14 +++++++-------
 6 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/libgcmd/gnome-cmd-file-info.c b/libgcmd/gnome-cmd-file-info.c
index d9db149..d597bb0 100644
--- a/libgcmd/gnome-cmd-file-info.c
+++ b/libgcmd/gnome-cmd-file-info.c
@@ -104,10 +104,10 @@ gnome_cmd_file_info_get_type ()
 
 
 void
-gnome_cmd_file_info_setup (GnomeCmdFileInfo *finfo, GnomeVFSURI *uri, GnomeVFSFileInfo *info)
+gnome_cmd_file_info_setup (GnomeCmdFileInfo *f, GnomeVFSURI *uri, GnomeVFSFileInfo *info)
 {
-    g_return_if_fail (GNOME_CMD_IS_FILE_INFO (finfo));
+    g_return_if_fail (GNOME_CMD_IS_FILE_INFO (f));
 
-    finfo->info = info;
-    finfo->uri = uri;
+    f->info = info;
+    f->uri = uri;
 }
diff --git a/plugins/cvs/cvs-plugin.c b/plugins/cvs/cvs-plugin.c
index a3d35ba..ddf30bb 100644
--- a/plugins/cvs/cvs-plugin.c
+++ b/plugins/cvs/cvs-plugin.c
@@ -110,9 +110,8 @@ static void on_diff (GtkMenuItem *item, GnomeCmdState *state)
     for (; files; files = files->next)
     {
         gchar *cmd;
-        GnomeCmdFileInfo *finfo = GNOME_CMD_FILE_INFO (files->data);
-        GnomeVFSURI *uri = gnome_vfs_uri_append_file_name (
-            state->active_dir_uri, finfo->info->name);
+        GnomeCmdFileInfo *f = GNOME_CMD_FILE_INFO (files->data);
+        GnomeVFSURI *uri = gnome_vfs_uri_append_file_name (state->active_dir_uri, f->info->name);
         const gchar *fpath = gnome_vfs_uri_get_path (uri);
 
         change_cwd (fpath);
@@ -136,8 +135,8 @@ static void on_log (GtkMenuItem *item, GnomeCmdState *state)
 
     for (; files; files = files->next)
     {
-        GnomeCmdFileInfo *finfo = GNOME_CMD_FILE_INFO (files->data);
-        GnomeVFSURI *uri = gnome_vfs_uri_append_file_name (state->active_dir_uri, finfo->info->name);
+        GnomeCmdFileInfo *f = GNOME_CMD_FILE_INFO (files->data);
+        GnomeVFSURI *uri = gnome_vfs_uri_append_file_name (state->active_dir_uri, f->info->name);
         const gchar *fpath = gnome_vfs_uri_get_path (uri);
 
         change_cwd (fpath);
@@ -220,9 +219,9 @@ static gboolean cvs_dir_exists (GList *files)
 {
     for (; files; files = files->next)
     {
-        GnomeCmdFileInfo *finfo = GNOME_CMD_FILE_INFO (files->data);
-        if (finfo->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY &&
-            strcmp (finfo->info->name, "CVS") == 0)
+        GnomeCmdFileInfo *f = GNOME_CMD_FILE_INFO (files->data);
+        if (f->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY &&
+            strcmp (f->info->name, "CVS") == 0)
         {
             return TRUE;
         }
diff --git a/plugins/fileroller/file-roller-plugin.c b/plugins/fileroller/file-roller-plugin.c
index 7c4d0dc..054d3ef 100644
--- a/plugins/fileroller/file-roller-plugin.c
+++ b/plugins/fileroller/file-roller-plugin.c
@@ -290,14 +290,14 @@ static GList *create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *st
 
     if (num_files == 1)
     {
-        GnomeCmdFileInfo *finfo = GNOME_CMD_FILE_INFO (files->data);
-        gchar *fname = g_strdup (finfo->info->name);
+        GnomeCmdFileInfo *f = GNOME_CMD_FILE_INFO (files->data);
+        gchar *fname = g_strdup (f->info->name);
         gint i;
 
         for (i=0; handled_extensions[i]; ++i)
             if (g_str_has_suffix (fname, handled_extensions[i]))
             {
-                item = create_menu_item (_("Extract in Current Directory"), TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), finfo->uri);
+                item = create_menu_item (_("Extract in Current Directory"), TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), f->uri);
                 items = g_list_append (items, item);
 
                 fname[strlen(fname)-strlen(handled_extensions[i])] = '\0';
@@ -305,7 +305,7 @@ static GList *create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *st
                 gchar *text;
 
                 text = g_strdup_printf (_("Extract to '%s'"), fname);
-                item = create_menu_item (text, TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), finfo->uri);
+                item = create_menu_item (text, TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), f->uri);
                 gtk_object_set_data (GTK_OBJECT (item), "target_name", g_strdup (fname));
                 items = g_list_append (items, item);
                 g_free (text);
@@ -315,7 +315,7 @@ static GList *create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *st
                     gchar *path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (state->inactive_dir_uri), NULL);
 
                     text = g_strdup_printf (_("Extract to '%s'"), path);
-                    item = create_menu_item (text, TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), finfo->uri);
+                    item = create_menu_item (text, TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), f->uri);
                     gtk_object_set_data (GTK_OBJECT (item), "target_dir", path);
                     items = g_list_append (items, item);
                     g_free (text);
diff --git a/src/gnome-cmd-advrename-lexer.ll b/src/gnome-cmd-advrename-lexer.ll
index 1c46085..7d2b801 100644
--- a/src/gnome-cmd-advrename-lexer.ll
+++ b/src/gnome-cmd-advrename-lexer.ll
@@ -411,12 +411,12 @@ inline void find_dirs (const gchar *path, const gchar *&parent_dir, const gchar
 }
 
 
-char *gnome_cmd_advrename_gen_fname (char *new_fname, size_t new_fname_size, GnomeCmdFile *finfo)
+char *gnome_cmd_advrename_gen_fname (char *new_fname, size_t new_fname_size, GnomeCmdFile *f)
 {
   string fmt;
   fmt.reserve(256);
 
-  char *fname = get_utf8 (finfo->info->name);
+  char *fname = get_utf8 (f->info->name);
   char *ext = g_utf8_strrchr (fname, -1, '.');
 
   int full_name_len = g_utf8_strlen (fname, -1);
@@ -433,7 +433,7 @@ char *gnome_cmd_advrename_gen_fname (char *new_fname, size_t new_fname_size, Gno
   const char *parent_dir, *grandparent_dir;
   int parent_dir_len, grandparent_dir_len;
 
-  find_dirs(gnome_cmd_file_get_path(finfo), parent_dir, grandparent_dir, parent_dir_len, grandparent_dir_len);
+  find_dirs(gnome_cmd_file_get_path(f), parent_dir, grandparent_dir, parent_dir_len, grandparent_dir_len);
 
   for (vector<CHUNK *>::iterator i=fname_template.begin(); i!=fname_template.end(); ++i)
     switch ((*i)->type)
@@ -488,18 +488,18 @@ char *gnome_cmd_advrename_gen_fname (char *new_fname, size_t new_fname_size, Gno
 
       case METATAG: // currently ranges are NOT supported for $T() tokens !!!
 
-                    // const gchar *tag_value = gcmd_tags_get_value (finfo,(*i)->tag.tag);
+                    // const gchar *tag_value = gcmd_tags_get_value (f,(*i)->tag.tag);
 
                     // if (tag_value)
                       // append_utf8_chunk (fmt, *i, tag_value, g_utf8_strlen (tag_value, -1));
 
-                    fmt += gcmd_tags_get_value (finfo,(*i)->tag.tag);
+                    fmt += gcmd_tags_get_value (f,(*i)->tag.tag);
                     break;
 
       default :     break;
     }
 
-  strftime(new_fname, new_fname_size, fmt.c_str(), localtime(&finfo->info->mtime));
+  strftime(new_fname, new_fname_size, fmt.c_str(), localtime(&f->info->mtime));
 
   g_free(fname);
 
diff --git a/src/gnome-cmd-chmod-dialog.cc b/src/gnome-cmd-chmod-dialog.cc
index 1a870df..781b9c5 100644
--- a/src/gnome-cmd-chmod-dialog.cc
+++ b/src/gnome-cmd-chmod-dialog.cc
@@ -61,26 +61,25 @@ struct GnomeCmdChmodDialogPrivate
 static GnomeCmdDialogClass *parent_class = NULL;
 
 
-static void do_chmod (GnomeCmdFile *in_finfo, GnomeVFSFilePermissions perm,
-                      gboolean recursive, ChmodRecursiveMode mode)
+static void do_chmod (GnomeCmdFile *in, GnomeVFSFilePermissions perm, gboolean recursive, ChmodRecursiveMode mode)
 {
-    g_return_if_fail (in_finfo != NULL);
-    g_return_if_fail (in_finfo->info != NULL);
+    g_return_if_fail (in != NULL);
+    g_return_if_fail (in->info != NULL);
 
-    if (!(recursive && mode == CHMOD_DIRS_ONLY && in_finfo->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY))
+    if (!(recursive && mode == CHMOD_DIRS_ONLY && in->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY))
     {
-        GnomeVFSResult ret = gnome_cmd_file_chmod (in_finfo, perm);
+        GnomeVFSResult ret = gnome_cmd_file_chmod (in, perm);
 
         if (ret != GNOME_VFS_OK)
-            gnome_cmd_show_message (NULL, gnome_cmd_file_get_name (in_finfo), gnome_vfs_result_to_string (ret));
+            gnome_cmd_show_message (NULL, gnome_cmd_file_get_name (in), gnome_vfs_result_to_string (ret));
         else
             if (!recursive)
                 return;
     }
 
-    if (in_finfo->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (in->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
     {
-        GnomeCmdDir *dir = GNOME_CMD_DIR (in_finfo);
+        GnomeCmdDir *dir = GNOME_CMD_DIR (in);
         GList *files;
 
         gnome_cmd_dir_ref (dir);
diff --git a/src/gnome-cmd-chown-dialog.cc b/src/gnome-cmd-chown-dialog.cc
index 7afb7de..ff80ffa 100644
--- a/src/gnome-cmd-chown-dialog.cc
+++ b/src/gnome-cmd-chown-dialog.cc
@@ -43,18 +43,18 @@ struct GnomeCmdChownDialogPrivate
 static GnomeCmdDialogClass *parent_class = NULL;
 
 
-static void do_chown (GnomeCmdFile *in_finfo, uid_t uid, gid_t gid, gboolean recurse)
+static void do_chown (GnomeCmdFile *in, uid_t uid, gid_t gid, gboolean recurse)
 {
     GnomeVFSResult ret;
 
-    g_return_if_fail (in_finfo != NULL);
-    g_return_if_fail (in_finfo->info != NULL);
+    g_return_if_fail (in != NULL);
+    g_return_if_fail (in->info != NULL);
 
-    ret = gnome_cmd_file_chown (in_finfo, uid, gid);
+    ret = gnome_cmd_file_chown (in, uid, gid);
 
     if (ret != GNOME_VFS_OK)
     {
-        gchar *fpath = gnome_cmd_file_get_real_path (in_finfo);
+        gchar *fpath = gnome_cmd_file_get_real_path (in);
         gchar *msg = g_strdup_printf (_("Could not chown %s\n%s"), fpath, gnome_vfs_result_to_string (ret));
         create_error_dialog (msg);
         g_free (msg);
@@ -64,9 +64,9 @@ static void do_chown (GnomeCmdFile *in_finfo, uid_t uid, gid_t gid, gboolean rec
         if (!recurse)
             return;
 
-    if (in_finfo->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (in->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
     {
-        GnomeCmdDir *dir = GNOME_CMD_DIR (in_finfo);
+        GnomeCmdDir *dir = GNOME_CMD_DIR (in);
         GList *files, *tmp;
 
         gnome_cmd_dir_ref (dir);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]