empathy r1703 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Nov 11 15:27:49 2008
New Revision: 1703
URL: http://svn.gnome.org/viewvc/empathy?rev=1703&view=rev

Log:
can_satisfy_mime_type_requirements: assume out params != NULL

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

Modified:
   trunk/libempathy-gtk/empathy-avatar-chooser.c

Modified: trunk/libempathy-gtk/empathy-avatar-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-avatar-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-avatar-chooser.c	Tue Nov 11 15:27:49 2008
@@ -362,16 +362,8 @@
 	}
 
 	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. */