ekiga r7784 - trunk/lib/engine/components/resource-list

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Mar 17 20:28:41 2009
New Revision: 7784
URL: http://svn.gnome.org/viewvc/ekiga?rev=7784&view=rev

Log:
Fixed compilation problems in resource-list code

Modified:
   trunk/lib/engine/components/resource-list/rl-entry-ref.cpp
   trunk/lib/engine/components/resource-list/rl-entry.cpp
   trunk/lib/engine/components/resource-list/rl-list.cpp

Modified: trunk/lib/engine/components/resource-list/rl-entry-ref.cpp
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-entry-ref.cpp	(original)
+++ trunk/lib/engine/components/resource-list/rl-entry-ref.cpp	Tue Mar 17 20:28:41 2009
@@ -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;

Modified: trunk/lib/engine/components/resource-list/rl-entry.cpp
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-entry.cpp	(original)
+++ trunk/lib/engine/components/resource-list/rl-entry.cpp	Tue Mar 17 20:28:41 2009
@@ -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;

Modified: trunk/lib/engine/components/resource-list/rl-list.cpp
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-list.cpp	(original)
+++ trunk/lib/engine/components/resource-list/rl-list.cpp	Tue Mar 17 20:28:41 2009
@@ -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)));