ekiga r6452 - in trunk: lib/engine/gui/gtk-frontend src/endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon Jul 14 20:51:14 2008
New Revision: 6452
URL: http://svn.gnome.org/viewvc/ekiga?rev=6452&view=rev

Log:
Fix little problem where it occurs, not further down

Modified:
   trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
   trunk/src/endpoints/sip-presentity.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	Mon Jul 14 20:51:14 2008
@@ -76,14 +76,9 @@
 on_presentity_updated (PresentityView* self)
 {
   gchar *txt = NULL;
-  std::string presence;
-
-  presence = self->priv->presentity->get_presence ();
-  if (presence == "")
-    presence = "presence-unknown";
 
   gtk_image_set_from_stock (GTK_IMAGE (self->priv->presence_image),
-			    presence.c_str (),
+			    self->priv->presentity->get_presence ().c_str (),
 			    GTK_ICON_SIZE_LARGE_TOOLBAR);
   txt = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>\n<span size=\"small\">%s</span>",
 				 self->priv->presentity->get_name ().c_str (),

Modified: trunk/src/endpoints/sip-presentity.cpp
==============================================================================
--- trunk/src/endpoints/sip-presentity.cpp	(original)
+++ trunk/src/endpoints/sip-presentity.cpp	Mon Jul 14 20:51:14 2008
@@ -38,7 +38,7 @@
 SIP::Presentity::Presentity (Ekiga::ServiceCore &_core,
 			     std::string name_,
 			     std::string uri_)
-  : core(_core), name(name_), uri(uri_)
+  : core(_core), name(name_), uri(uri_), presence("presence-unknown")
 {
   presence_core = dynamic_cast<Ekiga::PresenceCore*>(core.get ("presence-core"));