Attachment 20276 Details for Bug 18513 – patch via git diff src/connection-avatars.c

[patch] patch via git diff src/connection-avatars.c

avatar-fix.patch (text/plain), 1.35 KB, created by Larry Reaves on 2008-11-12 21:06:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Reaves

Created: 2008-11-12 21:06:17 UTC

Size: 1.35 KB

patch

obsolete

>diff --git a/src/connection-avatars.c b/src/connection-avatars.c
>index d5bac8a..d1cbf16 100644
>--- a/src/connection-avatars.c
>+++ b/src/connection-avatars.c
>@@ -267,13 +267,13 @@ haze_connection_request_avatar (TpSvcConnectionInterfaceAvatars *self,
>     else
>     {
>         DEBUG ("handle %u has no avatar", contact);
>-        gchar *message = g_strdup_printf ("handle %u has no avatar", contact);
>-        g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, message);
>+	g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
>+		     "handle %u has no avatar", contact);
>+
> 
>         dbus_g_method_return_error (context, error);
> 
>         g_error_free (error);
>-        g_free (message);
>     }
> }
> 
>@@ -340,15 +340,13 @@ haze_connection_set_avatar (TpSvcConnectionInterfaceAvatars *self,
>     if (max_filesize > 0 && icon_len > max_filesize)
>     {
>         GError *error = NULL;
>-        gchar *message = g_strdup_printf ("avatar is %uB, but the limit is %uB",
>-            icon_len, max_filesize);
>-        g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, message);
>+        g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
>+		     "avatar is %uB, but the limit is %uB",
>+		     icon_len, max_filesize);
> 
>         dbus_g_method_return_error (context, error);
> 
>         g_error_free (error);
>-        g_free (message);
>-
>         return;
>     }
>

Actions: View | Splinter Review

Attachments on bug 18513: 20276

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.