diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-11-11 23:27:49 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-11-11 23:27:49 +0800 |
| commit | 82f02919e262135d79db11627ebe6a6d8668ef5b (patch) | |
| tree | 8797473a3cd3399f41292500bdade286c80d05e8 | |
| parent | 76116a8932db7923e6c4aa65dcdaca4b0221132d (diff) | |
| download | gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.tar gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.tar.gz gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.tar.bz2 gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.tar.lz gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.tar.xz gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.tar.zst gsoc2013-empathy-82f02919e262135d79db11627ebe6a6d8668ef5b.zip | |
can_satisfy_mime_type_requirements: assume out params != NULL
(I never actually removed the assertion that they be non-NULL.)
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1703 4ee84921-47dd-4033-b63a-18d7a039a3e4
| -rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.c | 12 |
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. */ |