[gnome-commander/gcmd-1-3] noop: finfo -> f, part 2

From: Piotr Eljasiak <epiotr src gnome org>
To: svn-commits-list gnome org
Subject: [gnome-commander/gcmd-1-3] noop: finfo -> f, part 2
Date: Sat, 9 May 2009 12:39:17 -0400 (EDT)
commit e435d77824fed1861638e2846258e2d871b48d27
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat May 9 18:31:39 2009 +0200

    noop: finfo -> f, part 2
---
 src/gnome-cmd-file-popmenu.cc        |   44 ++++++++--------
 src/gnome-cmd-file-props-dialog.cc   |   98 +++++++++++++++++-----------------
 src/gnome-cmd-make-copy-dialog.cc    |   24 ++++----
 src/gnome-cmd-prepare-xfer-dialog.cc |   12 ++--
 src/gnome-cmd-quicksearch-popup.cc   |   18 +++---
 src/gnome-cmd-search-dialog.cc       |   46 ++++++++--------
 src/gnome-cmd-user-actions.cc        |   16 +++---
 src/utils.cc                         |   78 +++++++++++++-------------
 8 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/src/gnome-cmd-file-popmenu.cc b/src/gnome-cmd-file-popmenu.cc
index 454ec17..6fa8752 100644
--- a/src/gnome-cmd-file-popmenu.cc
+++ b/src/gnome-cmd-file-popmenu.cc
@@ -91,8 +91,8 @@ static void cb_exec_default (GtkMenuItem *menu_item, GList *files)
 
     for (; files; files = files->next)
     {
-        GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
-        GnomeVFSMimeApplication *vfs_app = gnome_cmd_app_get_default_application (finfo);
+        GnomeCmdFile *f = (GnomeCmdFile *) files->data;
+        GnomeVFSMimeApplication *vfs_app = gnome_cmd_app_get_default_application (f);
 
         if (vfs_app)
         {
@@ -107,10 +107,10 @@ static void cb_exec_default (GtkMenuItem *menu_item, GList *files)
             }
 
             gnome_vfs_mime_application_free (vfs_app);
-            data->files = g_list_append (data->files, finfo);
+            data->files = g_list_append (data->files, f);
         }
         else
-            gnome_cmd_show_message (NULL, finfo->info->name, _("Couldn't retrieve MIME type of the file."));
+            gnome_cmd_show_message (NULL, f->info->name, _("Couldn't retrieve MIME type of the file."));
     }
 
     g_hash_table_foreach (hash, (GHFunc) htcb_exec_with_app, NULL);
@@ -170,9 +170,9 @@ static void on_open_with_other (GtkMenuItem *menu_item, GList *files)
 
 static void on_execute (GtkMenuItem *menu_item, GList *files)
 {
-    GnomeCmdFile *finfo = GNOME_CMD_FILE (files->data);
+    GnomeCmdFile *f = GNOME_CMD_FILE (files->data);
 
-    gnome_cmd_file_execute (finfo);
+    gnome_cmd_file_execute (f);
 }
 
 
