aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-11-11 23:27:49 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-11 23:27:49 +0800
commit7ce64583fa676e2a71d2236fad9333269a62bf91 (patch)
tree8797473a3cd3399f41292500bdade286c80d05e8 /libempathy-gtk
parentba9555296ba39b0425c70faaa8c02d28a8ce52af (diff)
downloadgsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.tar
gsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.tar.gz
gsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.tar.bz2
gsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.tar.lz
gsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.tar.xz
gsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.tar.zst
gsoc2013-empathy-7ce64583fa676e2a71d2236fad9333269a62bf91.zip
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
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c12
1 files 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. */