mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-24 21:16:15 +01:00
gtk-notification-backend: remove unused variable
A reference to the session bus is now stored in GNotificationBackend. Remove the extraneous one in the gtk backend and stop using it in withdraw_notification. https://bugzilla.gnome.org/show_bug.cgi?id=711051
This commit is contained in:
parent
1a037b1408
commit
425f307b01
@ -35,8 +35,6 @@ typedef GNotificationBackendClass GGtkNotificationBackendClass;
|
|||||||
struct _GGtkNotificationBackend
|
struct _GGtkNotificationBackend
|
||||||
{
|
{
|
||||||
GNotificationBackend parent;
|
GNotificationBackend parent;
|
||||||
|
|
||||||
GDBusConnection *session_bus;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
GType g_gtk_notification_backend_get_type (void);
|
GType g_gtk_notification_backend_get_type (void);
|
||||||
@ -46,16 +44,6 @@ G_DEFINE_TYPE_WITH_CODE (GGtkNotificationBackend, g_gtk_notification_backend, G_
|
|||||||
g_io_extension_point_implement (G_NOTIFICATION_BACKEND_EXTENSION_POINT_NAME,
|
g_io_extension_point_implement (G_NOTIFICATION_BACKEND_EXTENSION_POINT_NAME,
|
||||||
g_define_type_id, "gtk", 100))
|
g_define_type_id, "gtk", 100))
|
||||||
|
|
||||||
static void
|
|
||||||
g_gtk_notification_backend_dispose (GObject *object)
|
|
||||||
{
|
|
||||||
GGtkNotificationBackend *backend = G_GTK_NOTIFICATION_BACKEND (object);
|
|
||||||
|
|
||||||
g_clear_object (&backend->session_bus);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (g_gtk_notification_backend_parent_class)->dispose (object);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
g_gtk_notification_backend_is_supported (void)
|
g_gtk_notification_backend_is_supported (void)
|
||||||
{
|
{
|
||||||
@ -108,12 +96,11 @@ static void
|
|||||||
g_gtk_notification_backend_withdraw_notification (GNotificationBackend *backend,
|
g_gtk_notification_backend_withdraw_notification (GNotificationBackend *backend,
|
||||||
const gchar *id)
|
const gchar *id)
|
||||||
{
|
{
|
||||||
GGtkNotificationBackend *self = G_GTK_NOTIFICATION_BACKEND (backend);
|
|
||||||
GVariant *params;
|
GVariant *params;
|
||||||
|
|
||||||
params = g_variant_new ("(ss)", g_application_get_application_id (backend->application), id);
|
params = g_variant_new ("(ss)", g_application_get_application_id (backend->application), id);
|
||||||
|
|
||||||
g_dbus_connection_call (self->session_bus, "org.gtk.Notifications",
|
g_dbus_connection_call (backend->dbus_connection, "org.gtk.Notifications",
|
||||||
"/org/gtk/Notifications", "org.gtk.Notifications",
|
"/org/gtk/Notifications", "org.gtk.Notifications",
|
||||||
"RemoveNotification", params, G_VARIANT_TYPE_UNIT,
|
"RemoveNotification", params, G_VARIANT_TYPE_UNIT,
|
||||||
G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
|
G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
|
||||||
@ -127,11 +114,8 @@ g_gtk_notification_backend_init (GGtkNotificationBackend *backend)
|
|||||||
static void
|
static void
|
||||||
g_gtk_notification_backend_class_init (GGtkNotificationBackendClass *class)
|
g_gtk_notification_backend_class_init (GGtkNotificationBackendClass *class)
|
||||||
{
|
{
|
||||||
GObjectClass *object_class = G_OBJECT_CLASS (class);
|
|
||||||
GNotificationBackendClass *backend_class = G_NOTIFICATION_BACKEND_CLASS (class);
|
GNotificationBackendClass *backend_class = G_NOTIFICATION_BACKEND_CLASS (class);
|
||||||
|
|
||||||
object_class->dispose = g_gtk_notification_backend_dispose;
|
|
||||||
|
|
||||||
backend_class->is_supported = g_gtk_notification_backend_is_supported;
|
backend_class->is_supported = g_gtk_notification_backend_is_supported;
|
||||||
backend_class->send_notification = g_gtk_notification_backend_send_notification;
|
backend_class->send_notification = g_gtk_notification_backend_send_notification;
|
||||||
backend_class->withdraw_notification = g_gtk_notification_backend_withdraw_notification;
|
backend_class->withdraw_notification = g_gtk_notification_backend_withdraw_notification;
|
||||||
|
Loading…
Reference in New Issue
Block a user