GNOME.org
 

[gnome-commander] GnomeCmdFile: more C++ rework

commit 5a6f1723afa1d4e2c02da6b0486ea750e0074189
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Wed Nov 17 19:33:27 2010 +0100

    GnomeCmdFile: more C++ rework

 src/dialogs/gnome-cmd-advrename-dialog.cc |    8 +-
 src/gnome-cmd-file-list.cc                |   25 +++---
 src/gnome-cmd-file-props-dialog.cc        |    8 +-
 src/gnome-cmd-file-selector.cc            |    4 +-
 src/gnome-cmd-file.cc                     |  141 +++++++++++------------------
 src/gnome-cmd-file.h                      |   42 ++++++---
 src/ls_colors.cc                          |    2 +-
 src/utils.cc                              |    6 +-
 8 files changed, 108 insertions(+), 128 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-advrename-dialog.cc b/src/dialogs/gnome-cmd-advrename-dialog.cc
index a3955b5..e2c0243 100644
--- a/src/dialogs/gnome-cmd-advrename-dialog.cc
+++ b/src/dialogs/gnome-cmd-advrename-dialog.cc
@@ -312,8 +312,8 @@ void GnomeCmdAdvrenameDialog::Private::on_files_view_popup_menu__update_files (G
 
         gtk_list_store_set (GTK_LIST_STORE (dialog->files), &i,
                             COL_NAME, gnome_cmd_file_get_name (f),
-                            COL_SIZE, gnome_cmd_file_get_size (f),
-                            COL_DATE, gnome_cmd_file_get_mdate (f, FALSE),
+                            COL_SIZE, f->get_size(),
+                            COL_DATE, f->get_mdate(FALSE),
                             COL_RENAME_FAILED, FALSE,
                             -1);
     }
@@ -720,8 +720,8 @@ void GnomeCmdAdvrenameDialog::set(GList *file_list)
         gtk_list_store_set (GTK_LIST_STORE (files), &iter,
                             COL_FILE, gnome_cmd_file_ref (f),
                             COL_NAME, gnome_cmd_file_get_name (f),
-                            COL_SIZE, gnome_cmd_file_get_size (f),
-                            COL_DATE, gnome_cmd_file_get_mdate (f, FALSE),
+                            COL_SIZE, f->get_size(),
+                            COL_DATE, f->get_mdate(FALSE),
                             -1);
     }
 
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index d966d13..42072e8 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -287,7 +287,7 @@ inline FileFormatData::FileFormatData(GnomeCmdFile *f, gboolean tree_size)
         fname = get_utf8 (gnome_cmd_file_get_name (f));
 
     if (gnome_cmd_data.ext_disp_mode != GNOME_CMD_EXT_DISP_WITH_FNAME)
-        fext = get_utf8 (gnome_cmd_file_get_extension (f));
+        fext = get_utf8 (f->get_extension());
     else
         fext = NULL;
 
@@ -295,15 +295,14 @@ inline FileFormatData::FileFormatData(GnomeCmdFile *f, gboolean tree_size)
     text[GnomeCmdFileList::COLUMN_NAME]  = fname;
     text[GnomeCmdFileList::COLUMN_EXT]   = fext;
     text[GnomeCmdFileList::COLUMN_DIR]   = dpath;
