[ekiga] More icons/pixmaps coming from the GTK+ theme.

[Damien Sandras <dsandras src gnome org>]

commit 8a1ea17edc368678ccd1df4a16696b2c2167f8e5
Author: Damien Sandras <dsandras beip be>
Date:   Thu May 17 14:53:19 2012 +0200

    More icons/pixmaps coming from the GTK+ theme.

 lib/engine/addressbook/book.h                      |    6 +++---
 lib/engine/components/call-history/history-book.h  |    2 +-
 lib/engine/gui/gtk-frontend/addressbook-window.cpp |   18 ++++++------------
 lib/gui/gmstockicons.c                             |    2 --
 lib/gui/gmstockicons.h                             |    2 --
 plugins/evolution/evolution-book.h                 |    2 +-
 plugins/kab/kab-book.h                             |    2 +-
 plugins/ldap/ldap-book.h                           |    2 +-
 8 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/lib/engine/addressbook/book.h b/lib/engine/addressbook/book.h
index 0a53c83..3712e2c 100644
--- a/lib/engine/addressbook/book.h
+++ b/lib/engine/addressbook/book.h
@@ -74,10 +74,10 @@ namespace Ekiga {
      */
     virtual const std::string get_status () const = 0;
 
-    
+
     /** Get the icon for the Book.
-     * The icon is a string and could be something like "local-object"
-     * or "remote-object"
+     * The icon is a string and could be something like "computer"
+     * or "network_server"
      *
      * This function is purely virtual and should be implemented by
      * the descendant of the Ekiga::Book, ie BookImpl or one
diff --git a/lib/engine/components/call-history/history-book.h b/lib/engine/components/call-history/history-book.h
index 5286c0f..3ee4f98 100644
--- a/lib/engine/components/call-history/history-book.h
+++ b/lib/engine/components/call-history/history-book.h
@@ -72,7 +72,7 @@ namespace History
     const std::string get_status () const;
 
     const std::string get_icon () const
-    { return "local-object"; }
+    { return "computer"; }
 
     /* more specific api */
 
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 235f826..bd72190 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -438,7 +438,6 @@ addressbook_window_add_book (AddressBookWindow *self,
   GtkTreeIter iter;
   GtkTreeModel *store = NULL;
   GtkWidget *view = NULL;
-  GdkPixbuf *icon = NULL;
 
   view = book_view_gtk_new (book);
 
@@ -450,21 +449,17 @@ addressbook_window_add_book (AddressBookWindow *self,
 
   g_signal_connect (view, "updated", G_CALLBACK (on_view_updated), self);
 
-  icon = gtk_widget_render_icon (GTK_WIDGET (self->priv->tree_view),
-				 book->get_icon ().c_str (),
-				 GTK_ICON_SIZE_MENU, NULL); 
-
   store = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->tree_view));
   gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
   gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
-                      COLUMN_PIXBUF, icon, 
                       COLUMN_NAME, book->get_name ().c_str (),
-                      COLUMN_BOOK_POINTER, book.get (), 
+                      COLUMN_BOOK_POINTER, book.get (),
                       COLUMN_VIEW, view,
+                      COLUMN_PIXBUF, book->get_icon ().c_str (),
                       -1);
 
   if (!gtk_tree_selection_get_selected (self->priv->selection, &store, &iter)) {
-   
+
     gtk_tree_model_get_iter_first (store, &iter);
     gtk_tree_selection_select_iter (self->priv->selection, &iter);
   }
@@ -678,7 +673,7 @@ addressbook_window_new (Ekiga::ContactCore &core)
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
   store = gtk_tree_store_new (NUM_COLUMNS,
-                              GDK_TYPE_PIXBUF,
+                              G_TYPE_STRING,
                               G_TYPE_STRING,
                               G_TYPE_POINTER,
                               G_TYPE_OBJECT);
@@ -692,9 +687,8 @@ addressbook_window_new (Ekiga::ContactCore &core)
   column = gtk_tree_view_column_new ();
   cell = gtk_cell_renderer_pixbuf_new ();
   gtk_tree_view_column_pack_start (column, cell, FALSE);
-  gtk_tree_view_column_set_attributes (column, cell,
-                                       "pixbuf", COLUMN_PIXBUF,
-                                       NULL);
+  gtk_tree_view_column_add_attribute (column, cell,
+                                      "icon-name", COLUMN_PIXBUF);
 
   cell = gtk_cell_renderer_text_new ();
   gtk_tree_view_column_pack_start (column, cell, FALSE);
diff --git a/lib/gui/gmstockicons.c b/lib/gui/gmstockicons.c
index 2575cbc..e4579cf 100644
--- a/lib/gui/gmstockicons.c
+++ b/lib/gui/gmstockicons.c
@@ -61,8 +61,6 @@ gnomemeeting_stock_icons_init (void)
 		{ GM_STOCK_STATUS_INACALL, gm_status_inacall_stock_data_16 },
 		{ GM_STOCK_STATUS_RINGING, gm_status_ringing_stock_data_16 },
 
-		{ GM_STOCK_REMOTE_OBJECT, gm_remote_contact_stock_data},
-		{ GM_STOCK_LOCAL_OBJECT, gm_local_contact_stock_data},
 		{ GM_STOCK_MESSAGE, gm_message_stock_data},
 		{ GM_STOCK_CALL_PLACED, gm_call_placed_stock_data},
 		{ GM_STOCK_CALL_MISSED, gm_call_missed_stock_data},
diff --git a/lib/gui/gmstockicons.h b/lib/gui/gmstockicons.h
index 0edfb33..3c6fae6 100644
--- a/lib/gui/gmstockicons.h
+++ b/lib/gui/gmstockicons.h
@@ -52,8 +52,6 @@ G_BEGIN_DECLS
 
 /* True stock icons */
 #define GM_STOCK_COLOR_BRIGHTNESS_CONTRAST   "gm_color_brightness_contrast_stock"
-#define GM_STOCK_LOCAL_OBJECT    "local-object"
-#define GM_STOCK_REMOTE_OBJECT   "remote-object"
 #define GM_STOCK_MESSAGE          "gm_message_stock"
 #define GM_STOCK_CALL_PLACED      "gm_call_placed_stock"
 #define GM_STOCK_CALL_MISSED      "gm_call_missed_stock"
diff --git a/plugins/evolution/evolution-book.h b/plugins/evolution/evolution-book.h
index a0d1679..e49bcf8 100644
--- a/plugins/evolution/evolution-book.h
+++ b/plugins/evolution/evolution-book.h
@@ -79,7 +79,7 @@ namespace Evolution
     const std::string get_status () const;
 
     const std::string get_icon () const
-    { return "local-object"; }
+    { return "computer"; }
 
     void refresh ();
 
diff --git a/plugins/kab/kab-book.h b/plugins/kab/kab-book.h
index 0275c8e..eb86b9e 100644
--- a/plugins/kab/kab-book.h
+++ b/plugins/kab/kab-book.h
@@ -68,7 +68,7 @@ namespace KAB
     { return "---"; }
 
     const std::string get_icon () const
-    { return "local-object"; }
+    { return "computer"; }
 
   private:
 
diff --git a/plugins/ldap/ldap-book.h b/plugins/ldap/ldap-book.h
index 87ff983..f02ba3b 100644
--- a/plugins/ldap/ldap-book.h
+++ b/plugins/ldap/ldap-book.h
@@ -116,7 +116,7 @@ namespace OPENLDAP
     const std::string get_status () const;
 
     const std::string get_icon () const
-    { return "remote-object"; }
+    { return "network-server"; }
 
     void refresh ();