← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/parsers/ns_slash.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_slash.c
50
50
        gchar   *tmp = NULL, *section, *department;
51
51
        
52
52
        if (!xmlStrcmp (BAD_CAST"section", cur->name)) {
53
 
                tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1));
 
53
                tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1);
54
54
                if (tmp)
55
55
                        g_hash_table_insert (ctxt->item->tmpdata, "slash:section", tmp);
56
56
                        
57
57
        } else if (!xmlStrcmp (BAD_CAST"department", cur->name)) {
58
 
                tmp = common_utf8_fix ((gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1));
 
58
                tmp = (gchar *)xmlNodeListGetString (cur->doc, cur->xmlChildrenNode, 1);
59
59
                if (tmp)
60
60
                        g_hash_table_insert(ctxt->item->tmpdata, "slash:department", tmp);
61
61
        }