-    text[GnomeCmdFileList::COLUMN_SIZE]  = tree_size ? (gchar *) gnome_cmd_file_get_tree_size_as_str (f) :
-                                                       (gchar *) gnome_cmd_file_get_size (f);
+    text[GnomeCmdFileList::COLUMN_SIZE]  = tree_size ? (gchar *) f->get_tree_size_as_str() : (gchar *) f->get_size();
 
     if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY || !f->is_dotdot)
     {
-        text[GnomeCmdFileList::COLUMN_DATE]  = (gchar *) gnome_cmd_file_get_mdate (f, FALSE);
-        text[GnomeCmdFileList::COLUMN_PERM]  = (gchar *) gnome_cmd_file_get_perm (f);
-        text[GnomeCmdFileList::COLUMN_OWNER] = (gchar *) gnome_cmd_file_get_owner (f);
-        text[GnomeCmdFileList::COLUMN_GROUP] = (gchar *) gnome_cmd_file_get_group (f);
+        text[GnomeCmdFileList::COLUMN_DATE]  = (gchar *) f->get_mdate(FALSE);
+        text[GnomeCmdFileList::COLUMN_PERM]  = (gchar *) f->get_perm();
+        text[GnomeCmdFileList::COLUMN_OWNER] = (gchar *) f->get_owner();
+        text[GnomeCmdFileList::COLUMN_GROUP] = (gchar *) f->get_group();
     }
     else
     {
@@ -562,7 +561,7 @@ static void toggle_files_with_same_extension (GnomeCmdFileList *fl, gboolean sel
     GnomeCmdFile *f = fl->get_selected_file();
     if (!f) return;
 
-    const gchar *ext1 = gnome_cmd_file_get_extension (f);
+    const gchar *ext1 = f->get_extension();
     if (!ext1) return;
 
     for (GList *tmp=fl->get_visible_files(); tmp; tmp=tmp->next)
@@ -571,7 +570,7 @@ static void toggle_files_with_same_extension (GnomeCmdFileList *fl, gboolean sel
 
         if (f && f->info)
         {
-            const gchar *ext2 = gnome_cmd_file_get_extension (f);
+            const gchar *ext2 = f->get_extension();
 
             if (ext2 && strcmp (ext1, ext2) == 0)
             {
@@ -876,15 +875,15 @@ static gint sort_by_ext (GnomeCmdFile *f1, GnomeCmdFile *f2, GnomeCmdFileList *f
 
     gboolean raising = fl->priv->sort_raising[fl->priv->current_col];
 
-    if (!gnome_cmd_file_get_extension (f1) && !gnome_cmd_file_get_extension (f2))
+    if (!f1->get_extension() && !f2->get_extension())
         return my_strcmp (f1->get_collation_fname(), f2->get_collation_fname(), fl->priv->sort_raising[1]);
 
-    if (!gnome_cmd_file_get_extension (f1))
+    if (!f1->get_extension())
         return raising?1:-1;
-    if (!gnome_cmd_file_get_extension (f2))
+    if (!f2->get_extension())
         return raising?-1:1;
 
-    gint ret = my_strcmp (gnome_cmd_file_get_extension (f1), gnome_cmd_file_get_extension (f2), raising);
+    gint ret = my_strcmp (f1->get_extension(), f2->get_extension(), raising);
 
     return ret ? ret : my_strcmp (f1->get_collation_fname(), f2->get_collation_fname(), fl->priv->sort_raising[1]);
 }
diff --git a/src/gnome-cmd-file-props-dialog.cc b/src/gnome-cmd-file-props-dialog.cc
index d1f60f4..ff35291 100644
--- a/src/gnome-cmd-file-props-dialog.cc
+++ b/src/gnome-cmd-file-props-dialog.cc
@@ -453,14 +453,14 @@ 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->f));
+    label = create_label (dialog, data->f->get_mime_type_desc());
     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->f));
+    label = create_label (dialog, data->f->get_mime_type());
     table_add (table, label, 1, y++, GTK_FILL);
 
 
@@ -493,13 +493,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->f, TRUE));
+    label = create_label (dialog, data->f->get_mdate(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->f, TRUE));
+    label = create_label (dialog, data->f->get_adate(TRUE));
     table_add (table, label, 1, y++, GTK_FILL);
 
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 345c6f7..cf4345b 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -140,7 +140,7 @@ inline void GnomeCmdFileSelector::update_selected_files_label()
                 {
                     num_dirs++;
                     if (f->has_tree_size())
-                        total_bytes += gnome_cmd_file_get_tree_size (f);
+                        total_bytes += f->get_tree_size();
                 }
                 break;
 
@@ -163,7 +163,7 @@ inline void GnomeCmdFileSelector::update_selected_files_label()
             case GNOME_VFS_FILE_TYPE_DIRECTORY:
                 num_sel_dirs++;
                 if (f->has_tree_size())
-                    sel_bytes += gnome_cmd_file_get_tree_size (f);
+                    sel_bytes += f->get_tree_size();
                 break;
 
             case GNOME_VFS_FILE_TYPE_REGULAR:
diff --git a/src/gnome-cmd-file.cc b/src/gnome-cmd-file.cc
index 6db387f..99f3ff3 100644
--- a/src/gnome-cmd-file.cc
+++ b/src/gnome-cmd-file.cc
@@ -462,48 +462,45 @@ gchar *gnome_cmd_file_get_uri_str (GnomeCmdFile *f, GnomeVFSURIHideOptions hide_
 }
 
 
