[ekiga] Removed the get_avatar method from Ekiga::Presentity

[Julien Puydt <jpuydt src gnome org>]

commit 5ab15273e81cad64073280e1200136db1bd2da98
Author: Julien Puydt <jpuydt gnome org>
Date:   Mon Sep 28 17:03:36 2009 +0200

    Removed the get_avatar method from Ekiga::Presentity
    
    It's not seriously used and that's one thing less in the way to fusion the
    contact and presentity stacks. It should be pretty straightforward to add
    back later on.

 lib/engine/components/echo/echo-presentity.cpp     |    6 ------
 lib/engine/components/echo/echo-presentity.h       |    2 --
 .../components/local-roster/local-presentity.cpp   |    7 -------
 .../components/local-roster/local-presentity.h     |    3 ---
 lib/engine/gui/gtk-frontend/presentity-view.cpp    |    9 ---------
 lib/engine/presence/presentity.h                   |    5 -----
 lib/engine/presence/proxy-presentity.cpp           |    6 ------
 lib/engine/presence/proxy-presentity.h             |    2 --
 lib/engine/presence/uri-presentity.cpp             |    6 ------
 lib/engine/presence/uri-presentity.h               |    3 ---
 plugins/loudmouth/loudmouth-presentity.cpp         |    6 ------
 plugins/loudmouth/loudmouth-presentity.h           |    2 --
 plugins/resource-list/rl-entry-ref.h               |    3 ---
 plugins/resource-list/rl-entry.h                   |    3 ---
 plugins/resource-list/rl-presentity.cpp            |    9 +--------
 plugins/resource-list/rl-presentity.h              |    3 ---
 16 files changed, 1 insertions(+), 74 deletions(-)
---
diff --git a/lib/engine/components/echo/echo-presentity.cpp b/lib/engine/components/echo/echo-presentity.cpp
index 7067bf8..fe04e56 100644
--- a/lib/engine/components/echo/echo-presentity.cpp
+++ b/lib/engine/components/echo/echo-presentity.cpp
@@ -66,12 +66,6 @@ Echo::Presentity::get_status () const
   return "ready";
 }
 
-const std::string
-Echo::Presentity::get_avatar () const
-{
-  return ""; // FIXME
-}
-
 const std::set<std::string>
 Echo::Presentity::get_groups () const
 {
diff --git a/lib/engine/components/echo/echo-presentity.h b/lib/engine/components/echo/echo-presentity.h
index f3560f0..1fe2c61 100644
--- a/lib/engine/components/echo/echo-presentity.h
+++ b/lib/engine/components/echo/echo-presentity.h
@@ -55,8 +55,6 @@ namespace Echo
 
     const std::string get_status () const;
 
-    const std::string get_avatar () const;
-
     const std::set<std::string> get_groups () const;
 
     const std::string get_uri () const;
diff --git a/lib/engine/components/local-roster/local-presentity.cpp b/lib/engine/components/local-roster/local-presentity.cpp
index e0fc946..6749357 100644
--- a/lib/engine/components/local-roster/local-presentity.cpp
+++ b/lib/engine/components/local-roster/local-presentity.cpp
@@ -139,13 +139,6 @@ Local::Presentity::get_status () const
 }
 
 
-const std::string
-Local::Presentity::get_avatar () const
-{
-  return avatar;
-}
-
-
 const std::set<std::string>
 Local::Presentity::get_groups () const
 {
diff --git a/lib/engine/components/local-roster/local-presentity.h b/lib/engine/components/local-roster/local-presentity.h
index 138ed26..481224d 100644
--- a/lib/engine/components/local-roster/local-presentity.h
+++ b/lib/engine/components/local-roster/local-presentity.h
@@ -94,8 +94,6 @@ namespace Local
 
     const std::string get_status () const;
 
-    const std::string get_avatar () const;
-
     const std::set<std::string> get_groups () const;
 
     const std::string get_uri () const;
@@ -190,7 +188,6 @@ namespace Local
 
     std::string presence;
     std::string status;
-    std::string avatar;
   };
 
   typedef boost::shared_ptr<Presentity> PresentityPtr;
