From 7ce64583fa676e2a71d2236fad9333269a62bf91 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 11 Nov 2008 15:27:49 +0000 Subject: 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 --- libempathy-gtk/empathy-avatar-chooser.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index d1a3fb96c..9ccff0b85 100644 --- 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. */ -- cgit v1.2.3