-const gchar *gnome_cmd_file_get_extension (GnomeCmdFile *f)
+const gchar *GnomeCmdFile::get_extension()
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    if (f->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
         return NULL;
 
-    const char *s = strrchr (f->info->name, '.');        // does NOT work on UTF-8 strings, should be (MUCH SLOWER):
-    // const char *s = g_utf8_strrchr (f->info->name, -1, '.');
+    const char *s = strrchr (info->name, '.');        // does NOT work on UTF-8 strings, should be (MUCH SLOWER):
+    // const char *s = g_utf8_strrchr (info->name, -1, '.');
 
     return s ? s+1 : NULL;
 }
 
 
-const gchar *gnome_cmd_file_get_owner (GnomeCmdFile *f)
+const gchar *GnomeCmdFile::get_owner()
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    if (GNOME_VFS_FILE_INFO_LOCAL (f->info))
-        return gcmd_owner.get_name_by_uid(f->info->uid);
+    if (GNOME_VFS_FILE_INFO_LOCAL (info))
+        return gcmd_owner.get_name_by_uid(info->uid);
     else
     {
         static gchar owner_str[MAX_OWNER_LENGTH];
-        g_snprintf (owner_str, MAX_OWNER_LENGTH, "%d", f->info->uid);
+        g_snprintf (owner_str, MAX_OWNER_LENGTH, "%d", info->uid);
         return owner_str;
     }
 }
 
 
-const gchar *gnome_cmd_file_get_group (GnomeCmdFile *f)
+const gchar *GnomeCmdFile::get_group()
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    if (GNOME_VFS_FILE_INFO_LOCAL (f->info))
-        return gcmd_owner.get_name_by_gid(f->info->gid);
+    if (GNOME_VFS_FILE_INFO_LOCAL (info))
+        return gcmd_owner.get_name_by_gid(info->gid);
     else
     {
         static gchar group_str[MAX_GROUP_LENGTH];
-        g_snprintf (group_str, MAX_GROUP_LENGTH, "%d", f->info->gid);
+        g_snprintf (group_str, MAX_GROUP_LENGTH, "%d", info->gid);
         return group_str;
     }
 }
@@ -515,91 +512,83 @@ inline const gchar *date2string (time_t date, gboolean overide_disp_setting)
 }
 
 
-const gchar *gnome_cmd_file_get_adate (GnomeCmdFile *f, gboolean overide_disp_setting)
+const gchar *GnomeCmdFile::get_adate(gboolean overide_disp_setting)
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    return date2string (f->info->atime, overide_disp_setting);
+    return date2string (info->atime, overide_disp_setting);
 }
 
 
-const gchar *gnome_cmd_file_get_mdate (GnomeCmdFile *f, gboolean overide_disp_setting)
+const gchar *GnomeCmdFile::get_mdate(gboolean overide_disp_setting)
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    return date2string (f->info->mtime, overide_disp_setting);
+    return date2string (info->mtime, overide_disp_setting);
 }
 
 
-const gchar *gnome_cmd_file_get_cdate (GnomeCmdFile *f, gboolean overide_disp_setting)
+const gchar *GnomeCmdFile::get_cdate(gboolean overide_disp_setting)
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    return date2string (f->info->ctime, overide_disp_setting);
+    return date2string (info->ctime, overide_disp_setting);
 }
 
 
