[gnome-commander] noop: renamed variables



commit bd919b72c8fc1807743ab14f229de76042d68d4d
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Mon Dec 28 00:08:09 2020 +0100

    noop: renamed variables

 libgcmd/gnome-cmd-file-info.cc           |  2 +-
 libgcmd/gnome-cmd-file-info.h            |  4 ++--
 plugins/fileroller/file-roller-plugin.cc | 20 ++++++++++----------
 src/gnome-cmd-file.cc                    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/libgcmd/gnome-cmd-file-info.cc b/libgcmd/gnome-cmd-file-info.cc
index 54d42613..c04b711e 100644
--- a/libgcmd/gnome-cmd-file-info.cc
+++ b/libgcmd/gnome-cmd-file-info.cc
@@ -39,7 +39,7 @@ static void gnome_cmd_file_info_finalize (GObject *object)
 {
     GnomeCmdFileInfo *self = GNOME_CMD_FILE_INFO (object);
 
-    gnome_vfs_file_info_unref (self->info);
+    gnome_vfs_file_info_unref (self->gnomeVfsFileInfo);
     if (self->uri)
         gnome_vfs_uri_unref (self->uri);
 
diff --git a/libgcmd/gnome-cmd-file-info.h b/libgcmd/gnome-cmd-file-info.h
index 310d07ff..08c1a2ed 100644
--- a/libgcmd/gnome-cmd-file-info.h
+++ b/libgcmd/gnome-cmd-file-info.h
@@ -37,7 +37,7 @@ struct GnomeCmdFileInfo
     GObject parent;
 
     GnomeVFSURI *uri;
-    GnomeVFSFileInfo *info;
+    GnomeVFSFileInfo *gnomeVfsFileInfo;
     
     void setup(GnomeVFSURI *uri, GnomeVFSFileInfo *info);
 };
@@ -49,6 +49,6 @@ struct GnomeCmdFileInfoClass
 
 inline void GnomeCmdFileInfo::setup(GnomeVFSURI *uri_setup, GnomeVFSFileInfo *info_setup)
 {
-    this->info = info_setup;
+    this->gnomeVfsFileInfo = info_setup;
     this->uri = uri_setup;
 }
diff --git a/plugins/fileroller/file-roller-plugin.cc b/plugins/fileroller/file-roller-plugin.cc
index b6623c19..48e66db7 100644
--- a/plugins/fileroller/file-roller-plugin.cc
+++ b/plugins/fileroller/file-roller-plugin.cc
@@ -395,7 +395,7 @@ static void on_add_to_archive (GtkMenuItem *item, FileRollerPlugin *plugin)
         gchar *file_prefix = g_locale_to_utf8 (s, -1, NULL, NULL, NULL);
 
         gchar *archive_name_tmp = g_strdup_printf("%s%s", file_prefix, plugin->priv->default_ext);
-        archive_name = new_string_with_replaced_keyword(archive_name_tmp, "$N", GNOME_CMD_FILE_INFO 
(files->data)->info->name);
+        archive_name = new_string_with_replaced_keyword(archive_name_tmp, "$N", GNOME_CMD_FILE_INFO 
(files->data)->gnomeVfsFileInfo->name);
         gtk_entry_set_text (GTK_ENTRY (entry), archive_name);
         g_free(archive_name);
         g_free(archive_name_tmp);
@@ -469,15 +469,15 @@ static GList *create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *st
     GList *items = NULL;
     GtkWidget *item;
     gint num_files;
-    GList *files;
+    GList *gnomeCmdFileInfoGList;
 
-    files = state->active_dir_selected_files;
-    num_files = g_list_length (files);
+    gnomeCmdFileInfoGList = state->active_dir_selected_files;
+    num_files = g_list_length (gnomeCmdFileInfoGList);
 
     if (num_files <= 0)
         return NULL;
 
-    if (!gnome_vfs_uri_is_local (GNOME_CMD_FILE_INFO (files->data)->uri))
+    if (!gnome_vfs_uri_is_local (GNOME_CMD_FILE_INFO (gnomeCmdFileInfoGList->data)->uri))
         return NULL;
 
     FILE_ROLLER_PLUGIN (plugin)->priv->state = state;
@@ -487,14 +487,14 @@ static GList *create_popup_menu_items (GnomeCmdPlugin *plugin, GnomeCmdState *st
 
     if (num_files == 1)
     {
-        GnomeCmdFileInfo *f = GNOME_CMD_FILE_INFO (files->data);
-        gchar *fname = g_strdup (f->info->name);
+        GnomeCmdFileInfo *gnomeComdFileInfo = GNOME_CMD_FILE_INFO (gnomeCmdFileInfoGList->data);
+        gchar *fname = g_strdup (gnomeComdFileInfo->gnomeVfsFileInfo->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), f->uri);
+                item = create_menu_item (_("Extract in Current Directory"), TRUE, GTK_SIGNAL_FUNC 
(on_extract_cwd), gnomeComdFileInfo->uri);
                 items = g_list_append (items, item);
 
                 fname[strlen(fname)-strlen(handled_extensions[i])] = '\0';
@@ -502,7 +502,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), f->uri);
+                item = create_menu_item (text, TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), 
gnomeComdFileInfo->uri);
                 g_object_set_data (G_OBJECT (item), "target_name", g_strdup (fname));
                 items = g_list_append (items, item);
                 g_free (text);
@@ -512,7 +512,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), f->uri);
+                    item = create_menu_item (text, TRUE, GTK_SIGNAL_FUNC (on_extract_cwd), 
gnomeComdFileInfo->uri);
                     g_object_set_data (G_OBJECT (item), "target_dir", path);
                     items = g_list_append (items, item);
                     g_free (text);
diff --git a/src/gnome-cmd-file.cc b/src/gnome-cmd-file.cc
index e240364e..239b9577 100644
--- a/src/gnome-cmd-file.cc
+++ b/src/gnome-cmd-file.cc
@@ -236,7 +236,7 @@ void gnome_cmd_file_setup (GnomeCmdFile *gnomeCmdFile, GnomeVFSFileInfo *info, G
     g_return_if_fail (gnomeCmdFile != nullptr);
 
     gnomeCmdFile->info = info;
-    GNOME_CMD_FILE_INFO (gnomeCmdFile)->info = info;
+    GNOME_CMD_FILE_INFO (gnomeCmdFile)->gnomeVfsFileInfo = info;
 
     gnomeCmdFile->is_dotdot = info->type==GNOME_VFS_FILE_TYPE_DIRECTORY && strcmp(info->name, "..")==0;    
// check if file is '..'
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]