From a986445936088437aef83f85906dd6c6198b1932 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Wed, 8 Mar 2023 11:25:43 +0100 Subject: freedesktop-dbus: Drop the connection property The `NautilusFreedesktopDBus` class has a `connection` property, which is not needed anymore after the commit 765b4d24. Let's drop that property now. This effectively reverts a big part of commit 2293e813. Related: https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1134 --- src/nautilus-application.c | 4 +-- src/nautilus-freedesktop-dbus.c | 80 +++-------------------------------------- src/nautilus-freedesktop-dbus.h | 4 +-- 3 files changed, 9 insertions(+), 79 deletions(-) diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 3822ebb84..b55afa825 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -1222,8 +1222,8 @@ nautilus_application_dbus_register (GApplication *app, return FALSE; } - priv->fdb_manager = nautilus_freedesktop_dbus_new (connection); - if (!nautilus_freedesktop_dbus_register (priv->fdb_manager, error)) + priv->fdb_manager = nautilus_freedesktop_dbus_new (); + if (!nautilus_freedesktop_dbus_register (priv->fdb_manager, connection, error)) { return FALSE; } diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c index c20166abb..4c0fdcc83 100644 --- a/src/nautilus-freedesktop-dbus.c +++ b/src/nautilus-freedesktop-dbus.c @@ -40,14 +40,6 @@ struct _NautilusFreedesktopDBus /* Our DBus implementation skeleton */ NautilusFreedesktopFileManager1 *skeleton; - - GDBusConnection *connection; -}; - -enum -{ - PROP_0, - PROP_CONNECTION, }; G_DEFINE_TYPE (NautilusFreedesktopDBus, nautilus_freedesktop_dbus, G_TYPE_OBJECT); @@ -179,76 +171,15 @@ nautilus_freedesktop_dbus_dispose (GObject *object) fdb->skeleton = NULL; } - g_clear_object (&fdb->connection); - G_OBJECT_CLASS (nautilus_freedesktop_dbus_parent_class)->dispose (object); } -static void -nautilus_freedesktop_dbus_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object); - - switch (prop_id) - { - case PROP_CONNECTION: - { - g_set_object (&fdb->connection, g_value_get_object (value)); - } - break; - - default: - { - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } - break; - } -} - -static void -nautilus_freedesktop_dbus_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NautilusFreedesktopDBus *fdb = NAUTILUS_FREEDESKTOP_DBUS (object); - - switch (prop_id) - { - case PROP_CONNECTION: - { - g_value_set_object (value, fdb->connection); - } - break; - - default: - { - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } - break; - } -} - static void nautilus_freedesktop_dbus_class_init (NautilusFreedesktopDBusClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = nautilus_freedesktop_dbus_dispose; - object_class->get_property = nautilus_freedesktop_dbus_get_property; - object_class->set_property = nautilus_freedesktop_dbus_set_property; - - g_object_class_install_property (object_class, - PROP_CONNECTION, - g_param_spec_object ("connection", - "Connection", - "GDBus connection property", - G_TYPE_DBUS_CONNECTION, - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_READWRITE)); } static void @@ -287,22 +218,21 @@ nautilus_freedesktop_dbus_set_open_windows_with_locations (NautilusFreedesktopDB } NautilusFreedesktopDBus * -nautilus_freedesktop_dbus_new (GDBusConnection *connection) +nautilus_freedesktop_dbus_new (void) { - return g_object_new (NAUTILUS_TYPE_FREEDESKTOP_DBUS, - "connection", connection, - NULL); + return g_object_new (NAUTILUS_TYPE_FREEDESKTOP_DBUS, NULL); } /* Tries to own the org.freedesktop.FileManager1 service name */ gboolean nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, + GDBusConnection *connection, GError **error) { gboolean success; success = g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fdb->skeleton), - fdb->connection, + connection, NAUTILUS_FDO_DBUS_PATH, error); @@ -316,7 +246,7 @@ nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, G_CALLBACK (skeleton_handle_show_item_properties_cb), fdb); } - fdb->owner_id = g_bus_own_name_on_connection (fdb->connection, + fdb->owner_id = g_bus_own_name_on_connection (connection, NAUTILUS_FDO_DBUS_NAME, G_BUS_NAME_OWNER_FLAGS_NONE, name_acquired_cb, diff --git a/src/nautilus-freedesktop-dbus.h b/src/nautilus-freedesktop-dbus.h index 8fb09e498..f70cc7d91 100644 --- a/src/nautilus-freedesktop-dbus.h +++ b/src/nautilus-freedesktop-dbus.h @@ -31,9 +31,9 @@ G_DECLARE_FINAL_TYPE (NautilusFreedesktopDBus, nautilus_freedesktop_dbus, NAUTILUS, FREEDESKTOP_DBUS, GObject); -NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (GDBusConnection *connection); +NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void); -gboolean nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, GError **error); +gboolean nautilus_freedesktop_dbus_register (NautilusFreedesktopDBus *fdb, GDBusConnection *connection, GError **error); void nautilus_freedesktop_dbus_unregister (NautilusFreedesktopDBus *fdb); void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations); -- cgit v1.2.1