1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
--- trunk/lib/engine/components/resource-list/rl-entry-ref.cpp 2009/01/05 17:10:55 7516
+++ trunk/lib/engine/components/resource-list/rl-entry-ref.cpp 2009/03/17 20:28:41 7784
@@ -37,6 +37,8 @@
#include "config.h"
+#include <glib/gi18n-lib.h>
+
#include "rl-entry-ref.h"
#include "presence-core.h"
@@ -131,8 +133,7 @@
sigc::mem_fun (this, &RL::EntryRef::refresh));
if ( !uri.empty ())
- populated =
- presence_core->populate_presentity_menu (*this, uri, builder)
+ populated = presence_core->populate_presentity_menu (gmref_ptr<Ekiga::Presentity> (this), uri, builder)
|| populated;
return populated;
--- trunk/lib/engine/components/resource-list/rl-entry.cpp 2009/01/05 17:10:55 7516
+++ trunk/lib/engine/components/resource-list/rl-entry.cpp 2009/03/17 20:28:41 7784
@@ -37,6 +37,8 @@
#include "config.h"
+#include <glib/gi18n-lib.h>
+
#include "rl-entry.h"
#include "presence-core.h"
@@ -144,8 +146,7 @@
sigc::mem_fun (this, &RL::Entry::refresh));
if ( !uri.empty ())
- populated =
- presence_core->populate_presentity_menu (*this, uri, builder)
+ populated = presence_core->populate_presentity_menu (gmref_ptr<Ekiga::Presentity> (this), uri, builder)
|| populated;
return populated;
--- trunk/lib/engine/components/resource-list/rl-list.cpp 2009/01/05 17:10:55 7516
+++ trunk/lib/engine/components/resource-list/rl-list.cpp 2009/03/17 20:28:41 7784
@@ -38,6 +38,7 @@
#include "config.h"
#include <glib.h>
+#include <glib/gi18n-lib.h>
#include "rl-list.h"
@@ -320,8 +321,9 @@
&& child->name != NULL
&& xmlStrEqual (BAD_CAST "list", child->name)) {
- gmref_ptr<List> list = new List (core, path,
- list_pos, display_name, child);
+ gmref_ptr<List> list = gmref_ptr<List> (new List (core, path,
+ list_pos, display_name,
+ child));
list->entry_added.connect (entry_added.make_slot ());
list->entry_updated.connect (entry_updated.make_slot ());
list->entry_removed.connect (entry_removed.make_slot ());
@@ -336,8 +338,10 @@
&& child->name != NULL
&& xmlStrEqual (BAD_CAST "entry", child->name)) {
- gmref_ptr<Entry> entry = new Entry (core, path,
- entry_pos, display_name, child);
+ gmref_ptr<Entry> entry = gmref_ptr<Entry> (new Entry (core, path,
+ entry_pos,
+ display_name,
+ child));
std::list<sigc::connection> conns;
conns.push_back (entry->updated.connect (sigc::bind (entry_updated.make_slot (), entry)));
conns.push_back (entry->removed.connect (sigc::bind (entry_removed.make_slot (), entry)));
|
GitWeb