File gnome-photos-export-unbreak-empty-trash-button.... of Package gnome-photos

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-photos-export-unbreak-empty-trash-button.patch of Package gnome-photos (Revision 722ea01ad73d1d2c4c6ceee6c3eaa6ad)

Currently displaying revision 722ea01ad73d1d2c4c6ceee6c3eaa6ad , Show latest

From 8ad2cbdd0cc8f0dbeb04ea04c91d716fcca3d04e Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 21 Mar 2018 18:22:48 +0100
Subject: [PATCH] export-notification: Unbreak the "Empty Trash" button on GNOME >= 3.26

The /org/gnome/SettingsDaemon/Housekeeping D-Bus object got moved to
the org.gnome.SettingsDaemon.Housekeeping bus name when the
gnome-settings-daemon plugins were split into their own processes in
GNOME 3.26.

Support for older GNOME versions have been retained to allow new
Flatpaks to run on older host OSes.
---
 src/photos-export-notification.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c
index 4f84276..9e2a2d4 100644
--- a/src/photos-export-notification.c
+++ b/src/photos-export-notification.c
@@ -106,6 +106,77 @@ photos_export_notification_close (PhotosExportNotification *self)
 
 
 static void
+photos_export_notification_empty_trash_call_empty_trash (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+  GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
+  g_autoptr (GVariant) variant = NULL;
+
+  {
+    g_autoptr (GError) error = NULL;
+
+    variant = g_dbus_connection_call_finish (connection, res, &error);
+    if (error != NULL)
+      {
+        if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
+            || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_INTERFACE)
+            || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)
+            || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT))
+          {
+            g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash: "
+                       "unknown interface/method/object/service");
+          }
+        else
+          {
+            g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash: %s", error->message);
+          }
+      }
+  }
+}
+
+
+static void
+photos_export_notification_empty_trash_call_empty_trash_pre_3_26 (GObject *source_object,
+                                                                  GAsyncResult *res,
+                                                                  gpointer user_data)
+{
+  GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
+  g_autoptr (GVariant) variant = NULL;
+
+  {
+    g_autoptr (GError) error = NULL;
+
+    variant = g_dbus_connection_call_finish (connection, res, &error);
+    if (error != NULL)
+      {
+        if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)
+            || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_INTERFACE)
+            || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)
+            || g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT))
+          {
+            g_dbus_connection_call (connection,
+                                    "org.gnome.SettingsDaemon.Housekeeping",
+                                    "/org/gnome/SettingsDaemon/Housekeeping",
+                                    "org.gnome.SettingsDaemon.Housekeeping",
+                                    "EmptyTrash",
+                                    NULL,
+                                    NULL,
+                                    G_DBUS_CALL_FLAGS_NONE,
+                                    -1,
+                                    NULL,
+                                    photos_export_notification_empty_trash_call_empty_trash,
+                                    NULL);
+          }
+        else
+          {
+            g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash (GNOME < 3.26): %s",
+                       error->message);
+          }
+      }
+  }
+}
+
+
+static void
 photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncResult *result, gpointer user_data)
 {
   g_autoptr (PhotosExportNotification) self = PHOTOS_EXPORT_NOTIFICATION (user_data);
@@ -132,7 +203,7 @@ photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncRe
                           G_DBUS_CALL_FLAGS_NONE,
                           -1,
                           NULL,
-                          NULL,
+                          photos_export_notification_empty_trash_call_empty_trash_pre_3_26,
                           NULL);
 
  out:
--
libgit2 0.27.0

From 4771ebd38fde8feb92beea6b7b3b998a09a79823 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 21 Mar 2018 18:38:04 +0100
Subject: [PATCH] export-notification: Fix typo

The housekeeping plugin's D-Bus name changed in GNOME 3.24, not 3.26,
which was shipped in Fedora 26. Confusing!

Fallout from 8ad2cbdd0cc8f0dbeb04ea04c91d716fcca3d04e
---
 src/photos-export-notification.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c
index 9e2a2d4..e956c2c 100644
--- a/src/photos-export-notification.c
+++ b/src/photos-export-notification.c
@@ -135,7 +135,7 @@ photos_export_notification_empty_trash_call_empty_trash (GObject *source_object,
 
 
 static void
-photos_export_notification_empty_trash_call_empty_trash_pre_3_26 (GObject *source_object,
+photos_export_notification_empty_trash_call_empty_trash_pre_3_24 (GObject *source_object,
                                                                   GAsyncResult *res,
                                                                   gpointer user_data)
 {
@@ -168,7 +168,7 @@ photos_export_notification_empty_trash_call_empty_trash_pre_3_26 (GObject *sourc
           }
         else
           {
-            g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash (GNOME < 3.26): %s",
+            g_warning ("Unable to call org.gnome.SettingsDaemon.Housekeeping:EmptyTrash (GNOME < 3.24): %s",
                        error->message);
           }
       }
@@ -203,7 +203,7 @@ photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncRe
                           G_DBUS_CALL_FLAGS_NONE,
                           -1,
                           NULL,
-                          photos_export_notification_empty_trash_call_empty_trash_pre_3_26,
+                          photos_export_notification_empty_trash_call_empty_trash_pre_3_24,
                           NULL);
 
  out:
--
libgit2 0.27.0

Places

File gnome-photos-export-unbreak-empty-trash-button.patch of Package gnome-photos (Revision 722ea01ad73d1d2c4c6ceee6c3eaa6ad)

Places