Skip to content
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.

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

src/service.c: Drop MagnifierClosed signal handler #39

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions src/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ struct _IndicatorA11yServicePrivate
GSList *lUsers;
gchar *sUser;
guint nUserSubscription;
guint nMagnifierSubscription;
gboolean bReadingAccountsService;
GDBusConnection *pAccountsServiceConnection;
GSettings *pSettings;
Expand Down Expand Up @@ -354,11 +353,6 @@ static void onDispose (GObject *pObject)
g_dbus_connection_signal_unsubscribe (self->pPrivate->pConnection, self->pPrivate->nUserSubscription);
}

if (self->pPrivate->nMagnifierSubscription)
{
g_dbus_connection_signal_unsubscribe (self->pPrivate->pConnection, self->pPrivate->nMagnifierSubscription);
}

if (self->pPrivate->lUsers)
{
g_slist_free (self->pPrivate->lUsers);
Expand Down Expand Up @@ -484,11 +478,6 @@ static void onMagnifierExit (GPid nPid, gint nStatus, gpointer pData)
}
}

static void onMagnifierClosed (GDBusConnection *pConnection, const gchar *sSender, const gchar *sPath, const gchar *sInterface, const gchar *sSignal, GVariant *pParameters, gpointer pUserData)
{
onMagnifierExit (0, 0, pUserData);
}

static void onMagnifierState (GSimpleAction *pAction, GVariant* pValue, gpointer pUserData)
{
IndicatorA11yService *self = INDICATOR_A11Y_SERVICE (pUserData);
Expand Down Expand Up @@ -1289,7 +1278,6 @@ static void indicator_a11y_service_init (IndicatorA11yService *self)
}

self->pPrivate->nUserSubscription = g_dbus_connection_signal_subscribe (self->pPrivate->pConnection, NULL, GREETER_BUS_NAME, "UserChanged", GREETER_BUS_PATH, NULL, G_DBUS_SIGNAL_FLAGS_NONE, onUserChanged, self, NULL);
self->pPrivate->nMagnifierSubscription = g_dbus_connection_signal_subscribe (self->pPrivate->pConnection, NULL, GREETER_BUS_NAME, "MagnifierClosed", GREETER_BUS_PATH, NULL, G_DBUS_SIGNAL_FLAGS_NONE, onMagnifierClosed, self, NULL);
loadManager (self);
}

Expand Down