← Back to branch summary

~ubuntu-branches/ubuntu/maverick/liferea/maverick

« back to all changes in this revision

Viewing changes to src/render.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2009-03-10 23:47:50 UTC
  • mfrom: (1.2.55 upstream)
  • Revision ID: james.westby@ubuntu.com-20090310234750-lnvjgb81gggwyyd4
Tags: 1.4.26-0ubuntu1
https://launchpad.net/bugs/325750
https://launchpad.net/bugs/328606
* New upstream bugfix release (lp: #325750).
  - debian/patches/90_autoreconf: refreshed.
* debian/patches/notification_check_for_actions_support:
  - New patch backported from upstream r4468, check for actions support
    in notifications before using them (lp: #328606).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/render.c
38
38
#include "itemlist.h"
39
39
#include "itemset.h"
40
40
#include "render.h"
 
41
#include "xml.h"
41
42
#include "ui/ui_htmlview.h"
42
43
#include "ui/ui_mainwindow.h"
43
44
 
356
357
        xmlOutputBufferClose(buf);
357
358
        xmlFreeDoc(resDoc);
358
359
        render_parameter_free(paramSet);
 
360
        
 
361
        if (output) {
 
362
                gchar *tmp;
359
363
                
360
 
        /* Return only the body contents */
361
 
        if(output) {
362
 
                gchar *tmp = strstr(output, "<body>");
 
364
                /* Disable Flash tags */
 
365
                if (!conf_get_bool_value (ALLOW_FLASH)) {
 
366
                        tmp = output;
 
367
                        output = xhtml_strip_flash (output);
 
368
                        g_free (tmp);
 
369
                }
 
370
        
 
371
                /* Return only the body contents */
 
372
                tmp = strstr(output, "<body>");
363
373
                if(tmp) {
364
374
                        tmp = g_strdup(tmp + 6);
365
375
                        xmlFree(output);