← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/parsers/cdf_item.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/cdf_item.c
49
49
        ctxt->item = item_new();
50
50
        
51
51
        /* save the item link */
52
 
        if(!(tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href"))))
53
 
                tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF"));
 
52
        if(!(tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href")))
 
53
                tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF");
54
54
        if(tmp) {
55
55
                item_set_source(ctxt->item, tmp);
56
56
                g_free(tmp);
67
67
                /* save first link to a channel image */
68
68
                if(NULL != (tmp = g_ascii_strdown((gchar *)cur->name, -1))) {
69
69
                        if(NULL != (tmp2 = g_hash_table_lookup(CDFToMetadataMapping, tmp))) {
70
 
                                if(NULL != (tmp3 = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE)))) {
 
70
                                if(NULL != (tmp3 = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, TRUE))) {
71
71
                                        ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, tmp2, tmp3);
72
72
                                        g_free(tmp3);
73
73
                                }
77
77
                
78
78
                if((!xmlStrcasecmp(cur->name, BAD_CAST"logo"))) {
79
79
                        
80
 
                        if(!(tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href"))))
81
 
                                tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF"));
 
80
                        if(!(tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href")))
 
81
                                tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF");
82
82
                        if(tmp) {
83
83
                                ctxt->item->metadata = metadata_list_append(ctxt->item->metadata, "imageUrl", tmp);
84
84
                                g_free(tmp);
91
91
                        }
92
92
                        
93
93
                } else if((!xmlStrcasecmp(cur->name, BAD_CAST"abstract"))) {
94
 
                        if(NULL != (tmp = common_utf8_fix((gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1)))) {
 
94
                        if(NULL != (tmp = (gchar *)xmlNodeListGetString(cur->doc, cur->xmlChildrenNode, 1))) {
95
95
                                item_set_description(ctxt->item, tmp);
96
96
                                g_free(tmp);
97
97
                        }
98
98
                        
99
99
                } else if((!xmlStrcasecmp(cur->name, BAD_CAST"a"))) {
100
 
                        if(!(tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"href"))))
101
 
                                tmp = common_utf8_fix((gchar *)xmlGetProp(cur, BAD_CAST"HREF"));
 
100
                        if(!(tmp = (gchar *)xmlGetProp(cur, BAD_CAST"href")))
 
101
                                tmp = (gchar *)xmlGetProp(cur, BAD_CAST"HREF");
102
102
                        if(tmp) {
103
103
                                item_set_source(ctxt->item, tmp);
104
104
                                g_free(tmp);