← Back to branch summary

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

« back to all changes in this revision

Viewing changes to katze/katze-net.h

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-02-01 20:27:20 UTC
  • mfrom: (1.1.14 upstream) (3.3.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110201202720-xobt459otz1m6sas
Tags: 0.3.0-1.1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/control, debian/rules:
    + Change build-depends from libwebkit-dev to libwebkitgtk-dev.
* debian/patches/desktop-scheme-handler-types:
  - Dropped, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
katze/katze-net.h
37
37
GType
38
38
katze_net_get_type                       (void) G_GNUC_CONST;
39
39
 
40
 
KatzeNet*
41
 
katze_net_new                            (void);
42
 
 
43
 
gpointer
44
 
katze_net_get_session                    (KatzeNet*          net);
45
 
 
46
40
typedef enum
47
41
{
48
42
    KATZE_NET_VERIFIED,