Check (and set) metadata::trusted instead of metadata::trust.
This commit is contained in:
parent
8c2c6c557d
commit
9abec1c8dd
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
libfm-qt (0.13.1-5ubuntu7) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Check (and set) metadata::trusted instead of metadata::trust.
|
||||||
|
|
||||||
|
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 15 Oct 2018 10:11:30 -0500
|
||||||
|
|
||||||
libfm-qt (0.13.1-5ubuntu6) cosmic; urgency=medium
|
libfm-qt (0.13.1-5ubuntu6) cosmic; urgency=medium
|
||||||
|
|
||||||
* Update symbols from build logs.
|
* Update symbols from build logs.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Description: Support adding metadata for trusting executables.
|
Description: Support adding metadata for trusting executables.
|
||||||
Author: Tsu Jan <tsujan2000@gmail.com>
|
Author: Tsu Jan <tsujan2000@gmail.com>
|
||||||
Applied-Upstream: https://github.com/lxqt/libfm-qt/pull/242/commits/9c2f00c2e22b8054bcaedad89ef74f0432b9f7fe
|
Applied-Upstream: https://github.com/lxqt/libfm-qt/pull/242/commits/9c2f00c2e22b8054bcaedad89ef74f0432b9f7fe
|
||||||
Last-Update: 2018-10-06
|
Last-Update: 2018-10-15
|
||||||
--- a/src/core/basicfilelauncher.cpp
|
--- a/src/core/basicfilelauncher.cpp
|
||||||
+++ b/src/core/basicfilelauncher.cpp
|
+++ b/src/core/basicfilelauncher.cpp
|
||||||
@@ -176,7 +176,7 @@ bool BasicFileLauncher::launchDesktopEnt
|
@@ -176,7 +176,7 @@ bool BasicFileLauncher::launchDesktopEnt
|
||||||
@ -30,7 +30,7 @@ Last-Update: 2018-10-06
|
|||||||
"id::filesystem,"
|
"id::filesystem,"
|
||||||
- "metadata::emblems";
|
- "metadata::emblems";
|
||||||
+ "metadata::emblems,"
|
+ "metadata::emblems,"
|
||||||
+ "metadata::trust";
|
+ "metadata::trusted";
|
||||||
|
|
||||||
FileInfo::FileInfo() {
|
FileInfo::FileInfo() {
|
||||||
// FIXME: initialize numeric data members
|
// FIXME: initialize numeric data members
|
||||||
@ -49,8 +49,8 @@ Last-Update: 2018-10-06
|
|||||||
+bool FileInfo::isTrustable() const {
|
+bool FileInfo::isTrustable() const {
|
||||||
+ if(isExecutableType()) {
|
+ if(isExecutableType()) {
|
||||||
+ /* to avoid GIO assertion warning: */
|
+ /* to avoid GIO assertion warning: */
|
||||||
+ if(g_file_info_get_attribute_type(inf_.get(), "metadata::trust") == G_FILE_ATTRIBUTE_TYPE_STRING) {
|
+ if(g_file_info_get_attribute_type(inf_.get(), "metadata::trusted") == G_FILE_ATTRIBUTE_TYPE_STRING) {
|
||||||
+ if(const auto data = g_file_info_get_attribute_string(inf_.get(), "metadata::trust")) {
|
+ if(const auto data = g_file_info_get_attribute_string(inf_.get(), "metadata::trusted")) {
|
||||||
+ return (strcmp(data, "true") == 0);
|
+ return (strcmp(data, "true") == 0);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
@ -60,16 +60,16 @@ Last-Update: 2018-10-06
|
|||||||
+
|
+
|
||||||
+void FileInfo::setTrustable(bool trust) const {
|
+void FileInfo::setTrustable(bool trust) const {
|
||||||
+ if(!isExecutableType()) {
|
+ if(!isExecutableType()) {
|
||||||
+ return; // "metadata::trust" is only for executables
|
+ return; // "metadata::trusted" is only for executables
|
||||||
+ }
|
+ }
|
||||||
+ GObjectPtr<GFileInfo> info {g_file_info_new()}; // used to set only this attribute
|
+ GObjectPtr<GFileInfo> info {g_file_info_new()}; // used to set only this attribute
|
||||||
+ if(trust) {
|
+ if(trust) {
|
||||||
+ g_file_info_set_attribute_string(info.get(), "metadata::trust", "true");
|
+ g_file_info_set_attribute_string(info.get(), "metadata::trusted", "true");
|
||||||
+ g_file_info_set_attribute_string(inf_.get(), "metadata::trust", "true");
|
+ g_file_info_set_attribute_string(inf_.get(), "metadata::trusted", "true");
|
||||||
+ }
|
+ }
|
||||||
+ else {
|
+ else {
|
||||||
+ g_file_info_set_attribute(info.get(), "metadata::trust", G_FILE_ATTRIBUTE_TYPE_INVALID, nullptr);
|
+ g_file_info_set_attribute(info.get(), "metadata::trusted", G_FILE_ATTRIBUTE_TYPE_INVALID, nullptr);
|
||||||
+ g_file_info_set_attribute(inf_.get(), "metadata::trust", G_FILE_ATTRIBUTE_TYPE_INVALID, nullptr);
|
+ g_file_info_set_attribute(inf_.get(), "metadata::trusted", G_FILE_ATTRIBUTE_TYPE_INVALID, nullptr);
|
||||||
+ }
|
+ }
|
||||||
+ g_file_set_attributes_from_info(path().gfile().get(),
|
+ g_file_set_attributes_from_info(path().gfile().get(),
|
||||||
+ info.get(),
|
+ info.get(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user