Don't flood logs when individials don't have avatars

diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index b475b7c30cb7d0c69c2b499e3a62256ce24656cf..3f9d025f7680318baba64154a5331fddabbd4d2f 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -558,9 +558,15 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
 
   if (error != NULL)
     {
-      DEBUG ("failed to retrieve pixbuf for individual %s: %s",
-          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)),
-          error->message);
+      /* No need to display an error if the individal just doesn't have an
+       * avatar */
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+        {
+          DEBUG ("failed to retrieve pixbuf for individual %s: %s",
+              folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)),
+              error->message);
+        }
+
       g_clear_error (&error);
     }
   else if (data->store != NULL)

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index d462403ff7c7d6143813707a436a762ffaa296a2..6f86ccddd023f5bd1ef9eb1f226cc8c1f7ea7773 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -732,8 +732,8 @@ empathy_pixbuf_avatar_from_individual_scaled_async (
        avatar_icon =
                folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (individual));
        if (avatar_icon == NULL) {
-               g_simple_async_result_set_error (result, TP_ERRORS,
-                       TP_ERROR_INVALID_ARGUMENT, "no avatar found");
+               g_simple_async_result_set_error (result, G_IO_ERROR,
+                       G_IO_ERROR_NOT_FOUND, "no avatar found");
 
                g_simple_async_result_complete (result);
                g_object_unref (result);