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

« back to all changes in this revision

Viewing changes to lib/engine/components/resource-list/rl-heap.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:
49
49
  public:
50
50
 
51
51
    Heap (Ekiga::ServiceCore& services_,
 
52
          std::tr1::shared_ptr<xmlDoc> doc_,
52
53
          xmlNodePtr node);
53
54
 
54
55
    /* name: the name of the Heap in the GUI
62
63
     *
63
64
     */
64
65
    Heap (Ekiga::ServiceCore& core_,
 
66
          std::tr1::shared_ptr<xmlDoc> doc_,
65
67
          const std::string name_,
66
68
          const std::string root_,
67
69
          const std::string user_,
73
75
 
74
76
    const std::string get_name () const;
75
77
 
76
 
    void visit_presentities (sigc::slot1<bool, gmref_ptr<Ekiga::Presentity> > visitor);
 
78
    void visit_presentities (sigc::slot1<bool, Ekiga::PresentityPtr > visitor);
77
79
 
78
80
    bool populate_menu (Ekiga::MenuBuilder& builder);
79
81
 
101
103
    xmlNodePtr username;
102
104
    xmlNodePtr password;
103
105
 
104
 
    xmlDocPtr doc;
 
106
    std::tr1::shared_ptr<xmlDoc> doc;
105
107
    xmlNodePtr list_node;
106
108
 
107
 
    std::map<gmref_ptr<Presentity>, std::list<sigc::connection> > presentities;
 
109
    std::map<PresentityPtr, std::list<sigc::connection> > presentities;
108
110
 
109
111
    void refresh ();
110
112
 
123
125
                                      Ekiga::Form& result);
124
126
    void new_entry_result (std::string error);
125
127
  };
 
128
 
 
129
  typedef gmref_ptr<Heap> HeapPtr;
 
130
 
126
131
};
127
132
 
128
133
#endif