From ef955942efbf2a6c4855d960a4af1b82f0571fab Mon Sep 17 00:00:00 2001
From: Alexander Schwinn <alexxcons@xfce.org>
Date: Tue, 20 Dec 2022 10:51:16 +0100
Subject: [PATCH] Moved 'set executable flag' into separate method
In order to be able to reuse it
---
thunar/thunar-dialogs.c | 39 ++----------------------
thunar/thunar-gio-extensions.c | 54 ++++++++++++++++++++++++++++++++++
thunar/thunar-gio-extensions.h | 2 ++
3 files changed, 58 insertions(+), 37 deletions(-)
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 46d940a0b..d16c959e0 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -1030,9 +1030,6 @@ thunar_dialogs_show_insecure_program (gpointer parent,
gint response;
GtkWidget *dialog;
GString *secondary;
- ThunarFileMode old_mode;
- ThunarFileMode new_mode;
- GFileInfo *info;
GError *err = NULL;
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
@@ -1073,42 +1070,10 @@ thunar_dialogs_show_insecure_program (gpointer parent,
response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
- /* check if we should make the file executable */
+ /* check if we can set the file executable */
if (response == GTK_RESPONSE_APPLY)
{
- /* try to query information about the file */
- info = g_file_query_info (thunar_file_get_file (file),
- G_FILE_ATTRIBUTE_UNIX_MODE,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
- NULL, &err);
-
- if (G_LIKELY (info != NULL))
- {
- if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE))
- {
- /* determine the current mode */
- old_mode = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
-
- /* generate the new mode */
- new_mode = old_mode | THUNAR_FILE_MODE_USR_EXEC | THUNAR_FILE_MODE_GRP_EXEC | THUNAR_FILE_MODE_OTH_EXEC;
-
- if (old_mode != new_mode)
- {
- g_file_set_attribute_uint32 (thunar_file_get_file (file),
- G_FILE_ATTRIBUTE_UNIX_MODE, new_mode,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
- NULL, &err);
- }
- }
- else
- {
- g_warning ("No %s attribute found", G_FILE_ATTRIBUTE_UNIX_MODE);
- }
-
- g_object_unref (info);
- }
-
- if (err != NULL)
+ if (thunar_g_file_set_executable_flags (thunar_file_get_file (file), &err))
{
thunar_dialogs_show_error (parent, err, ("Unable to mark launcher executable"));
g_clear_error (&err);
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index 6c4e2b4b4..cb559945f 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -1231,3 +1231,57 @@ thunar_g_file_is_on_local_device (GFile *file)
return is_local;
}
+/**
+ * thunar_g_file_set_executable_flags:
+ * @file : the #GFile for which execute flags should be set
+ *
+ * Tries to set +x flag of the file for user, group and others
+ *
+ * Return value: %TRUE on sucess, %FALSE on error
+ **/
+gboolean
+thunar_g_file_set_executable_flags (GFile *file,
+ GError **error)
+{
+ ThunarFileMode old_mode;
+ ThunarFileMode new_mode;
+ GFileInfo *info;
+
+ _thunar_return_val_if_fail (G_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* try to query information about the file */
+ info = g_file_query_info (file,
+ G_FILE_ATTRIBUTE_UNIX_MODE,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ NULL, error);
+
+ if (G_LIKELY (info != NULL))
+ {
+ if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE))
+ {
+ /* determine the current mode */
+ old_mode = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
+
+ /* generate the new mode */
+ new_mode = old_mode | THUNAR_FILE_MODE_USR_EXEC | THUNAR_FILE_MODE_GRP_EXEC | THUNAR_FILE_MODE_OTH_EXEC;
+
+ if (old_mode != new_mode)
+ {
+ g_file_set_attribute_uint32 (file,
+ G_FILE_ATTRIBUTE_UNIX_MODE, new_mode,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ NULL, error);
+ }
+ }
+ else
+ {
+ g_warning ("No %s attribute found", G_FILE_ATTRIBUTE_UNIX_MODE);
+ }
+
+ g_object_unref (info);
+ }
+
+ return (error == NULL);
+}
+
diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
index 7698a7e00..fad5552f2 100644
--- a/thunar/thunar-gio-extensions.h
+++ b/thunar/thunar-gio-extensions.h
@@ -117,6 +117,8 @@ gboolean thunar_g_app_info_should_show (GAppInfo *info)
gboolean thunar_g_vfs_metadata_is_supported (void);
gboolean thunar_g_file_is_on_local_device (GFile *file);
+gboolean thunar_g_file_set_executable_flags (GFile *file,
+ GError **error);
G_END_DECLS
--
GitLab