can_satisfy_mime_type_requirements: assume out params != NULL

(I never actually removed the assertion that they be non-NULL.)

svn path=/trunk/; revision=1703

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index d1a3fb96c9cc4c862d48a9aaf4d9b6b207a7e226..9ccff0b85c7b53ed3b901e9a6ca908158cd167e9 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -362,16 +362,8 @@ can_satisfy_mime_type_requirements (gchar **accepted_mime_types,
        }
 
        if (done) {
-               if (satisfactory_format_name != NULL) {
-                       *satisfactory_format_name = name;
-               } else {
-                       g_free (name);
-               }
-               if (satisfactory_mime_type != NULL) {
-                       *satisfactory_mime_type = type;
-               } else {
-                       g_free (type);
-               }
+               *satisfactory_format_name = name;
+               *satisfactory_mime_type = type;
                return TRUE;
        } else {
                /* check we're not leaking. */