[gnome-commander] Get file type using gio for showing fav apps in popup menu

[Uwe Scholz <uwescholz src gnome org>]

commit 0a565faaebf259752a6dd6a83f6855618a0cd8cf
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Fri Jan 22 23:21:28 2021 +0100

    Get file type using gio for showing fav apps in popup menu

 src/gnome-cmd-file-popmenu.cc | 34 +++++++++++++++++++++++++++++-----
 src/gnome-cmd-file-popmenu.h  |  1 +
 2 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-cmd-file-popmenu.cc b/src/gnome-cmd-file-popmenu.cc
index f30c2996..7127d3cc 100644
--- a/src/gnome-cmd-file-popmenu.cc
+++ b/src/gnome-cmd-file-popmenu.cc
@@ -394,15 +394,39 @@ static void add_fav_app_menu_item (GtkUIManager *uiManager, guint mergeIdFavApp,
 }
 
 
+guint32 get_gfile_type(GFile *gFile)
+{
+    GError *error;
+    error = nullptr;
+    auto gcmdFileInfo = g_file_query_info(gFile,
+                                   G_FILE_ATTRIBUTE_STANDARD_TYPE,
+                                   G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                   nullptr,
+                                   &error);
+    if (error)
+    {
+        g_message ("retrieving file info failed: %s", error->message);
+        g_error_free (error);
+    }
+
+    auto gFileStandardType = g_file_info_get_attribute_uint32 (gcmdFileInfo,
+                                G_FILE_ATTRIBUTE_STANDARD_TYPE);
+
+    g_object_unref(gcmdFileInfo);
+
+    return gFileStandardType;
+}
+
 inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
 {
+
     switch (gnome_cmd_app_get_target (app))
     {
         case APP_TARGET_ALL_DIRS:
             for (; files; files = files->next)
             {
                 auto f = static_cast<GnomeCmdFile*> (files->data);
-                if (f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+                if (get_gfile_type(f->gFile) != G_FILE_TYPE_DIRECTORY)
                     return FALSE;
             }
             return TRUE;
@@ -411,7 +435,7 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
             for (; files; files = files->next)
             {
                 auto f = static_cast<GnomeCmdFile*> (files->data);
-                if (f->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
+                if (get_gfile_type(f->gFile) != G_FILE_TYPE_REGULAR)
                     return FALSE;
             }
             return TRUE;
@@ -420,8 +444,8 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
             for (; files; files = files->next)
             {
                 auto f = static_cast<GnomeCmdFile*> (files->data);
-                if (f->info->type != GNOME_VFS_FILE_TYPE_REGULAR
-                    && f->info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
+                auto gFileType = get_gfile_type(f->gFile);
+                if (gFileType != G_FILE_TYPE_REGULAR && gFileType != G_FILE_TYPE_DIRECTORY)
                     return FALSE;
             }
             return TRUE;
@@ -437,7 +461,7 @@ inline gboolean fav_app_matches_files (GnomeCmdApp *app, GList *files)
 #endif
 
                 auto f = static_cast<GnomeCmdFile*> (files->data);
-                if (f->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
+                if (get_gfile_type(f->gFile) != G_FILE_TYPE_REGULAR)
                     return FALSE;
 
                 // Check that the file matches at least one pattern
diff --git a/src/gnome-cmd-file-popmenu.h b/src/gnome-cmd-file-popmenu.h
index aa29079a..b441d794 100644
--- a/src/gnome-cmd-file-popmenu.h
+++ b/src/gnome-cmd-file-popmenu.h
@@ -57,3 +57,4 @@ GtkUIManager *get_file_popup_ui_manager (GnomeCmdFileList *gnomeCmdFileList);
 guint add_open_with_entries (GtkUIManager *ui_manager, GnomeCmdFileList *gnomeCmdFileList);
 guint add_action_script_entries(GtkUIManager *uiManager, GList *files);
 void add_execute_entry(GtkUIManager *ui_manager, GnomeCmdFileList *gnomeCmdFileList);
+guint32 get_gfile_type(GFile *gFile);