← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/newsbin.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/newsbin.c
1
1
/**
2
2
 * @file newsbin.c  news bin node type implementation
3
3
 * 
4
 
 * Copyright (C) 2006-2009 Lars Lindner <lars.lindner@gmail.com>
 
4
 * Copyright (C) 2006-2010 Lars Lindner <lars.lindner@gmail.com>
5
5
 *
6
6
 * This program is free software; you can redistribute it and/or modify
7
7
 * it under the terms of the GNU General Public License as published by
30
30
#include "metadata.h"
31
31
#include "render.h"
32
32
#include "vfolder.h"
 
33
#include "ui/icons.h"
 
34
#include "ui/ui_node.h"
33
35
#include "ui/liferea_dialog.h"
34
 
#include "ui/ui_feedlist.h"
35
 
#include "ui/ui_node.h"
36
36
 
37
37
static GtkWidget *newnewsbindialog = NULL;
38
38
static GSList * newsbin_list = NULL;
67
67
static gchar *
68
68
newsbin_render (nodePtr node)
69
69
{
70
 
        renderParamPtr  params;
71
70
        gchar           *output = NULL;
72
71
        xmlDocPtr       doc;
73
72
 
74
73
        doc = feed_to_xml(node, NULL);
75
 
        params = render_parameter_new();
76
 
        render_parameter_add(params, "pixmapsDir='file://" PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "'");
77
 
        output = render_xml(doc, "newsbin", params);
 
74
        output = render_xml(doc, "newsbin", NULL);
78
75
        xmlFreeDoc(doc);
79
76
 
80
77
        return output;
153
150
                                                  NODE_CAPABILITY_SHOW_UNREAD_COUNT |
154
151
                                                  NODE_CAPABILITY_SHOW_ITEM_COUNT;
155
152
                nodeType->id                    = "newsbin";
156
 
                nodeType->icon                  = icons[ICON_NEWSBIN];
 
153
                nodeType->icon                  = icon_get (ICON_NEWSBIN);
157
154
                nodeType->load                  = feed_get_node_type()->load;           
158
155
                nodeType->import                = newsbin_import;
159
156
                nodeType->export                = feed_get_node_type()->export;