← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/midori/oneiric-updates

« back to all changes in this revision

Viewing changes to midori/midori-array.c

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-05-18 21:07:34 UTC
  • mfrom: (1.1.16 upstream) (3.3.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110518210734-232wzq1tc88gtz2p
Tags: 0.3.6-1ubuntu1
https://launchpad.net/bugs/784944
* Merge from debian unstable. (LP: #784944) Remaining changes:
  - debian/control:
    + Change build-depends from libwebkit-dev to libwebkitgtk-dev
  - debian/rules:
    + Change package query from libwebkit-dev to libwebkitgtk-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
midori/midori-array.c
703
703
string_append_item (GString*   string,
704
704
                    KatzeItem* item)
705
705
{
706
 
    gchar* markup;
707
706
    gchar* metadata;
708
707
 
709
708
    g_return_if_fail (KATZE_IS_ITEM (item));
710
709
 
711
 
    markup = NULL;
712
710
    metadata = katze_item_metadata_to_xbel (item);
713
711
    if (KATZE_IS_ARRAY (item))
714
712
    {