[glib: 1/3] gdbusnamewatching: Remove a redundant function argument
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/3] gdbusnamewatching: Remove a redundant function argument
- Date: Tue, 21 Jan 2020 11:16:19 +0000 (UTC)
commit 79792574d478ea3093728411f1b6681c03fedc75
Author: Philip Withnall <withnall endlessm com>
Date: Mon Jan 20 19:12:49 2020 +0000
gdbusnamewatching: Remove a redundant function argument
It was always set to `FALSE`. This introduces no functional changes.
Signed-off-by: Philip Withnall <withnall endlessm com>
Helps: #604
gio/gdbusnamewatching.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index f74952a19..7b850c0af 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -234,13 +234,12 @@ call_appeared_handler (Client *client)
}
static void
-call_vanished_handler (Client *client,
- gboolean ignore_cancelled)
+call_vanished_handler (Client *client)
{
if (client->previous_call != PREVIOUS_CALL_VANISHED)
{
client->previous_call = PREVIOUS_CALL_VANISHED;
- if (((!client->cancelled) || ignore_cancelled) && client->name_vanished_handler != NULL)
+ if (!client->cancelled && client->name_vanished_handler != NULL)
{
do_call (client, CALL_TYPE_NAME_VANISHED);
}
@@ -296,7 +295,7 @@ on_connection_disconnected (GDBusConnection *connection,
client->name_owner_changed_subscription_id = 0;
client->connection = NULL;
- call_vanished_handler (client, FALSE);
+ call_vanished_handler (client);
client_unref (client);
}
@@ -345,7 +344,7 @@ on_name_owner_changed (GDBusConnection *connection,
{
g_free (client->name_owner);
client->name_owner = NULL;
- call_vanished_handler (client, FALSE);
+ call_vanished_handler (client);
}
if (new_owner != NULL && strlen (new_owner) > 0)
@@ -390,7 +389,7 @@ get_name_owner_cb (GObject *source_object,
}
else
{
- call_vanished_handler (client, FALSE);
+ call_vanished_handler (client);
}
client->initialized = TRUE;
@@ -450,7 +449,7 @@ start_service_by_name_cb (GObject *source_object,
else
{
g_warning ("Unexpected reply %d from StartServiceByName() method", start_service_result);
- call_vanished_handler (client, FALSE);
+ call_vanished_handler (client);
client->initialized = TRUE;
}
}
@@ -529,7 +528,7 @@ connection_get_cb (GObject *source_object,
client->connection = g_bus_get_finish (res, NULL);
if (client->connection == NULL)
{
- call_vanished_handler (client, FALSE);
+ call_vanished_handler (client);
goto out;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]