diff --git a/lib/engine/gui/gtk-frontend/presentity-view.cpp b/lib/engine/gui/gtk-frontend/presentity-view.cpp
index db2cc07..7198edb 100644
--- a/lib/engine/gui/gtk-frontend/presentity-view.cpp
+++ b/lib/engine/gui/gtk-frontend/presentity-view.cpp
@@ -46,7 +46,6 @@ struct _PresentityViewPrivate
   /* we contain those, so no need to unref them */
   GtkWidget* presence_image;
   GtkWidget* name_status;
-  GtkWidget* avatar_image;
 };
 
 enum {
@@ -88,9 +87,6 @@ on_presentity_updated (PresentityView* self)
 
   gtk_label_set_markup (GTK_LABEL (self->priv->name_status), txt);
   g_free (txt);
-  gtk_image_set_from_stock (GTK_IMAGE (self->priv->avatar_image),
-			    self->priv->presentity->get_avatar ().c_str (),
-			    GTK_ICON_SIZE_MENU);
 }
 
 static void
@@ -208,11 +204,6 @@ presentity_view_init (GTypeInstance* instance,
   gtk_box_pack_start (GTK_BOX (self), self->priv->name_status,
 		      FALSE, TRUE, 2);
   gtk_widget_show (self->priv->name_status);
-
-  self->priv->avatar_image = gtk_image_new ();
-  gtk_box_pack_start (GTK_BOX (self), self->priv->avatar_image,
-		      FALSE, FALSE, 2);
-  gtk_widget_show (self->priv->avatar_image);
 }
 
 
diff --git a/lib/engine/presence/presentity.h b/lib/engine/presence/presentity.h
index e0840ee..0a3a972 100644
--- a/lib/engine/presence/presentity.h
+++ b/lib/engine/presence/presentity.h
@@ -75,11 +75,6 @@ namespace Ekiga
      */
     virtual const std::string get_status () const = 0;
 
-    /** Returns the avatar of the Presentity.
-     * @return The Presentity's avatar.
-     */
-    virtual const std::string get_avatar () const = 0;
-
     /** Returns the set of groups the Presentity belongs to.
      * @return The Presentity's set of groups.
      */
diff --git a/lib/engine/presence/proxy-presentity.cpp b/lib/engine/presence/proxy-presentity.cpp
index 4626c3c..09e57aa 100644
--- a/lib/engine/presence/proxy-presentity.cpp
+++ b/lib/engine/presence/proxy-presentity.cpp
@@ -64,12 +64,6 @@ Ekiga::ProxyPresentity::get_status () const
   return presentity.get_status ();
 }
 