-const gchar *gnome_cmd_file_get_size (GnomeCmdFile *f)
+const gchar *GnomeCmdFile::get_size()
 {
     static gchar dir_indicator[] = "<DIR> ";
 
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    if (f->info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+    if (info->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
         return dir_indicator;
 
-    return size2string (f->info->size, gnome_cmd_data.size_disp_mode);
+    return size2string (info->size, gnome_cmd_data.size_disp_mode);
 }
 
 
-GnomeVFSFileSize gnome_cmd_file_get_tree_size (GnomeCmdFile *f)
+GnomeVFSFileSize GnomeCmdFile::get_tree_size()
 {
-    g_return_val_if_fail (f != NULL, 0);
-
-    if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
-        return f->info->size;
+    if (info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+        return info->size;
 
-    if (f->is_dotdot)
+    if (is_dotdot)
         return 0;
 
-    if (f->priv->tree_size != -1)
-        return f->priv->tree_size;
+    if (priv->tree_size != -1)
+        return priv->tree_size;
 
-    GnomeVFSURI *uri = f->get_uri();
-    f->priv->tree_size = calc_tree_size (uri);
+    GnomeVFSURI *uri = get_uri();
+    priv->tree_size = calc_tree_size (uri);
     gnome_vfs_uri_unref (uri);
 
-    return f->priv->tree_size;
+    return priv->tree_size;
 }
 
 
-const gchar *gnome_cmd_file_get_tree_size_as_str (GnomeCmdFile *f)
+const gchar *GnomeCmdFile::get_tree_size_as_str()
 {
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
-        return gnome_cmd_file_get_size (f);
+    if (info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+        return get_size();
 
-    if (f->is_dotdot)
-        return gnome_cmd_file_get_size (f);
+    if (is_dotdot)
+        return get_size();
 
-    return size2string (gnome_cmd_file_get_tree_size (f), gnome_cmd_data.size_disp_mode);
+    return size2string (get_tree_size(), gnome_cmd_data.size_disp_mode);
 }
 
 
-const gchar *gnome_cmd_file_get_perm (GnomeCmdFile *f)
+const gchar *GnomeCmdFile::get_perm()
 {
     static gchar perm_str[MAX_PERM_LENGTH];
 
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
+    g_return_val_if_fail (info != NULL, NULL);
 
-    perm2string (f->info->permissions, perm_str, MAX_PERM_LENGTH);
+    perm2string (info->permissions, perm_str, MAX_PERM_LENGTH);
     return perm_str;
 }
 
@@ -645,43 +634,23 @@ gboolean GnomeCmdFile::get_type_pixmap_and_mask(GdkPixmap **pixmap, GdkBitmap **
 }
 
 
-const gchar *gnome_cmd_file_get_mime_type (GnomeCmdFile *f)
-{
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
-
-    return gnome_vfs_file_info_get_mime_type (f->info);
-}
-
-
-const gchar *gnome_cmd_file_get_mime_type_desc (GnomeCmdFile *f)
-{
-    g_return_val_if_fail (f != NULL, NULL);
-    g_return_val_if_fail (f->info != NULL, NULL);
-
-    return f->info->mime_type ? gnome_vfs_mime_get_description (f->info->mime_type) : NULL;
-}
-
-
-gboolean gnome_cmd_file_has_mime_type (GnomeCmdFile *f, const gchar *mime_type)
+gboolean GnomeCmdFile::has_mime_type(const gchar *mime_type)
 {
-    g_return_val_if_fail (f != NULL, FALSE);
-    g_return_val_if_fail (f->info != NULL, FALSE);
-    g_return_val_if_fail (f->info->mime_type != NULL, FALSE);
+    g_return_val_if_fail (info != NULL, FALSE);
+    g_return_val_if_fail (info->mime_type != NULL, FALSE);
     g_return_val_if_fail (mime_type != NULL, FALSE);
 
-    return strcmp (f->info->mime_type, mime_type) == 0;
+    return strcmp (info->mime_type, mime_type) == 0;
 }
 
 
-gboolean gnome_cmd_file_mime_begins_with (GnomeCmdFile *f, const gchar *mime_type_start)
+gboolean GnomeCmdFile::mime_begins_with(const gchar *mime_type_start)
 {
-    g_return_val_if_fail (f != NULL, FALSE);
-    g_return_val_if_fail (f->info != NULL, FALSE);
-    g_return_val_if_fail (f->info->mime_type != NULL, FALSE);
+    g_return_val_if_fail (info != NULL, FALSE);
+    g_return_val_if_fail (info->mime_type != NULL, FALSE);
     g_return_val_if_fail (mime_type_start != NULL, FALSE);
 
-    return strncmp (f->info->mime_type, mime_type_start, strlen(mime_type_start)) == 0;
+    return strncmp (info->mime_type, mime_type_start, strlen(mime_type_start)) == 0;
 }
 
 
diff --git a/src/gnome-cmd-file.h b/src/gnome-cmd-file.h
index 7d917ff..9e7ff64 100644
--- a/src/gnome-cmd-file.h
+++ b/src/gnome-cmd-file.h
@@ -67,6 +67,21 @@ struct GnomeCmdFile
     void is_deleted();
     void execute();
 
+    const gchar *get_extension();
+    const gchar *get_owner();
+    const gchar *get_group();
+    const gchar *get_adate(gboolean overide_disp_setting);
+    const gchar *get_mdate(gboolean overide_disp_setting);
+    const gchar *get_cdate(gboolean overide_disp_setting);
+    const gchar *get_size();
+    GnomeVFSFileSize get_tree_size();
+    const gchar *get_tree_size_as_str();
+    const gchar *get_perm();
+    const gchar *get_mime_type();
+    const gchar *get_mime_type_desc();
+    gboolean has_mime_type(const gchar *mime_type);
+    gboolean mime_begins_with(const gchar *mime_type_start);
+
     gboolean needs_update();
 
     void invalidate_tree_size();
@@ -106,21 +121,6 @@ gchar *gnome_cmd_file_get_real_path (GnomeCmdFile *f);
 gchar *gnome_cmd_file_get_quoted_real_path (GnomeCmdFile *f);
 gchar *gnome_cmd_file_get_uri_str (GnomeCmdFile *f, GnomeVFSURIHideOptions hide_options=GNOME_VFS_URI_HIDE_NONE);
 
-const gchar *gnome_cmd_file_get_extension (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_owner (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_group (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_adate (GnomeCmdFile *f, gboolean overide_disp_setting);
-const gchar *gnome_cmd_file_get_mdate (GnomeCmdFile *f, gboolean overide_disp_setting);
-const gchar *gnome_cmd_file_get_cdate (GnomeCmdFile *f, gboolean overide_disp_setting);
-const gchar *gnome_cmd_file_get_size (GnomeCmdFile *f);
-GnomeVFSFileSize gnome_cmd_file_get_tree_size (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_tree_size_as_str (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_perm (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_mime_type_desc (GnomeCmdFile *f);
-const gchar *gnome_cmd_file_get_mime_type (GnomeCmdFile *f);
-gboolean gnome_cmd_file_has_mime_type (GnomeCmdFile *f, const gchar *mime_type);
-gboolean gnome_cmd_file_mime_begins_with (GnomeCmdFile *f, const gchar *mime_type_start);
-
 void gnome_cmd_file_show_properties (GnomeCmdFile *f);
 void gnome_cmd_file_show_chown_dialog (GList *files);
 void gnome_cmd_file_show_chmod_dialog (GList *files);
@@ -138,6 +138,18 @@ void gnome_cmd_file_list_unref (GList *files);
 
 GnomeCmdDir *gnome_cmd_file_get_parent_dir (GnomeCmdFile *f);
 
+inline const gchar *GnomeCmdFile::get_mime_type()
+{
+    g_return_val_if_fail (info != NULL, NULL);
+    return gnome_vfs_file_info_get_mime_type (info);
+}
+
+inline const gchar *GnomeCmdFile::get_mime_type_desc()
+{
+    g_return_val_if_fail (info != NULL, NULL);
+    return info->mime_type ? gnome_vfs_mime_get_description (info->mime_type) : NULL;
+}
+
 inline GnomeVFSMimeApplication *GnomeCmdFile::get_default_application()
 {
     return info->mime_type ? gnome_vfs_mime_get_default_application (info->mime_type) : NULL;
diff --git a/src/ls_colors.cc b/src/ls_colors.cc
index a2f1f10..1452770 100644
--- a/src/ls_colors.cc
+++ b/src/ls_colors.cc
@@ -205,7 +205,7 @@ LsColor *ls_colors_get (GnomeCmdFile *f)
         return type_colors[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK];
 
     LsColor *col = NULL;
-    const gchar *ext = gnome_cmd_file_get_extension (f);
+    const gchar *ext = f->get_extension();
 
     if (ext)
         col = (LsColor *) g_hash_table_lookup (::map, ext);
diff --git a/src/utils.cc b/src/utils.cc
index 78e1229..26bb299 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -519,7 +519,7 @@ void mime_exec_single (GnomeCmdFile *f)
 
     if (!f->is_executable())
     {
-        if (gnome_cmd_file_has_mime_type (f, "application/x-executable") || gnome_cmd_file_has_mime_type (f, "application/x-executable-binary"))
+        if (f->has_mime_type("application/x-executable") || f->has_mime_type("application/x-executable-binary"))
         {
             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);
@@ -542,13 +542,13 @@ void mime_exec_single (GnomeCmdFile *f)
 
     if (f->is_executable())
     {
-        if (gnome_cmd_file_has_mime_type (f, "application/x-executable") || gnome_cmd_file_has_mime_type (f, "application/x-executable-binary"))
+        if (f->has_mime_type("application/x-executable") || f->has_mime_type("application/x-executable-binary"))
         {
             f->execute();
             return;
         }
         else
-            if (gnome_cmd_file_mime_begins_with (f, "text/"))
+            if (f->mime_begins_with("text/"))
             {
                 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);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]