[gnome-user-share] obex: Simplify obex_agent_authorize_push()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-share] obex: Simplify obex_agent_authorize_push()
- Date: Thu, 14 Nov 2013 23:40:38 +0000 (UTC)
commit 3199cf727f01decdb694c22d020a841a8ded7826
Author: Bastien Nocera <hadess hadess net>
Date: Fri Nov 15 00:34:32 2013 +0100
obex: Simplify obex_agent_authorize_push()
We never reject transfers directly in this function, so no need
to have code to do that.
src/obexpush.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/src/obexpush.c b/src/obexpush.c
index e992329..1da17bc 100644
--- a/src/obexpush.c
+++ b/src/obexpush.c
@@ -592,7 +592,6 @@ obex_agent_authorize_push (GObject *source_object,
const gchar *filename = g_variant_get_string (variant, NULL);
char *template;
int fd;
- gboolean authorize = FALSE;
g_debug ("AuthorizePush received");
@@ -610,7 +609,7 @@ obex_agent_authorize_push (GObject *source_object,
switch (accept_setting) {
case ACCEPT_ALWAYS:
- authorize = TRUE;
+ /* authorized! */
break;
case ACCEPT_BONDED:
check_if_bonded (transfer, invocation);
@@ -625,21 +624,14 @@ obex_agent_authorize_push (GObject *source_object,
/* ask_user() will accept or reject the transfer */
return;
default:
- g_warn_if_reached ();
+ g_assert_not_reached ();
}
- if (authorize) {
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("(s)", template));
-
- g_debug ("Incoming transfer authorized: %s (temp file: %s)", filename, template);
- g_free (template);
- } else {
- g_dbus_method_invocation_return_dbus_error (invocation,
- "org.bluez.obex.Error.Rejected", "Not Authorized");
- g_debug ("Incoming transfer rejected: %s", filename);
- }
+ g_dbus_method_invocation_return_value (invocation,
+ g_variant_new ("(s)", template));
+ g_debug ("Incoming transfer authorized: %s (temp file: %s)", filename, template);
+ g_free (template);
g_variant_unref (variant);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]