@@ -255,8 +255,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
         case APP_TARGET_ALL_DIRS:
             for (; files; files = files->next)
             {
-                GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
-                if (finfo->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+                GnomeCmdFile *f = (GnomeCmdFile *) files->data;
+                if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
                     return FALSE;
             }
             return TRUE;
@@ -264,8 +264,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
         case APP_TARGET_ALL_FILES:
             for (; files; files = files->next)
             {
-                GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
-                if (finfo->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
+                GnomeCmdFile *f = (GnomeCmdFile *) files->data;
+                if (f->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
                     return FALSE;
             }
             return TRUE;
@@ -273,9 +273,9 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
         case APP_TARGET_ALL_DIRS_AND_FILES:
             for (; files; files = files->next)
             {
-                GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
-                if (finfo->info->type != GNOME_VFS_FILE_TYPE_REGULAR
-                    && finfo->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+                GnomeCmdFile *f = (GnomeCmdFile *) files->data;
+                if (f->info->type != GNOME_VFS_FILE_TYPE_REGULAR
+                    && f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
                     return FALSE;
             }
             return TRUE;
@@ -290,8 +290,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
                 gint fn_flags = FNM_NOESCAPE;
 #endif
 
-                GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
-                if (finfo->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
+                GnomeCmdFile *f = (GnomeCmdFile *) files->data;
+                if (f->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
                     return FALSE;
 
                 // Check that the file matches at least one pattern
@@ -299,7 +299,7 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
                 for (; patterns; patterns = patterns->next)
                 {
                     gchar *pattern = (gchar *) patterns->data;
-                    ok |= fnmatch (pattern, finfo->info->name, fn_flags) == 0;
+                    ok |= fnmatch (pattern, f->info->name, fn_flags) == 0;
                 }
 
                 if (!ok) return FALSE;
@@ -398,9 +398,9 @@ inline gchar *get_default_application_action_name (GList *files)
     if (g_list_length(files)>1)
         return g_strdup(_("_Open"));
 
-    GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
-    gchar *uri_str = gnome_cmd_file_get_uri_str (finfo);
-    GnomeVFSMimeApplication *app = gnome_vfs_mime_get_default_application_for_uri (uri_str, finfo->info->mime_type);
+    GnomeCmdFile *f = (GnomeCmdFile *) files->data;
+    gchar *uri_str = gnome_cmd_file_get_uri_str (f);
+    GnomeVFSMimeApplication *app = gnome_vfs_mime_get_default_application_for_uri (uri_str, f->info->mime_type);
 
     g_free (uri_str);
 
@@ -468,14 +468,14 @@ GtkWidget *gnome_cmd_file_popmenu_new (GnomeCmdFileList *fl)
 
     GnomeCmdFilePopmenu *menu = (GnomeCmdFilePopmenu *) gtk_type_new (gnome_cmd_file_popmenu_get_type ());
 
-    GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
+    GnomeCmdFile *f = (GnomeCmdFile *) files->data;
 
 
     // Fill the "Open with..." menu with applications
     gint i = -1;
     menu->priv->data_list = NULL;
 
-    vfs_apps = tmp = gnome_vfs_mime_get_all_applications (finfo->info->mime_type);
+    vfs_apps = tmp = gnome_vfs_mime_get_all_applications (f->info->mime_type);
     for (; vfs_apps && i < MAX_OPEN_WITH_APPS; vfs_apps = vfs_apps->next)
     {
         GnomeVFSMimeApplication *vfs_app = (GnomeVFSMimeApplication *) vfs_apps->data;
@@ -528,7 +528,7 @@ GtkWidget *gnome_cmd_file_popmenu_new (GnomeCmdFileList *fl)
     g_free ((gpointer) open_uiinfo[0].label);
 
     pos += 3;
-    if (gnome_cmd_file_is_executable (finfo) && g_list_length (files) == 1)
+    if (gnome_cmd_file_is_executable (f) && g_list_length (files) == 1)
         gnome_app_fill_menu (GTK_MENU_SHELL (menu), exec_uiinfo, NULL, FALSE, pos++);
 
     gnome_app_fill_menu (GTK_MENU_SHELL (menu), sep_uiinfo, NULL, FALSE, pos++);
diff --git a/src/gnome-cmd-file-props-dialog.cc b/src/gnome-cmd-file-props-dialog.cc
index f64787a..ad6245c 100644
--- a/src/gnome-cmd-file-props-dialog.cc
+++ b/src/gnome-cmd-file-props-dialog.cc
@@ -40,7 +40,7 @@ using namespace std;
 typedef struct
 {
     GtkWidget *dialog;
-    GnomeCmdFile *finfo;
+    GnomeCmdFile *f;
     GThread *thread;
     GMutex *mutex;
     gboolean count_done;
@@ -143,7 +143,7 @@ static gboolean join_thread_func (GnomeCmdFilePropsDialogPrivate *data)
     if (data->thread)
         g_thread_join (data->thread);
 
-    gnome_cmd_file_unref (data->finfo);
+    gnome_cmd_file_unref (data->f);
     g_free (data);
 
     return FALSE;
@@ -192,9 +192,9 @@ static void do_calc_tree_size (GnomeCmdFilePropsDialogPrivate *data)
 static void on_change_default_app (GtkButton *btn, GnomeCmdFilePropsDialogPrivate *data)
 {
 
-    edit_mimetypes (data->finfo->info->mime_type, TRUE);
+    edit_mimetypes (data->f->info->mime_type, TRUE);
 
-    GnomeVFSMimeApplication *vfs_app = gnome_vfs_mime_get_default_application (data->finfo->info->mime_type);
+    GnomeVFSMimeApplication *vfs_app = gnome_vfs_mime_get_default_application (data->f->info->mime_type);
 
     gchar *appname = vfs_app ? vfs_app->name : g_strdup (_("No default application registered"));
 
@@ -214,9 +214,9 @@ static void on_dialog_ok (GtkButton *btn, GnomeCmdFilePropsDialogPrivate *data)
 
     const gchar *filename = gtk_entry_get_text (GTK_ENTRY (data->filename_entry));
 
-    if (strcmp (filename, gnome_cmd_file_get_name (data->finfo)) != 0)
+    if (strcmp (filename, gnome_cmd_file_get_name (data->f)) != 0)
     {
-        result = gnome_cmd_file_rename (data->finfo, filename);
+        result = gnome_cmd_file_rename (data->f, filename);
 
         if (result==GNOME_VFS_OK)
             gnome_cmd_main_win_get_fs (main_win, ACTIVE)->file_list()->focus_file(filename, TRUE);
@@ -226,8 +226,8 @@ static void on_dialog_ok (GtkButton *btn, GnomeCmdFilePropsDialogPrivate *data)
     {
         GnomeVFSFilePermissions perms = gnome_cmd_chmod_component_get_perms (GNOME_CMD_CHMOD_COMPONENT (data->chmod_component));
 
-        if (perms != data->finfo->info->permissions)
-            result = gnome_cmd_file_chmod (data->finfo, perms);
+        if (perms != data->f->info->permissions)
+            result = gnome_cmd_file_chmod (data->f, perms);
     }
 
     if (result == GNOME_VFS_OK)
@@ -235,13 +235,13 @@ static void on_dialog_ok (GtkButton *btn, GnomeCmdFilePropsDialogPrivate *data)
         uid_t uid = gnome_cmd_chown_component_get_owner (GNOME_CMD_CHOWN_COMPONENT (data->chown_component));
         gid_t gid = gnome_cmd_chown_component_get_group (GNOME_CMD_CHOWN_COMPONENT (data->chown_component));
 
-        if (uid == data->finfo->info->uid)
+        if (uid == data->f->info->uid)
             uid = -1;
-        if (gid == data->finfo->info->gid)
+        if (gid == data->f->info->gid)
             gid = -1;
 
         if (uid != -1 || gid != -1)
-            result = gnome_cmd_file_chown (data->finfo, uid, gid);
+            result = gnome_cmd_file_chown (data->f, uid, gid);
     }
 
     if (result != GNOME_VFS_OK)
@@ -266,7 +266,7 @@ static void on_copy_clipboard (GtkButton *button, GnomeCmdFilePropsDialogPrivate
 
     string s;
 
-    for (GnomeCmdFileMetadata::METADATA_COLL::const_iterator i=data->finfo->metadata->begin(); i!=data->finfo->metadata->end(); ++i)
+    for (GnomeCmdFileMetadata::METADATA_COLL::const_iterator i=data->f->metadata->begin(); i!=data->f->metadata->end(); ++i)
         for (set<std::string>::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
         {
             s += gcmd_tags_get_name(i->first);
@@ -373,18 +373,18 @@ inline GtkWidget *create_properties_tab (GnomeCmdFilePropsDialogPrivate *data)
     label = create_bold_label (dialog, _("Filename:"));
     table_add (table, label, 0, y, GTK_FILL);
 
-    fname = get_utf8 (gnome_cmd_file_get_name (data->finfo));
+    fname = get_utf8 (gnome_cmd_file_get_name (data->f));
     data->filename_entry = create_entry (dialog, "filename_entry", fname);
     g_free (fname);
     table_add (table, data->filename_entry, 1, y++, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND));
     gtk_editable_set_position (GTK_EDITABLE (data->filename_entry), 0);
 
-    if (data->finfo->info->symlink_name)
+    if (data->f->info->symlink_name)
     {
         label = create_bold_label (dialog, _("Symlink target:"));
         table_add (table, label, 0, y, GTK_FILL);
 
-        label = create_label (dialog, data->finfo->info->symlink_name);
+        label = create_label (dialog, data->f->info->symlink_name);
         table_add (table, label, 1, y++, GTK_FILL);
     }
 
@@ -393,23 +393,23 @@ inline GtkWidget *create_properties_tab (GnomeCmdFilePropsDialogPrivate *data)
     label = create_bold_label (dialog, _("Type:"));
     table_add (table, label, 0, y, GTK_FILL);
 
-    label = create_label (dialog, gnome_cmd_file_get_mime_type_desc (data->finfo));
+    label = create_label (dialog, gnome_cmd_file_get_mime_type_desc (data->f));
     table_add (table, label, 1, y++, GTK_FILL);
 
 
     label = create_bold_label (dialog, _("MIME Type:"));
     table_add (table, label, 0, y, GTK_FILL);
 
-    label = create_label (dialog, gnome_cmd_file_get_mime_type (data->finfo));
+    label = create_label (dialog, gnome_cmd_file_get_mime_type (data->f));
     table_add (table, label, 1, y++, GTK_FILL);
 
 
-    if (data->finfo->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (data->f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
     {
         label = create_bold_label (dialog, _("Opens with:"));
         table_add (table, label, 0, y, GTK_FILL);
 
-        GnomeVFSMimeApplication *vfs_app = gnome_cmd_app_get_default_application (data->finfo);
+        GnomeVFSMimeApplication *vfs_app = gnome_cmd_app_get_default_application (data->f);
 
         if (vfs_app)
         {
@@ -434,13 +434,13 @@ inline GtkWidget *create_properties_tab (GnomeCmdFilePropsDialogPrivate *data)
     label = create_bold_label (dialog, _("Modified:"));
     table_add (table, label, 0, y, GTK_FILL);
 
-    label = create_label (dialog, gnome_cmd_file_get_mdate (data->finfo, TRUE));
+    label = create_label (dialog, gnome_cmd_file_get_mdate (data->f, TRUE));
     table_add (table, label, 1, y++, GTK_FILL);
 
     label = create_bold_label (dialog, _("Accessed:"));
     table_add (table, label, 0, y, GTK_FILL);
 
-    label = create_label (dialog, gnome_cmd_file_get_adate (data->finfo, TRUE));
+    label = create_label (dialog, gnome_cmd_file_get_adate (data->f, TRUE));
     table_add (table, label, 1, y++, GTK_FILL);
 
 
@@ -450,26 +450,26 @@ inline GtkWidget *create_properties_tab (GnomeCmdFilePropsDialogPrivate *data)
     label = create_bold_label (dialog, _("Size:"));
     table_add (table, label, 0, y, GTK_FILL);
 
-    label = create_label (dialog, get_size_disp_string (data->finfo->info->size));
+    label = create_label (dialog, get_size_disp_string (data->f->info->size));
     table_add (table, label, 1, y++, GTK_FILL);
-    if (data->finfo->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (data->f->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
         do_calc_tree_size (data);
 
     data->size_label = label;
 
-    gcmd_tags_bulk_load (data->finfo);
+    gcmd_tags_bulk_load (data->f);
 
-    if (data->finfo->metadata)
+    if (data->f->metadata)
     {
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_FILE_DESCRIPTION);
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_FILE_PUBLISHER);
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_DOC_TITLE);
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_DOC_PAGECOUNT);
-        add_width_height_tag (dialog, table, y, *data->finfo->metadata);
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_AUDIO_ALBUMARTIST);
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_AUDIO_TITLE);
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_AUDIO_BITRATE, " kbps");
-        add_tag (dialog, table, y, *data->finfo->metadata, TAG_AUDIO_DURATIONMMSS);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_FILE_DESCRIPTION);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_FILE_PUBLISHER);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_DOC_TITLE);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_DOC_PAGECOUNT);
+        add_width_height_tag (dialog, table, y, *data->f->metadata);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_AUDIO_ALBUMARTIST);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_AUDIO_TITLE);
+        add_tag (dialog, table, y, *data->f->metadata, TAG_AUDIO_BITRATE, " kbps");
+        add_tag (dialog, table, y, *data->f->metadata, TAG_AUDIO_DURATIONMMSS);
     }
 
     return space_frame;
@@ -490,7 +490,7 @@ inline GtkWidget *create_permissions_tab (GnomeCmdFilePropsDialogPrivate *data)
                               (GtkDestroyNotify) gtk_widget_unref);
     gtk_widget_show (data->chown_component);
     gnome_cmd_chown_component_set (GNOME_CMD_CHOWN_COMPONENT (data->chown_component),
-        data->finfo->info->uid, data->finfo->info->gid);
+        data->f->info->uid, data->f->info->gid);
 
     GtkWidget *cat = create_category (data->dialog, data->chown_component, _("Owner and group"));
     gtk_box_pack_start (GTK_BOX (vbox), cat, TRUE, TRUE, 0);
@@ -500,7 +500,7 @@ inline GtkWidget *create_permissions_tab (GnomeCmdFilePropsDialogPrivate *data)
     gtk_widget_ref (data->chmod_component);
     gtk_object_set_data_full (GTK_OBJECT (data->dialog), "chmod_component", data->chmod_component, (GtkDestroyNotify) gtk_widget_unref);
     gtk_widget_show (data->chmod_component);
-    gnome_cmd_chmod_component_set_perms (GNOME_CMD_CHMOD_COMPONENT (data->chmod_component), data->finfo->info->permissions);
+    gnome_cmd_chmod_component_set_perms (GNOME_CMD_CHMOD_COMPONENT (data->chmod_component), data->f->info->permissions);
 
     cat = create_category (data->dialog, data->chmod_component, _("Access permissions"));
     gtk_box_pack_start (GTK_BOX (vbox), cat, TRUE, TRUE, 0);
@@ -520,7 +520,7 @@ enum
 } ;
 
 
-static GtkTreeModel *create_and_fill_model (GnomeCmdFile *finfo)
+static GtkTreeModel *create_and_fill_model (GnomeCmdFile *f)
 {
     GtkTreeStore *treestore = gtk_tree_store_new (NUM_COLS,
                                                   G_TYPE_UINT,
@@ -529,14 +529,14 @@ static GtkTreeModel *create_and_fill_model (GnomeCmdFile *finfo)
                                                   G_TYPE_STRING,
                                                   G_TYPE_STRING);
 
-    if (!gcmd_tags_bulk_load (finfo))
+    if (!gcmd_tags_bulk_load (f))
         return GTK_TREE_MODEL (treestore);
 
     GnomeCmdTagClass prev_tagclass = TAG_NONE_CLASS;
 
     GtkTreeIter toplevel;
 
-    for (GnomeCmdFileMetadata::METADATA_COLL::const_iterator i=finfo->metadata->begin(); i!=finfo->metadata->end(); ++i)
+    for (GnomeCmdFileMetadata::METADATA_COLL::const_iterator i=f->metadata->begin(); i!=f->metadata->end(); ++i)
     {
         const GnomeCmdTag t = i->first;
         GnomeCmdTagClass curr_tagclass = gcmd_tags_get_class(t);
@@ -573,7 +573,7 @@ static GtkTreeModel *create_and_fill_model (GnomeCmdFile *finfo)
 }
 
 
-static GtkWidget *create_view_and_model (GnomeCmdFile *finfo)
+static GtkWidget *create_view_and_model (GnomeCmdFile *f)
 {
     GtkWidget *view = gtk_tree_view_new ();
 
@@ -612,7 +612,7 @@ static GtkWidget *create_view_and_model (GnomeCmdFile *finfo)
                   "ellipsize", PANGO_ELLIPSIZE_END,
                   NULL);
 
-    GtkTreeModel *model = create_and_fill_model (finfo);
+    GtkTreeModel *model = create_and_fill_model (f);
 
     gtk_tree_view_set_model (GTK_TREE_VIEW (view), model);
 
@@ -637,7 +637,7 @@ inline GtkWidget *create_metadata_tab (GnomeCmdFilePropsDialogPrivate *data)
 
     gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (scrolledwindow), TRUE, TRUE, 0);
 
-    GtkWidget *view = create_view_and_model (data->finfo);
+    GtkWidget *view = create_view_and_model (data->f);
 
     gtk_container_add (GTK_CONTAINER (scrolledwindow), view);
 
@@ -647,12 +647,12 @@ inline GtkWidget *create_metadata_tab (GnomeCmdFilePropsDialogPrivate *data)
 }
 
 
-GtkWidget *gnome_cmd_file_props_dialog_create (GnomeCmdFile *finfo)
+GtkWidget *gnome_cmd_file_props_dialog_create (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (finfo != NULL, NULL);
-    g_return_val_if_fail (finfo->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
-    if (strcmp (finfo->info->name, "..") == 0)
+    if (strcmp (f->info->name, "..") == 0)
         return NULL;
 
     GnomeCmdFilePropsDialogPrivate *data = g_new0 (GnomeCmdFilePropsDialogPrivate, 1);
@@ -665,12 +665,12 @@ GtkWidget *gnome_cmd_file_props_dialog_create (GnomeCmdFile *finfo)
     GtkWidget *notebook = gtk_notebook_new ();
 
     data->dialog = GTK_WIDGET (dialog);
-    data->finfo = finfo;
-    data->uri = gnome_cmd_file_get_uri (finfo);
+    data->f = f;
+    data->uri = gnome_cmd_file_get_uri (f);
     data->mutex = g_mutex_new ();
     data->msg = NULL;
     data->notebook = notebook;
-    gnome_cmd_file_ref (finfo);
+    gnome_cmd_file_ref (f);
 
     gtk_widget_ref (notebook);
     gtk_object_set_data_full (GTK_OBJECT (dialog), "notebook", notebook, (GtkDestroyNotify) gtk_widget_unref);
diff --git a/src/gnome-cmd-make-copy-dialog.cc b/src/gnome-cmd-make-copy-dialog.cc
index 232945b..dee29cb 100644
--- a/src/gnome-cmd-make-copy-dialog.cc
+++ b/src/gnome-cmd-make-copy-dialog.cc
@@ -30,7 +30,7 @@ using namespace std;
 
 struct GnomeCmdMakeCopyDialogPrivate
 {
-    GnomeCmdFile *finfo;
+    GnomeCmdFile *f;
     GnomeCmdDir *dir;
     GnomeCmdMainWin *mw;
 };
@@ -39,9 +39,9 @@ struct GnomeCmdMakeCopyDialogPrivate
 static GnomeCmdStringDialogClass *parent_class = NULL;
 
 
-inline void copy_file (GnomeCmdFile *finfo, GnomeCmdDir *dir, const gchar *filename)
+inline void copy_file (GnomeCmdFile *f, GnomeCmdDir *dir, const gchar *filename)
 {
-    GList *src_files = g_list_append (NULL, finfo);
+    GList *src_files = g_list_append (NULL, f);
 
     gnome_cmd_xfer_start (src_files,
                           dir,
@@ -58,7 +58,7 @@ static gboolean on_ok (GnomeCmdStringDialog *string_dialog, const gchar **values
 {
     g_return_val_if_fail (dialog, TRUE);
     g_return_val_if_fail (dialog->priv, TRUE);
-    g_return_val_if_fail (dialog->priv->finfo, TRUE);
+    g_return_val_if_fail (dialog->priv->f, TRUE);
 
     const gchar *filename = values[0];
 
@@ -68,7 +68,7 @@ static gboolean on_ok (GnomeCmdStringDialog *string_dialog, const gchar **values
         return FALSE;
     }
 
-    copy_file (dialog->priv->finfo, dialog->priv->dir, filename);
+    copy_file (dialog->priv->f, dialog->priv->dir, filename);
 
     return TRUE;
 }
@@ -76,7 +76,7 @@ static gboolean on_ok (GnomeCmdStringDialog *string_dialog, const gchar **values
 
 static void on_cancel (GtkWidget *widget, GnomeCmdMakeCopyDialog *dialog)
 {
-    gnome_cmd_file_unref (dialog->priv->finfo);
+    gnome_cmd_file_unref (dialog->priv->f);
 }
 
 
@@ -123,20 +123,20 @@ static void init (GnomeCmdMakeCopyDialog *dialog)
  * Public functions
  ***********************************/
 
-GtkWidget *gnome_cmd_make_copy_dialog_new (GnomeCmdFile *finfo, GnomeCmdDir *dir)
+GtkWidget *gnome_cmd_make_copy_dialog_new (GnomeCmdFile *f, GnomeCmdDir *dir)
 {
-    g_return_val_if_fail (finfo != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
 
     const gchar *labels[] = {""};
 
     GnomeCmdMakeCopyDialog *dialog = (GnomeCmdMakeCopyDialog *) gtk_type_new (gnome_cmd_make_copy_dialog_get_type ());
 
-    dialog->priv->finfo = finfo;
+    dialog->priv->f = f;
     dialog->priv->dir = dir;
-    gnome_cmd_file_ref (finfo);
+    gnome_cmd_file_ref (f);
     gnome_cmd_file_ref (GNOME_CMD_FILE (dir));
 
-    gchar *msg = g_strdup_printf (_("Copy \"%s\" to"), gnome_cmd_file_get_name (finfo));
+    gchar *msg = g_strdup_printf (_("Copy \"%s\" to"), gnome_cmd_file_get_name (f));
     GtkWidget *msg_label = create_label (GTK_WIDGET (dialog), msg);
     g_free (msg);
 
@@ -150,7 +150,7 @@ GtkWidget *gnome_cmd_make_copy_dialog_new (GnomeCmdFile *finfo, GnomeCmdDir *dir
                                                GTK_SIGNAL_FUNC (on_cancel),
                                                dialog);
 
-    gnome_cmd_string_dialog_set_value (GNOME_CMD_STRING_DIALOG (dialog), 0, finfo->info->name);
+    gnome_cmd_string_dialog_set_value (GNOME_CMD_STRING_DIALOG (dialog), 0, f->info->name);
 
     return GTK_WIDGET (dialog);
 }
diff --git a/src/gnome-cmd-prepare-xfer-dialog.cc b/src/gnome-cmd-prepare-xfer-dialog.cc
index 32b9500..7acbd64 100644
--- a/src/gnome-cmd-prepare-xfer-dialog.cc
+++ b/src/gnome-cmd-prepare-xfer-dialog.cc
@@ -107,13 +107,13 @@ static void on_ok (GtkButton *button, GnomeCmdPrepareXferDialog *dialog)
 
     if (g_list_length (dialog->src_files) == 1)
     {
-        GnomeCmdFile *finfo = GNOME_CMD_FILE (dialog->src_files->data);
+        GnomeCmdFile *f = GNOME_CMD_FILE (dialog->src_files->data);
 
         if (res == GNOME_VFS_OK && type == GNOME_VFS_FILE_TYPE_DIRECTORY)
         {
             // There exists a directory, copy into it using the original filename
             dest_dir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, dest_path));
-            dest_fn = g_strdup (gnome_cmd_file_get_name (finfo));
+            dest_fn = g_strdup (gnome_cmd_file_get_name (f));
         }
         else
             if (res == GNOME_VFS_OK)
@@ -396,18 +396,18 @@ GtkWidget *gnome_cmd_prepare_xfer_dialog_new (GnomeCmdFileSelector *from, GnomeC
     {
         if (num_files == 1)
         {
-            GnomeCmdFile *finfo = (GnomeCmdFile *) dialog->src_files->data;
-            dest_str = get_utf8 (finfo->info->name);
+            GnomeCmdFile *f = (GnomeCmdFile *) dialog->src_files->data;
+            dest_str = get_utf8 (f->info->name);
         }
     }
     else
         if (num_files == 1)
         {
-            GnomeCmdFile *finfo = (GnomeCmdFile *) dialog->src_files->data;
+            GnomeCmdFile *f = (GnomeCmdFile *) dialog->src_files->data;
 
             gchar *t = gnome_cmd_file_get_real_path (GNOME_CMD_FILE (dialog->default_dest_dir));
             gchar *path = get_utf8 (t);
-            gchar *fname = get_utf8 (finfo->info->name);
+            gchar *fname = get_utf8 (f->info->name);
             g_free (t);
 
             dest_str = g_build_path (G_DIR_SEPARATOR_S, path, fname, NULL);
diff --git a/src/gnome-cmd-quicksearch-popup.cc b/src/gnome-cmd-quicksearch-popup.cc
index eef3e4c..bedf7c0 100644
--- a/src/gnome-cmd-quicksearch-popup.cc
+++ b/src/gnome-cmd-quicksearch-popup.cc
@@ -42,13 +42,13 @@ struct GnomeCmdQuicksearchPopupPrivate
 };
 
 
-inline void focus_file (GnomeCmdQuicksearchPopup *popup, GnomeCmdFile *finfo)
+inline void focus_file (GnomeCmdQuicksearchPopup *popup, GnomeCmdFile *f)
 {
-    if (strcmp (finfo->info->name, "..") == 0)
+    if (strcmp (f->info->name, "..") == 0)
         return;
 
-    popup->priv->last_focused_file = finfo;
-    gint row = popup->priv->fl->get_row_from_file(finfo);
+    popup->priv->last_focused_file = f;
+    gint row = popup->priv->fl->get_row_from_file(f);
     gtk_clist_moveto (GTK_CLIST (popup->priv->fl), row, 0, 1, 0);
     gtk_clist_freeze (GTK_CLIST (popup->priv->fl));
     GNOME_CMD_CLIST (popup->priv->fl)->drag_motion_row = row;
@@ -75,23 +75,23 @@ static void set_filter (GnomeCmdQuicksearchPopup *popup, const gchar *text)
 
     for (GList *files = popup->priv->fl->get_visible_files(); files; files = files->next)
     {
-        GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
+        GnomeCmdFile *f = (GnomeCmdFile *) files->data;
         gint res;
 
         if (gnome_cmd_data.case_sens_sort)
-            res = strncmp (finfo->info->name, text, strlen(text));
+            res = strncmp (f->info->name, text, strlen(text));
         else
-            res = strncasecmp (finfo->info->name, text, strlen(text));
+            res = strncasecmp (f->info->name, text, strlen(text));
 
         if (res == 0)
         {
             if (first)
             {
-                focus_file (popup, finfo);
+                focus_file (popup, f);
                 first = FALSE;
             }
 
-            popup->priv->matches = g_list_append (popup->priv->matches, finfo);
+            popup->priv->matches = g_list_append (popup->priv->matches, f);
         }
     }
 
diff --git a/src/gnome-cmd-search-dialog.cc b/src/gnome-cmd-search-dialog.cc
index 315f6ba..f56c6ac 100644
--- a/src/gnome-cmd-search-dialog.cc
+++ b/src/gnome-cmd-search-dialog.cc
@@ -120,7 +120,7 @@ struct GnomeCmdSearchDialogPrivate
 };
 
 
-static void on_list_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *finfo, GdkEventButton *button, GnomeCmdSearchDialog *dialog)
+static void on_list_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *button, GnomeCmdSearchDialog *dialog)
 {
     if (dialog->priv->data->search_done)
         gtk_widget_set_sensitive (dialog->priv->goto_button, TRUE);
@@ -154,17 +154,17 @@ inline void search_file_data_free (SearchFileData  *searchfile_data)
  */
 static SearchFileData *read_search_file (SearchData      *data,
                                          SearchFileData  *searchfile_data,
-                                         GnomeCmdFile    *finfo)
+                                         GnomeCmdFile    *f)
 {
-    g_return_val_if_fail (finfo != NULL, NULL);
-    g_return_val_if_fail (finfo->info != NULL, NULL);
+    g_return_val_if_fail (f != NULL, NULL);
+    g_return_val_if_fail (f->info != NULL, NULL);
 
     GnomeVFSResult  result;
 
     if (searchfile_data == NULL)
     {
         searchfile_data          = g_new0 (SearchFileData, 1);
-        searchfile_data->uri_str = gnome_cmd_file_get_uri_str (finfo);
+        searchfile_data->uri_str = gnome_cmd_file_get_uri_str (f);
         result                   = gnome_vfs_open (&searchfile_data->handle, searchfile_data->uri_str, GNOME_VFS_OPEN_READ);
 
         if (result != GNOME_VFS_OK)
@@ -184,7 +184,7 @@ static SearchFileData *read_search_file (SearchData      *data,
 
     if (searchfile_data->len)
     {
-      if ((searchfile_data->offset + searchfile_data->len) >= finfo->info->size)
+      if ((searchfile_data->offset + searchfile_data->len) >= f->info->size)
       {   // end, all has been read
           search_file_data_free (searchfile_data);
           return NULL;
@@ -192,16 +192,16 @@ static SearchFileData *read_search_file (SearchData      *data,
       else
       {   // jump a big step backward to give the regex a chance
           searchfile_data->offset += searchfile_data->len - SEARCH_JUMP_SIZE;
-          if (finfo->info->size < (searchfile_data->offset + (SEARCH_BUFFER_SIZE - 1)))
-              searchfile_data->len = finfo->info->size - searchfile_data->offset;
+          if (f->info->size < (searchfile_data->offset + (SEARCH_BUFFER_SIZE - 1)))
+              searchfile_data->len = f->info->size - searchfile_data->offset;
           else
               searchfile_data->len = SEARCH_BUFFER_SIZE - 1;
       }
     }
     else
     {   // first time call of this function
-        if (finfo->info->size < (SEARCH_BUFFER_SIZE - 1))
-            searchfile_data->len = finfo->info->size;
+        if (f->info->size < (SEARCH_BUFFER_SIZE - 1))
+            searchfile_data->len = f->info->size;
         else
             searchfile_data->len = SEARCH_BUFFER_SIZE - 1;
     }
@@ -231,16 +231,16 @@ static SearchFileData *read_search_file (SearchData      *data,
  * Determines if the content of a file matches an regexp
  *
  */
-inline gboolean content_matches (GnomeCmdFile *finfo, SearchData *data)
+inline gboolean content_matches (GnomeCmdFile *f, SearchData *data)
 {
     gint   ret = REG_NOMATCH;
 
-    if (finfo->info->size > 0)
+    if (f->info->size > 0)
     {
         regmatch_t       match;
         SearchFileData  *search_file = NULL;
 
-        while ((search_file = read_search_file (data, search_file, finfo)) != NULL)
+        while ((search_file = read_search_file (data, search_file, f)) != NULL)
             ret = regexec (data->content_regex, data->search_mem, 1, &match, 0);
     }
 
@@ -297,17 +297,17 @@ static void search_dir_r (GnomeCmdDir *dir, SearchData *data)
         if (data->stopped)
             return;
 
-        GnomeCmdFile *finfo = (GnomeCmdFile *) tmp->data;
+        GnomeCmdFile *f = (GnomeCmdFile *) tmp->data;
 
         // If the current file is a directory lets continue our recursion
-        if (GNOME_CMD_IS_DIR (finfo) && data->recurse)
+        if (GNOME_CMD_IS_DIR (f) && data->recurse)
         {
             // we don't want to go backwards or follow symlinks
-            if (strcmp (finfo->info->name, ".") != 0 &&
-                strcmp (finfo->info->name, "..") != 0 &&
-                !GNOME_VFS_FILE_INFO_SYMLINK (finfo->info))
+            if (strcmp (f->info->name, ".") != 0 &&
+                strcmp (f->info->name, "..") != 0 &&
+                !GNOME_VFS_FILE_INFO_SYMLINK (f->info))
             {
-                GnomeCmdDir *new_dir = GNOME_CMD_DIR (finfo);
+                GnomeCmdDir *new_dir = GNOME_CMD_DIR (f);
 
                 if (new_dir)
                 {
@@ -319,19 +319,19 @@ static void search_dir_r (GnomeCmdDir *dir, SearchData *data)
         }
         // if the file is a regular one it might match the search criteria
         else
-            if (finfo->info->type == GNOME_VFS_FILE_TYPE_REGULAR)
+            if (f->info->type == GNOME_VFS_FILE_TYPE_REGULAR)
             {
                 // if the name doesn't match lets go to the next file
-                if (!name_matches (finfo->info->name, data))
+                if (!name_matches (f->info->name, data))
                     continue;
 
                 // if the user wants to we should do some content matching here
-                if (data->content_search && !content_matches (finfo, data))
+                if (data->content_search && !content_matches (f, data))
                     continue;
 
                 // the file matched the search criteria, lets add it to the list
                 g_mutex_lock (data->pdata.mutex);
-                data->pdata.files = g_list_append (data->pdata.files, finfo);
+                data->pdata.files = g_list_append (data->pdata.files, f);
                 g_mutex_unlock (data->pdata.mutex);
 
                 // also ref each directory that has a matching file
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 54b408e..eccb34f 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -67,12 +67,12 @@ inline GnomeCmdFileList *get_fl (const FileSelectorID fsID)
 // The file returned from this function is not to be unrefed
 inline GnomeCmdFile *get_selected_file (const FileSelectorID fsID)
 {
-    GnomeCmdFile *finfo = get_fl (fsID)->get_first_selected_file();
+    GnomeCmdFile *f = get_fl (fsID)->get_first_selected_file();
 
-    if (!finfo)
+    if (!f)
         create_error_dialog (_("No file selected"));
 
-    return finfo;
+    return f;
 }
 
 
@@ -85,12 +85,12 @@ inline gboolean append_real_path (string &s, const gchar *name)
 }
 
 
-inline gboolean append_real_path (string &s, GnomeCmdFile *finfo)
+inline gboolean append_real_path (string &s, GnomeCmdFile *f)
 {
-    if (!finfo)
+    if (!f)
         return FALSE;
 
-    gchar *name = g_shell_quote (gnome_cmd_file_get_real_path (finfo));
+    gchar *name = g_shell_quote (gnome_cmd_file_get_real_path (f));
 
     append_real_path (s, name);
 
@@ -739,8 +739,8 @@ void file_create_symlink (GtkMenuItem *menuitem, gpointer not_used)
     }
    else
    {
-        GnomeCmdFile *finfo = get_fl (ACTIVE)->get_focused_file();
-        gnome_cmd_file_selector_create_symlink (inactive_fs, finfo);
+        GnomeCmdFile *f = get_fl (ACTIVE)->get_focused_file();
+        gnome_cmd_file_selector_create_symlink (inactive_fs, f);
    }
 }
 
diff --git a/src/utils.cc b/src/utils.cc
index da2acb0..a19615e 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -40,7 +40,7 @@ using namespace std;
 
 typedef struct
 {
-    GnomeCmdFile *finfo;
+    GnomeCmdFile *f;
     GtkWidget *dialog;
     gpointer *args;
 } TmpDlData;
@@ -474,13 +474,13 @@ static void on_tmp_download_response (GtkWidget *w, gint id, TmpDlData *dldata)
 {
     if (id == GTK_RESPONSE_YES)
     {
-        gchar *path_str = get_temp_download_filepath (gnome_cmd_file_get_name (dldata->finfo));
+        gchar *path_str = get_temp_download_filepath (gnome_cmd_file_get_name (dldata->f));
 
         if (!path_str) return;
 
         dldata->args[1] = (gpointer) path_str;
 
-        GnomeVFSURI *src_uri = gnome_vfs_uri_dup (gnome_cmd_file_get_uri (dldata->finfo));
+        GnomeVFSURI *src_uri = gnome_vfs_uri_dup (gnome_cmd_file_get_uri (dldata->f));
         GnomeCmdPath *path = gnome_cmd_plain_path_new (path_str);
         GnomeCmdCon *con = get_home_con ();
         GnomeVFSURI *dest_uri = gnome_cmd_con_create_uri (con, path);
@@ -504,25 +504,25 @@ static void on_tmp_download_response (GtkWidget *w, gint id, TmpDlData *dldata)
 }
 
 
-void mime_exec_single (GnomeCmdFile *finfo)
+void mime_exec_single (GnomeCmdFile *f)
 {
-    g_return_if_fail (finfo != NULL);
-    g_return_if_fail (finfo->info != NULL);
+    g_return_if_fail (f != NULL);
+    g_return_if_fail (f->info != NULL);
 
     gpointer *args;
     GnomeVFSMimeApplication *vfs_app;
     GnomeCmdApp *app;
 
-    if (!finfo->info->mime_type)
+    if (!f->info->mime_type)
         return;
 
     // Check if the file is a binary executable that lacks the executable bit
 
-    if (!gnome_cmd_file_is_executable (finfo))
+    if (!gnome_cmd_file_is_executable (f))
     {
-        if (gnome_cmd_file_has_mime_type (finfo, "application/x-executable") || gnome_cmd_file_has_mime_type (finfo, "application/x-executable-binary"))
+        if (gnome_cmd_file_has_mime_type (f, "application/x-executable") || gnome_cmd_file_has_mime_type (f, "application/x-executable-binary"))
         {
-            gchar *fname = get_utf8 (finfo->info->name);
+            gchar *fname = get_utf8 (f->info->name);
             gchar *msg = g_strdup_printf (_("\"%s\" seems to be a binary executable file but it lacks the executable bit. Do you want to set it and then run the file?"), fname);
             gint ret = run_simple_dialog (GTK_WIDGET (main_win), FALSE, GTK_MESSAGE_QUESTION, msg,
                                           _("Make Executable?"),
@@ -532,7 +532,7 @@ void mime_exec_single (GnomeCmdFile *finfo)
 
             if (ret != 1)  return;  else
             {
-                GnomeVFSResult result = gnome_cmd_file_chmod (finfo, (GnomeVFSFilePermissions) (finfo->info->permissions|GNOME_VFS_PERM_USER_EXEC));
+                GnomeVFSResult result = gnome_cmd_file_chmod (f, (GnomeVFSFilePermissions) (f->info->permissions|GNOME_VFS_PERM_USER_EXEC));
                 if (result != GNOME_VFS_OK)
                     return;
             }
@@ -541,17 +541,17 @@ void mime_exec_single (GnomeCmdFile *finfo)
 
     // If the file is executable but not a binary file, check if the user wants to exec it or open it
 
-    if (gnome_cmd_file_is_executable (finfo))
+    if (gnome_cmd_file_is_executable (f))
     {
-        if (gnome_cmd_file_has_mime_type (finfo, "application/x-executable") || gnome_cmd_file_has_mime_type (finfo, "application/x-executable-binary") )
+        if (gnome_cmd_file_has_mime_type (f, "application/x-executable") || gnome_cmd_file_has_mime_type (f, "application/x-executable-binary") )
         {
-            gnome_cmd_file_execute (finfo);
+            gnome_cmd_file_execute (f);
             return;
         }
         else
-            if (gnome_cmd_file_mime_begins_with (finfo, "text/"))
+            if (gnome_cmd_file_mime_begins_with (f, "text/"))
             {
-                gchar *fname = get_utf8 (finfo->info->name);
+                gchar *fname = get_utf8 (f->info->name);
                 gchar *msg = g_strdup_printf (_("\"%s\" is an executable text file. Do you want to run it, or display its contents?"), fname);
                 gint ret = run_simple_dialog (GTK_WIDGET (main_win), FALSE, GTK_MESSAGE_QUESTION, msg, _("Run or Display"),
                                               -1, _("Cancel"), _("Display"), _("Run"), NULL);
@@ -561,16 +561,16 @@ void mime_exec_single (GnomeCmdFile *finfo)
                 if (ret != 1)
                 {
                     if (ret == 2)
-                        gnome_cmd_file_execute (finfo);
+                        gnome_cmd_file_execute (f);
                     return;
                 }
             }
     }
 
-    vfs_app = gnome_vfs_mime_get_default_application (finfo->info->mime_type);
+    vfs_app = gnome_vfs_mime_get_default_application (f->info->mime_type);
     if (!vfs_app)
     {
-        no_mime_app_found_error (finfo->info->mime_type);
+        no_mime_app_found_error (f->info->mime_type);
         return;
     }
 
@@ -579,10 +579,10 @@ void mime_exec_single (GnomeCmdFile *finfo)
 
     args = g_new0 (gpointer, 3);
 
-    if (gnome_cmd_file_is_local (finfo))
+    if (gnome_cmd_file_is_local (f))
     {
         args[0] = (gpointer) app;
-        args[1] = (gpointer) g_strdup (gnome_cmd_file_get_real_path (finfo));
+        args[1] = (gpointer) g_strdup (gnome_cmd_file_get_real_path (f));
         args[2] = (gpointer) g_path_get_dirname ((gchar *) args[1]);            // set exec dir for local files
         do_mime_exec_single (args);
     }
@@ -591,7 +591,7 @@ void mime_exec_single (GnomeCmdFile *finfo)
         if (gnome_cmd_app_get_handles_uris (app) && gnome_cmd_data.honor_expect_uris)
         {
             args[0] = (gpointer) app;
-            args[1] = (gpointer) g_strdup (gnome_cmd_file_get_uri_str (finfo));
+            args[1] = (gpointer) g_strdup (gnome_cmd_file_get_uri_str (f));
             // args[2] is NULL here (don't set exec dir for remote files)
             do_mime_exec_single (args);
         }
@@ -603,7 +603,7 @@ void mime_exec_single (GnomeCmdFile *finfo)
             TmpDlData *dldata = g_new0 (TmpDlData, 1);
             args[0] = (gpointer) app;
             // args[2] is NULL here (don't set exec dir for temporarily downloaded files)
-            dldata->finfo = finfo;
+            dldata->f = f;
             dldata->dialog = dialog;
             dldata->args = args;
 
@@ -664,16 +664,16 @@ void mime_exec_multiple (GList *files, GnomeCmdApp *app)
 
     for (; files; files = files->next)
     {
-        GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
+        GnomeCmdFile *f = (GnomeCmdFile *) files->data;
 
-        if (gnome_vfs_uri_is_local (gnome_cmd_file_get_uri (finfo)))
-            local_files = g_list_append (local_files, g_strdup (gnome_cmd_file_get_real_path (finfo)));
+        if (gnome_vfs_uri_is_local (gnome_cmd_file_get_uri (f)))
+            local_files = g_list_append (local_files, g_strdup (gnome_cmd_file_get_real_path (f)));
         else
         {
             ++no_of_remote_files;
             if (gnome_cmd_app_get_handles_uris (app) && gnome_cmd_data.honor_expect_uris)
             {
-                local_files = g_list_append (local_files,  g_strdup (gnome_cmd_file_get_uri_str (finfo)));
+                local_files = g_list_append (local_files,  g_strdup (gnome_cmd_file_get_uri_str (f)));
             }
             else
             {
@@ -688,11 +688,11 @@ void mime_exec_multiple (GList *files, GnomeCmdApp *app)
 
                 if (retid==1)
                 {
-                    gchar *path_str = get_temp_download_filepath (gnome_cmd_file_get_name (finfo));
+                    gchar *path_str = get_temp_download_filepath (gnome_cmd_file_get_name (f));
 
                     if (!path_str) return;
 
-                    GnomeVFSURI *src_uri = gnome_vfs_uri_dup (gnome_cmd_file_get_uri (finfo));
+                    GnomeVFSURI *src_uri = gnome_vfs_uri_dup (gnome_cmd_file_get_uri (f));
                     GnomeCmdPath *path = gnome_cmd_plain_path_new (path_str);
                     GnomeVFSURI *dest_uri = gnome_cmd_con_create_uri (get_home_con (), path);
                     gtk_object_destroy (GTK_OBJECT (path));
@@ -969,14 +969,14 @@ void set_cursor_default ()
 }
 
 
-GList *app_get_linked_libs (GnomeCmdFile *finfo)
+GList *app_get_linked_libs (GnomeCmdFile *f)
 {
-    g_return_val_if_fail (GNOME_CMD_IS_FILE (finfo), NULL);
+    g_return_val_if_fail (GNOME_CMD_IS_FILE (f), NULL);
 
     gchar *s;
     gchar tmp[256];
 
-    gchar *arg = g_shell_quote (gnome_cmd_file_get_real_path (finfo));
+    gchar *arg = g_shell_quote (gnome_cmd_file_get_real_path (f));
     gchar *cmd = g_strdup_printf ("ldd %s", arg);
     g_free (arg);
     FILE *fd = popen (cmd, "r");
@@ -1000,14 +1000,14 @@ GList *app_get_linked_libs (GnomeCmdFile *finfo)
 }
 
 
-gboolean app_needs_terminal (GnomeCmdFile *finfo)
+gboolean app_needs_terminal (GnomeCmdFile *f)
 {
     gboolean need_term = TRUE;
 
-    if (strcmp (finfo->info->mime_type, "application/x-executable") && strcmp (finfo->info->mime_type, "application/x-executable-binary"))
+    if (strcmp (f->info->mime_type, "application/x-executable") && strcmp (f->info->mime_type, "application/x-executable-binary"))
         return need_term;
 
-    GList *libs = app_get_linked_libs (finfo);
+    GList *libs = app_get_linked_libs (f);
     if  (!libs) return FALSE;
 
     for (GList *tmp = libs; tmp; tmp = tmp->next)
@@ -1201,8 +1201,8 @@ GList *file_list_to_uri_list (GList *files)
 
     for (; files; files = files->next)
     {
-        GnomeCmdFile *finfo = GNOME_CMD_FILE (files->data);
-        GnomeVFSURI *uri = gnome_cmd_file_get_uri (finfo);
+        GnomeCmdFile *f = GNOME_CMD_FILE (files->data);
+        GnomeVFSURI *uri = gnome_cmd_file_get_uri (f);
 
         if (!uri)
             g_warning ("NULL uri!!!");
@@ -1220,8 +1220,8 @@ GList *file_list_to_info_list (GList *files)
 
     for (; files; files = files->next)
     {
-        GnomeCmdFile *finfo = GNOME_CMD_FILE (files->data);
-        infos = g_list_append (infos, finfo->info);
+        GnomeCmdFile *f = GNOME_CMD_FILE (files->data);
+        infos = g_list_append (infos, f->info);
     }
 
     return infos;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]