← Back to branch summary

~ubuntu-branches/ubuntu/karmic/ekiga/karmic

« back to all changes in this revision

Viewing changes to lib/engine/components/avahi/avahi-cluster.h

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2009-07-22 16:04:41 UTC
  • mfrom: (1.1.10 upstream) (1.4.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090722160441-s0n16jljj8zx1qd7
Tags: 3.2.5-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - debian/patches/ubuntu_lpi.patch: Launchpad integration.
  - Run autoreconf during build.
* Ubuntu changes dropped:
  - Replace libpt2.6.1-dev with libpt-dev in the Build-Depends.
* Enable quilt usage again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/engine/components/avahi/avahi-cluster.h
52
52
 
53
53
  class Cluster:
54
54
    public Ekiga::Service,
55
 
    public Ekiga::ClusterImpl<Heap>
 
55
    public Ekiga::ClusterImpl<Heap>,
 
56
    public sigc::trackable
56
57
  {
57
58
  public:
58
59
 
73
74
  private:
74
75
 
75
76
    Ekiga::ServiceCore &core;
76
 
    gmref_ptr<Heap> heap;
 
77
    HeapPtr heap;
77
78
  };
78
79
 
 
80
  typedef gmref_ptr<Cluster> ClusterPtr;
 
81
 
79
82
/**
80
83
 * @}
81
84
 */