ekiga r6746 - in trunk: lib/engine/gui/gtk-core lib/engine/gui/gtk-frontend lib/engine/presence/local-roster src/endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Sun Aug 31 09:17:35 2008
New Revision: 6746
URL: http://svn.gnome.org/viewvc/ekiga?rev=6746&view=rev

Log:
Fixed bug #550018

Modified:
   trunk/lib/engine/gui/gtk-core/gtk-core.cpp
   trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
   trunk/lib/engine/presence/local-roster/local-presentity.cpp
   trunk/src/endpoints/sip-endpoint.cpp
   trunk/src/endpoints/sip-presentity.cpp

Modified: trunk/lib/engine/gui/gtk-core/gtk-core.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/gtk-core.cpp	(original)
+++ trunk/lib/engine/gui/gtk-core/gtk-core.cpp	Sun Aug 31 09:17:35 2008
@@ -48,31 +48,31 @@
   gnomemeeting_stock_icons_init ();
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_ONLINE);
-  gtk_icon_factory_add (factory, "presence-online", icon_set);
+  gtk_icon_factory_add (factory, "online", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_OFFLINE);
-  gtk_icon_factory_add (factory, "presence-offline", icon_set);
+  gtk_icon_factory_add (factory, "offline", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_UNKNOWN);
-  gtk_icon_factory_add (factory, "presence-unknown", icon_set);
+  gtk_icon_factory_add (factory, "unknown", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_AWAY);
-  gtk_icon_factory_add (factory, "presence-away", icon_set);
+  gtk_icon_factory_add (factory, "away", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_DND);
-  gtk_icon_factory_add (factory, "presence-dnd", icon_set);
+  gtk_icon_factory_add (factory, "dnd", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_INACALL);
-  gtk_icon_factory_add (factory, "presence-inacall", icon_set);
+  gtk_icon_factory_add (factory, "inacall", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_FREEFORCHAT);
-  gtk_icon_factory_add (factory, "presence-freeforchat", icon_set);
+  gtk_icon_factory_add (factory, "freeforchat", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_ADD);

Modified: trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-window-page.cpp	Sun Aug 31 09:17:35 2008
@@ -526,7 +526,7 @@
   if (presentity.get_uri () == self->priv->uri) {
 
     gtk_image_set_from_stock (GTK_IMAGE (self->priv->tab_image), 
-                              "presence-unknown",
+                              "unknown",
                               GTK_ICON_SIZE_MENU);
     gtk_label_set_text (GTK_LABEL (self->priv->tab_label_name),
                         presentity.get_name ().c_str ());
@@ -799,7 +799,7 @@
 
   align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
   self->priv->tab_image = gtk_image_new ();
-  gtk_image_set_from_stock (GTK_IMAGE (self->priv->tab_image), "presence-unknown", GTK_ICON_SIZE_MENU);
+  gtk_image_set_from_stock (GTK_IMAGE (self->priv->tab_image), "unknown", GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (align), self->priv->tab_image);
   gtk_box_pack_start (GTK_BOX (self->priv->tab), align, FALSE, FALSE, 0);
 

Modified: trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	Sun Aug 31 09:17:35 2008
@@ -939,8 +939,8 @@
 
   roster_view_gtk_find_iter_for_heap (self, heap, &heap_iter);
 
-  active = presentity.get_presence () != "presence-offline";
-  away = presentity.get_presence () == "presence-away";
+  active = presentity.get_presence () != "offline";
+  away = presentity.get_presence () == "away";
 
   for (std::set<std::string>::const_iterator group = groups.begin ();
        group != groups.end ();

Modified: trunk/lib/engine/presence/local-roster/local-presentity.cpp
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-presentity.cpp	(original)
+++ trunk/lib/engine/presence/local-roster/local-presentity.cpp	Sun Aug 31 09:17:35 2008
@@ -50,7 +50,7 @@
  */
 Local::Presentity::Presentity (Ekiga::ServiceCore &_core,
 			       xmlNodePtr _node) :
-  core(_core), node(_node), name_node(NULL), presence("presence-unknown")
+  core(_core), node(_node), name_node(NULL), presence("unknown")
 {
   xmlChar *xml_str = NULL;
 
@@ -102,7 +102,7 @@
 			       const std::string _uri,
 			       const std::set<std::string> _groups) :
   core(_core), name_node(NULL), name(_name), uri(_uri),
-  presence("presence-unknown"), groups(_groups)
+  presence("unknown"), groups(_groups)
 {
   presence_core = dynamic_cast<Ekiga::PresenceCore*>(core.get ("presence-core"));
 
@@ -254,7 +254,7 @@
 
       presence_core->unfetch_presence (uri);
       uri = new_uri;
-      presence = "presence-unknown";
+      presence = "unknown";
       presence_core->fetch_presence (uri);
       xmlSetProp (node, (const xmlChar*)"uri", (const xmlChar*)uri.c_str ());
     }

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Sun Aug 31 09:17:35 2008
@@ -1056,24 +1056,24 @@
   PCaselessString s = note;
 
   std::string status;
-  std::string presence = "presence-unknown";
+  std::string presence = "unknown";
 
   if (b.Find ("Closed") != P_MAX_INDEX)
-    presence = "presence-offline";
+    presence = "offline";
   else
-    presence = "presence-online";
+    presence = "online";
 
   if (s.Find ("Away") != P_MAX_INDEX)
-    presence = "presence-away";
+    presence = "away";
   else if (s.Find ("On the phone") != P_MAX_INDEX
            || s.Find ("Ringing") != P_MAX_INDEX) 
-    presence = "presence-inacall";
+    presence = "inacall";
   else if (s.Find ("dnd") != P_MAX_INDEX
            || s.Find ("Do Not Disturb") != P_MAX_INDEX) 
-    presence = "presence-dnd";
+    presence = "dnd";
 
   else if (s.Find ("Free For Chat") != P_MAX_INDEX) 
-    presence = "presence-freeforchat";
+    presence = "freeforchat";
 
   if ((j = s.Find (" - ")) != P_MAX_INDEX)
     status = (const char *) note.Mid (j + 3);

Modified: trunk/src/endpoints/sip-presentity.cpp
==============================================================================
--- trunk/src/endpoints/sip-presentity.cpp	(original)
+++ trunk/src/endpoints/sip-presentity.cpp	Sun Aug 31 09:17:35 2008
@@ -38,7 +38,7 @@
 SIP::Presentity::Presentity (Ekiga::ServiceCore &_core,
 			     std::string name_,
 			     std::string uri_)
-  : core(_core), name(name_), uri(uri_), presence("presence-unknown")
+  : core(_core), name(name_), uri(uri_), presence("unknown")
 {
   presence_core = dynamic_cast<Ekiga::PresenceCore*>(core.get ("presence-core"));
   presence_core->presence_received.connect (sigc::mem_fun (this, &SIP::Presentity::on_presence_received));