Updating branch refs/heads/master to 82aa86333d8ff53236b04fa255fd9fe23460f7ce (commit) from 6a1750ea8a59a75a84dbd56ca23e204fa6c3b892 (commit)
commit 82aa86333d8ff53236b04fa255fd9fe23460f7ce Author: Christian Dywan <christ...@twotoasts.de> Date: Sat Apr 20 03:00:31 2013 +0200 Plug leak listing video formats midori/midori-view.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index bd1d287..3dc9710 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4216,8 +4216,10 @@ list_geolocation (GString* markup) "</script>"); } -static gchar* -list_video_formats (MidoriView* view) +static void +midori_view_list_video_formats (MidoriView* view, + GString* formats, + gboolean html) { #ifndef HAVE_WEBKIT2 WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); @@ -4234,9 +4236,8 @@ list_video_formats (MidoriView* view) "' WebM [' + " "supported('video/webm; codecs=\"vp8, vorbis\"') + ']' " "", NULL); - return value; -#else - return NULL; + midori_view_add_version (formats, html, g_strdup_printf ("Video Formats %s", value)); + g_free (value); #endif } @@ -4466,10 +4467,9 @@ midori_view_set_uri (MidoriView* view, platform, sys_name, architecture ? architecture : "")); midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Identification %s", ident)); - midori_view_add_version (tmp, TRUE, g_strdup_printf ("Video Formats %s", - list_video_formats (view))); - g_string_append (tmp, "</table><table>"); + midori_view_list_video_formats (view, tmp, TRUE); + g_string_append (tmp, "</table><table>"); midori_view_list_plugins (view, tmp, TRUE); g_string_append (tmp, "</table>"); list_about_uris (tmp); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits