From f183d59337b9710f69fbaeda980a125dbef4bc2f Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Sat, 12 May 2018 21:58:59 +0300 Subject: general: Remove remaining desktop-file-related code --- src/nautilus-dnd.c | 9 --------- src/nautilus-file-private.h | 4 +--- src/nautilus-file-utilities.c | 34 ---------------------------------- src/nautilus-file-utilities.h | 1 - src/nautilus-file.c | 20 -------------------- src/nautilus-file.h | 2 -- src/nautilus-metadata.c | 1 - src/nautilus-metadata.h | 4 +--- 8 files changed, 2 insertions(+), 73 deletions(-) diff --git a/src/nautilus-dnd.c b/src/nautilus-dnd.c index d35032306..8071d5b80 100644 --- a/src/nautilus-dnd.c +++ b/src/nautilus-dnd.c @@ -513,15 +513,6 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context, nautilus_file_unref (target_file); return; } - else if (dropped_file != NULL && nautilus_file_is_launcher (dropped_file)) - { - if (actions & GDK_ACTION_MOVE) - { - *action = GDK_ACTION_MOVE; - } - nautilus_file_unref (target_file); - return; - } else if (target_file != NULL && nautilus_file_is_archive (target_file)) { *action = GDK_ACTION_COPY; diff --git a/src/nautilus-file-private.h b/src/nautilus-file-private.h index fa53c5c33..9a12560c1 100644 --- a/src/nautilus-file-private.h +++ b/src/nautilus-file-private.h @@ -171,8 +171,6 @@ struct NautilusFileDetails eel_boolean_bit is_thumbnailing : 1; - eel_boolean_bit is_launcher : 1; - eel_boolean_bit is_trusted_link : 1; eel_boolean_bit is_symlink : 1; eel_boolean_bit is_mountpoint : 1; eel_boolean_bit is_hidden : 1; @@ -286,4 +284,4 @@ void nautilus_file_operation_free (NautilusFileOperation void nautilus_file_operation_complete (NautilusFileOperation *op, GFile *result_location, GError *error); -void nautilus_file_operation_cancel (NautilusFileOperation *op); \ No newline at end of file +void nautilus_file_operation_cancel (NautilusFileOperation *op); diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c index a322d4d92..7cda42053 100644 --- a/src/nautilus-file-utilities.c +++ b/src/nautilus-file-utilities.c @@ -702,40 +702,6 @@ nautilus_is_file_roller_installed (void) return installed > 0 ? TRUE : FALSE; } -/* Returns TRUE if the file is in XDG_DATA_DIRS. This is used for - * deciding if a desktop file is "trusted" based on the path */ -gboolean -nautilus_is_in_system_dir (GFile *file) -{ - const char * const *data_dirs; - char *path; - int i; - gboolean res; - - if (!g_file_is_native (file)) - { - return FALSE; - } - - path = g_file_get_path (file); - - res = FALSE; - - data_dirs = g_get_system_data_dirs (); - for (i = 0; path != NULL && data_dirs[i] != NULL; i++) - { - if (g_str_has_prefix (path, data_dirs[i])) - { - res = TRUE; - break; - } - } - - g_free (path); - - return res; -} - GHashTable * nautilus_trashed_files_get_original_directories (GList *files, GList **unhandled_files) diff --git a/src/nautilus-file-utilities.h b/src/nautilus-file-utilities.h index 8a8ecbc83..680b857aa 100644 --- a/src/nautilus-file-utilities.h +++ b/src/nautilus-file-utilities.h @@ -38,7 +38,6 @@ gboolean nautilus_is_root_directory (GFile *dir); gboolean nautilus_is_home_directory (GFile *dir); gboolean nautilus_is_home_directory_file (GFile *dir, const char *filename); -gboolean nautilus_is_in_system_dir (GFile *location); gboolean nautilus_is_search_directory (GFile *dir); gboolean nautilus_is_recent_directory (GFile *dir); gboolean nautilus_is_starred_directory (GFile *dir); diff --git a/src/nautilus-file.c b/src/nautilus-file.c index 8ab562753..636891e96 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -503,8 +503,6 @@ nautilus_file_clear_info (NautilusFile *file) file->details->thumbnail_path = NULL; file->details->thumbnailing_failed = FALSE; - file->details->is_launcher = FALSE; - file->details->is_trusted_link = FALSE; file->details->is_symlink = FALSE; file->details->is_hidden = FALSE; file->details->is_mountpoint = FALSE; @@ -4468,18 +4466,6 @@ nautilus_file_monitor_remove (NautilusFile *file, NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->monitor_remove (file, client); } -gboolean -nautilus_file_is_launcher (NautilusFile *file) -{ - return file->details->is_launcher; -} - -gboolean -nautilus_file_is_trusted_link (NautilusFile *file) -{ - return file->details->is_trusted_link; -} - gboolean nautilus_file_has_activation_uri (NautilusFile *file) { @@ -9327,12 +9313,6 @@ nautilus_drag_can_accept_files (NautilusFile *drop_target_item) return res; } - /* Launchers are an acceptable drop target */ - if (nautilus_file_is_launcher (drop_target_item)) - { - return TRUE; - } - if (nautilus_is_file_roller_installed () && nautilus_file_is_archive (drop_target_item)) { diff --git a/src/nautilus-file.h b/src/nautilus-file.h index 33d897dcf..c560f6a45 100644 --- a/src/nautilus-file.h +++ b/src/nautilus-file.h @@ -454,8 +454,6 @@ GList *nautilus_file_list_filter_hidden (GList /* Get the URI that's used when activating the file. * Getting this can require reading the contents of the file. */ -gboolean nautilus_file_is_launcher (NautilusFile *file); -gboolean nautilus_file_is_trusted_link (NautilusFile *file); gboolean nautilus_file_has_activation_uri (NautilusFile *file); char * nautilus_file_get_activation_uri (NautilusFile *file); GFile * nautilus_file_get_activation_location (NautilusFile *file); diff --git a/src/nautilus-metadata.c b/src/nautilus-metadata.c index 48851a7cf..e462298ca 100644 --- a/src/nautilus-metadata.c +++ b/src/nautilus-metadata.c @@ -31,7 +31,6 @@ static char *used_metadata_names[] = NAUTILUS_METADATA_KEY_CUSTOM_ICON, NAUTILUS_METADATA_KEY_CUSTOM_ICON_NAME, NAUTILUS_METADATA_KEY_EMBLEMS, - NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED, NULL }; diff --git a/src/nautilus-metadata.h b/src/nautilus-metadata.h index 9eeaeb6e1..299e3a823 100644 --- a/src/nautilus-metadata.h +++ b/src/nautilus-metadata.h @@ -42,6 +42,4 @@ #define NAUTILUS_METADATA_KEY_CUSTOM_ICON_NAME "custom-icon-name" #define NAUTILUS_METADATA_KEY_EMBLEMS "emblems" -#define NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED "trusted" - -guint nautilus_metadata_get_id (const char *metadata); \ No newline at end of file +guint nautilus_metadata_get_id (const char *metadata); -- cgit v1.2.1