-const std::string
-Ekiga::ProxyPresentity::get_avatar () const
-{
-  return presentity.get_avatar ();
-}
-
 const std::set<std::string>
 Ekiga::ProxyPresentity::get_groups () const
 {
diff --git a/lib/engine/presence/proxy-presentity.h b/lib/engine/presence/proxy-presentity.h
index d038d1b..b4d10a9 100644
--- a/lib/engine/presence/proxy-presentity.h
+++ b/lib/engine/presence/proxy-presentity.h
@@ -80,8 +80,6 @@ namespace Ekiga
 
     const std::string get_status () const;
 
-    const std::string get_avatar () const;
-
     const std::set<std::string> get_groups () const;
 
     /** Populates the given Ekiga::MenuBuilder with the actions.
diff --git a/lib/engine/presence/uri-presentity.cpp b/lib/engine/presence/uri-presentity.cpp
index 2478624..2e10925 100644
--- a/lib/engine/presence/uri-presentity.cpp
+++ b/lib/engine/presence/uri-presentity.cpp
@@ -82,12 +82,6 @@ Ekiga::URIPresentity::get_status () const
   return status;
 }
 
-const std::string
-Ekiga::URIPresentity::get_avatar () const
-{
-  return avatar;
-}
-
 const std::set<std::string>
 Ekiga::URIPresentity::get_groups () const
 {
diff --git a/lib/engine/presence/uri-presentity.h b/lib/engine/presence/uri-presentity.h
index ebeb791..b2520d7 100644
--- a/lib/engine/presence/uri-presentity.h
+++ b/lib/engine/presence/uri-presentity.h
@@ -84,8 +84,6 @@ namespace Ekiga
 
     const std::string get_status () const;
 
-    const std::string get_avatar () const;
-
     const std::set<std::string> get_groups () const;
 
     const std::string get_uri () const;
@@ -104,7 +102,6 @@ namespace Ekiga
     std::string presence;
     std::set<std::string> groups;
     std::string status;
-    std::string avatar;
 
     void on_presence_received (std::string uri_,
 			       std::string presence_);
diff --git a/plugins/loudmouth/loudmouth-presentity.cpp b/plugins/loudmouth/loudmouth-presentity.cpp
index 237da91..8bfcfbb 100644
--- a/plugins/loudmouth/loudmouth-presentity.cpp
+++ b/plugins/loudmouth/loudmouth-presentity.cpp
@@ -123,12 +123,6 @@ LM::Presentity::get_status () const
   return result;
 }
 
-const std::string
-LM::Presentity::get_avatar () const
-{
-  return "FIXME";
-}
-
 const std::set<std::string>
 LM::Presentity::get_groups () const
 {
diff --git a/plugins/loudmouth/loudmouth-presentity.h b/plugins/loudmouth/loudmouth-presentity.h
index 7030c0e..a50def4 100644
--- a/plugins/loudmouth/loudmouth-presentity.h
+++ b/plugins/loudmouth/loudmouth-presentity.h
@@ -59,8 +59,6 @@ namespace LM
 
     const std::string get_status () const;
 
-    const std::string get_avatar () const;
-
     const std::set<std::string> get_groups () const;
 
     bool populate_menu (Ekiga::MenuBuilder& builder);
diff --git a/plugins/resource-list/rl-entry-ref.h b/plugins/resource-list/rl-entry-ref.h
index 5195ab5..52a5922 100644
--- a/plugins/resource-list/rl-entry-ref.h
+++ b/plugins/resource-list/rl-entry-ref.h
@@ -79,9 +79,6 @@ namespace RL {
     const std::string get_status () const
     { return status; }
 
-    const std::string get_avatar () const
-    { return ""; }
-
     const std::set<std::string> get_groups () const
     { return groups; }
 
diff --git a/plugins/resource-list/rl-entry.h b/plugins/resource-list/rl-entry.h
index 10e8bf5..03cd2d7 100644
--- a/plugins/resource-list/rl-entry.h
+++ b/plugins/resource-list/rl-entry.h
@@ -79,9 +79,6 @@ namespace RL {
     const std::string get_status () const
     { return status; }
 
-    const std::string get_avatar () const
-    { return ""; }
-
     const std::set<std::string> get_groups () const
     { return groups; }
 
diff --git a/plugins/resource-list/rl-presentity.cpp b/plugins/resource-list/rl-presentity.cpp
index fea6d8f..ee4bbe6 100644
--- a/plugins/resource-list/rl-presentity.cpp
+++ b/plugins/resource-list/rl-presentity.cpp
@@ -61,7 +61,7 @@ RL::Presentity::Presentity (Ekiga::ServiceCore &services_,
 			    xmlNodePtr node_,
 			    bool writable_) :
   services(services_), doc(doc_), node(node_), writable(writable_),
-  name_node(NULL), presence("unknown"), status(""), avatar("")
+  name_node(NULL), presence("unknown"), status("")
 {
   boost::shared_ptr<Ekiga::PresenceCore> presence_core(services.get<Ekiga::PresenceCore> ("presence-core"));
   xmlChar *xml_str = NULL;
@@ -161,13 +161,6 @@ RL::Presentity::get_status () const
 }
 
 
-const std::string
-RL::Presentity::get_avatar () const
-{
-  return avatar;
-}
-
-
 const std::set<std::string>
 RL::Presentity::get_groups () const
 {
diff --git a/plugins/resource-list/rl-presentity.h b/plugins/resource-list/rl-presentity.h
index 43e37e9..20db41f 100644
--- a/plugins/resource-list/rl-presentity.h
+++ b/plugins/resource-list/rl-presentity.h
@@ -67,8 +67,6 @@ namespace RL
 
     const std::string get_status () const;
 
-    const std::string get_avatar () const;
-
     const std::set<std::string> get_groups () const;
 
     const std::string get_uri () const;
@@ -109,7 +107,6 @@ namespace RL
     std::string uri;
     std::string presence;
     std::string status;
-    std::string avatar;
 
     std::map<std::string, xmlNodePtr> group_nodes;
     std::set<std::string> groups;