Skip to content

status-icon: use a weak ref for the ListNames callback #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
climashscape wants to merge 1 commit into
base: master
Choose a base branch
from
Open

status-icon: use a weak ref for the ListNames callback #220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 61 additions & 2 deletions libxapp/xapp-status-icon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,45 @@ static void use_gtk_status_icon (XAppStatusIcon *self);
static void remove_icon_path_from_bus (XAppStatusIcon *self);
static void hide_and_defer_unref_status_icon (XAppStatusIcon *self, GtkStatusIcon *status_icon);

/* Async callbacks must not keep the icon alive: the SnItem owning it may be
* removed while the call is in flight. A weak ref lets the callback detect
* that case instead of dereferencing freed memory. */
typedef struct
{
GWeakRef icon;
} XAppStatusIconAsyncRef;

static XAppStatusIconAsyncRef *
xapp_status_icon_async_ref_new (XAppStatusIcon *icon)
{
XAppStatusIconAsyncRef *async_ref = g_new0 (XAppStatusIconAsyncRef, 1);

g_weak_ref_init (&async_ref->icon, G_OBJECT (icon));

return async_ref;
}

static XAppStatusIcon *
xapp_status_icon_async_ref_get (XAppStatusIconAsyncRef *async_ref)
{
XAppStatusIcon *icon = g_weak_ref_get (&async_ref->icon);

if (icon == NULL)
{
g_weak_ref_clear (&async_ref->icon);
g_free (async_ref);
}

return icon;
}

static void
xapp_status_icon_async_ref_free (XAppStatusIconAsyncRef *async_ref)
{
g_weak_ref_clear (&async_ref->icon);
g_free (async_ref);
}

static void
cancellable_reset (XAppStatusIcon *self)
{
Expand Down Expand Up @@ -1326,7 +1365,8 @@ on_list_names_completed (GObject *source,
GAsyncResult *res,
gpointer user_data)
{
XAppStatusIcon *self = XAPP_STATUS_ICON(user_data);
XAppStatusIconAsyncRef *async_ref = user_data;
XAppStatusIcon *self;
GVariant *result;
GVariantIter *iter;
gchar *str;
Expand All @@ -1338,6 +1378,18 @@ on_list_names_completed (GObject *source,
result = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
res,
&error);
self = xapp_status_icon_async_ref_get (async_ref);

if (self == NULL)
{
if (error != NULL)
g_error_free (error);

if (result != NULL)
g_variant_unref (result);

return;
}

if (error != NULL)
{
Expand All @@ -1352,6 +1404,8 @@ on_list_names_completed (GObject *source,
}

g_error_free (error);
g_object_unref (self);
xapp_status_icon_async_ref_free (async_ref);
return;
}

Expand Down Expand Up @@ -1380,6 +1434,8 @@ on_list_names_completed (GObject *source,
else
{
connect_with_status_applet (self);
g_object_unref (self);
xapp_status_icon_async_ref_free (async_ref);

return;
}
Expand All @@ -1388,6 +1444,9 @@ on_list_names_completed (GObject *source,
{
use_gtk_status_icon (self);
}

g_object_unref (self);
xapp_status_icon_async_ref_free (async_ref);
}

static void
Expand All @@ -1409,7 +1468,7 @@ look_for_status_applet (XAppStatusIcon *self)
3000, /* 3 secs */
self->priv->cancellable,
on_list_names_completed,
self);
xapp_status_icon_async_ref_new (self));
}

static void
Expand Down
Loading