← Back to branch summary

~ubuntu-branches/ubuntu/vivid/liferea/vivid-proposed

« back to all changes in this revision

Viewing changes to src/parsers/ns_itunes.c

  • Committer: Package Import Robot
  • Author(s): bojo42
  • Date: 2012-03-29 14:17:21 UTC
  • mfrom: (1.3.9) (3.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20120329141721-tbfopcrc5797wxt7
Tags: 1.8.3-0.1ubuntu1
https://launchpad.net/bugs/290666
https://launchpad.net/bugs/371754
https://launchpad.net/bugs/741543
https://launchpad.net/bugs/716688
https://launchpad.net/bugs/935147
* New upstream release (LP: #290666, #371754, #741543, #716688)
* Merge from Debian unstable (LP: #935147), remaining changes:
* debian/patches:
  - drop gtk-status-icon.patch & notification-append as in upstream
  - drop fix_systray_behavior as mostly upstreamed and rest seems unused
  - 01_ubuntu_feedlists: update & rename, move planets to "Open Source"  
  - add_X-Ubuntu-Gettext-Domain: rebase
  - libunity.patch: rebase, apply before indicator patch (liferea_shell.c)
  - libindicate_increase_version.patch: exclude from libindicate.patch
  - deactivate libindicate.patch, seems partly upstreamed and needs rework
* debian/control: libindicate-dev, libindicate-gtk-dev & libunity-dev
* debian/liferea.indicate & liferea.install: ship indicator desktop file
* debian/rules: enable libindicate

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/parsers/ns_itunes.c
40
40
        gchar *tmp;
41
41
        
42
42
        if (!xmlStrcmp(cur->name, BAD_CAST"author")) {
43
 
                tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1));
 
43
                tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1);
44
44
                if (tmp) {
45
45
                        ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "author", tmp);
46
46
                        g_free (tmp);
48
48
        }
49
49
        
50
50
        if (!xmlStrcmp (cur->name, BAD_CAST"summary")) {
51
 
                tmp = common_utf8_fix (xhtml_extract (cur, 0, NULL));
 
51
                tmp = xhtml_extract (cur, 0, NULL);
52
52
                item_set_description (ctxt->item, tmp);
53
53
                g_free (tmp);
54
54
        }
55
55
        
56
56
        if (!xmlStrcmp(cur->name, BAD_CAST"keywords")) {
57
 
                gchar *keyword = tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1));
 
57
                gchar *keyword = tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1);
 
58
                gchar *allocated = tmp;
58
59
                /* parse comma separated list and strip leading spaces... */
59
60
                while (tmp) {
60
61
                        tmp = strchr (tmp, ',');
68
69
                        ctxt->item->metadata = metadata_list_append (ctxt->item->metadata, "category", keyword);
69
70
                        keyword = tmp;
70
71
                }
71
 
                g_free (tmp);
 
72
                g_free (allocated);
72
73
        }
73
74
}
74
75
 
79
80
        const gchar *old;
80
81
 
81
82
        if (!xmlStrcmp (cur->name, BAD_CAST"summary") || !xmlStrcmp (cur->name, BAD_CAST"subtitle")) {
82
 
                tmp = common_utf8_fix (xhtml_extract (cur, 0, NULL));
 
83
                tmp = xhtml_extract (cur, 0, NULL);
83
84
                old = metadata_list_get (ctxt->subscription->metadata, "description");
84
85
                if (!old || strlen (old) < strlen (tmp))
85
86
                        metadata_list_set (&ctxt->subscription->metadata, "description", tmp);