Attachment #186946 for bug #238554

Lines 37-42 Link Here

(-)trunk/lib/engine/components/resource-list/rl-entry-ref.cpp (-2 / +3 lines)
37		37
38	#include "config.h"	38	#include "config.h"
39		39
		40	#include <glib/gi18n-lib.h>
		41
40	#include "rl-entry-ref.h"	42	#include "rl-entry-ref.h"
41		43
42	#include "presence-core.h"	44	#include "presence-core.h"
Lines 131-138 Link Here
131	sigc::mem_fun (this, &RL::EntryRef::refresh));	133	sigc::mem_fun (this, &RL::EntryRef::refresh));
132		134
133	if ( !uri.empty ())	135	if ( !uri.empty ())
134	populated =	136	populated = presence_core->populate_presentity_menu (gmref_ptr<Ekiga::Presentity> (this), uri, builder)
135	presence_core->populate_presentity_menu (*this, uri, builder)
136	\|\| populated;	137	\|\| populated;
137		138
138	return populated;	139	return populated;

Lines 37-42 Link Here

(-)trunk/lib/engine/components/resource-list/rl-entry.cpp (-2 / +3 lines)
37		37
38	#include "config.h"	38	#include "config.h"
39		39
		40	#include <glib/gi18n-lib.h>
		41
40	#include "rl-entry.h"	42	#include "rl-entry.h"
41		43
42	#include "presence-core.h"	44	#include "presence-core.h"
Lines 144-151 Link Here
144	sigc::mem_fun (this, &RL::Entry::refresh));	146	sigc::mem_fun (this, &RL::Entry::refresh));
145		147
146	if ( !uri.empty ())	148	if ( !uri.empty ())
147	populated =	149	populated = presence_core->populate_presentity_menu (gmref_ptr<Ekiga::Presentity> (this), uri, builder)
148	presence_core->populate_presentity_menu (*this, uri, builder)
149	\|\| populated;	150	\|\| populated;
150		151
151	return populated;	152	return populated;

Lines 38-43 Link Here

(-)trunk/lib/engine/components/resource-list/rl-list.cpp (-4 / +8 lines)
38	#include "config.h"	38	#include "config.h"
39		39
40	#include <glib.h>	40	#include <glib.h>
		41	#include <glib/gi18n-lib.h>
41		42
42	#include "rl-list.h"	43	#include "rl-list.h"
43		44
Lines 320-327 Link Here
320	&& child->name != NULL	321	&& child->name != NULL
321	&& xmlStrEqual (BAD_CAST "list", child->name)) {	322	&& xmlStrEqual (BAD_CAST "list", child->name)) {
322		323
323	gmref_ptr<List> list = new List (core, path,	324	gmref_ptr<List> list = gmref_ptr<List> (new List (core, path,
324	list_pos, display_name, child);	325	list_pos, display_name,
		326	child));
325	list->entry_added.connect (entry_added.make_slot ());	327	list->entry_added.connect (entry_added.make_slot ());
326	list->entry_updated.connect (entry_updated.make_slot ());	328	list->entry_updated.connect (entry_updated.make_slot ());
327	list->entry_removed.connect (entry_removed.make_slot ());	329	list->entry_removed.connect (entry_removed.make_slot ());
Lines 336-343 Link Here
336	&& child->name != NULL	338	&& child->name != NULL
337	&& xmlStrEqual (BAD_CAST "entry", child->name)) {	339	&& xmlStrEqual (BAD_CAST "entry", child->name)) {
338		340
339	gmref_ptr<Entry> entry = new Entry (core, path,	341	gmref_ptr<Entry> entry = gmref_ptr<Entry> (new Entry (core, path,
340	entry_pos, display_name, child);	342	entry_pos,
		343	display_name,
		344	child));
341	std::list<sigc::connection> conns;	345	std::list<sigc::connection> conns;
342	conns.push_back (entry->updated.connect (sigc::bind (entry_updated.make_slot (), entry)));	346	conns.push_back (entry->updated.connect (sigc::bind (entry_updated.make_slot (), entry)));
343	conns.push_back (entry->removed.connect (sigc::bind (entry_removed.make_slot (), entry)));	347	conns.push_back (entry->removed.connect (sigc::bind (entry_removed.make_slot (), entry)));

Return to bug 238554