[ekiga] Icons: Dropped useless icons.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Icons: Dropped useless icons.
- Date: Sun, 6 May 2012 11:06:03 +0000 (UTC)
commit d488e65b29001313a2291761f99981521156d3b5
Author: Damien Sandras <dsandras beip be>
Date: Sun May 6 13:05:35 2012 +0200
Icons: Dropped useless icons.
lib/engine/gui/gtk-frontend/book-view-gtk.cpp | 14 ++++----------
lib/engine/gui/gtk-frontend/call-window.cpp | 2 +-
pixmaps/Makefile.am | 12 ------------
pixmaps/status-away.png | Bin 661 -> 0 bytes
pixmaps/status-dnd.png | Bin 615 -> 0 bytes
pixmaps/status-freeforchat.png | Bin 919 -> 0 bytes
pixmaps/status-offline.png | Bin 745 -> 0 bytes
pixmaps/status-online.png | Bin 641 -> 0 bytes
pixmaps/status-unknown.png | Bin 846 -> 0 bytes
9 files changed, 5 insertions(+), 23 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index e40b89c..592c031 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -387,18 +387,13 @@ book_view_gtk_update_contact (BookViewGtk *self,
Ekiga::ContactPtr contact,
GtkTreeIter *iter)
{
- GdkPixbuf *icon = NULL;
GtkListStore *store = NULL;
store = GTK_LIST_STORE (gtk_tree_view_get_model (self->priv->tree_view));
- icon = gtk_widget_render_icon (GTK_WIDGET (self->priv->tree_view),
- GM_STOCK_STATUS_UNKNOWN, GTK_ICON_SIZE_MENU, NULL);
-
gtk_list_store_set (store, iter,
- COLUMN_PIXBUF, icon,
+ COLUMN_PIXBUF, "avatar-default",
COLUMN_NAME, contact->get_name ().c_str (),
-1);
- g_object_unref (icon);
if (GDK_IS_WINDOW (GTK_WIDGET (self)->window))
gdk_window_set_cursor (GTK_WIDGET (self)->window, NULL);
@@ -572,10 +567,9 @@ book_view_gtk_new (Ekiga::BookPtr book)
column = gtk_tree_view_column_new ();
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
- gtk_tree_view_column_set_attributes (column, renderer,
- "pixbuf", COLUMN_PIXBUF,
- NULL);
-
+ gtk_tree_view_column_add_attribute (column, renderer,
+ "icon-name",
+ COLUMN_PIXBUF);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 7443051..9cf33a0 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -2316,7 +2316,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
gtk_frame_set_shadow_type (GTK_FRAME (cw->priv->call_frame), GTK_SHADOW_ETCHED_IN);
hbox = gtk_hbox_new (false, 2);
- image = gtk_image_new_from_stock (GM_STOCK_STATUS_UNKNOWN, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("avatar-default", GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 2);
cw->priv->info_text = gtk_text_view_new ();
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index bbeab17..b8752d5 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -45,12 +45,6 @@ IMAGES_FILES= \
call-missed.png \
call-received.png \
call-transfer.png \
- status-online.png \
- status-offline.png \
- status-unknown.png \
- status-away.png \
- status-freeforchat.png \
- status-dnd.png \
status-inacall.png \
status-ringing.png \
ekiga-logo.png \
@@ -85,7 +79,6 @@ IMAGES= \
gm_system_search_16_stock_data $(srcdir)/16x16/system-search.png \
gm_whiteness_16_stock_data $(srcdir)/16x16/stock_channel-blue.png \
gm_color_brightness_contrast_stock_data $(srcdir)/color-brightness-contrast.png \
- gm_status_freeforchat_stock_data $(srcdir)/status-freeforchat.png \
gm_remote_contact_stock_data $(srcdir)/remote_contact.png \
gm_local_contact_stock_data $(srcdir)/local_contact.png \
gm_message_stock_data $(srcdir)/message.png \
@@ -93,13 +86,8 @@ IMAGES= \
gm_call_received_stock_data $(srcdir)/call-received.png \
gm_call_missed_stock_data $(srcdir)/call-missed.png \
gm_call_transfer_stock_data $(srcdir)/call-transfer.png \
- gm_status_online_stock_data $(srcdir)/status-online.png \
- gm_status_offline_stock_data $(srcdir)/status-offline.png \
- gm_status_unknown_stock_data $(srcdir)/status-unknown.png \
- gm_status_dnd_stock_data $(srcdir)/status-dnd.png \
gm_status_inacall_stock_data_16 $(srcdir)/16x16/multimedia-headset.png \
gm_status_ringing_stock_data_16 $(srcdir)/status-ringing.png \
- gm_status_away_stock_data $(srcdir)/status-away.png \
gm_phone_hang_up_stock_data_24 $(srcdir)/24x24/phone-hang-up.png \
gm_phone_pick_up_stock_data_24 $(srcdir)/24x24/phone-pick-up.png \
gm_phone_hang_up_stock_data_16 $(srcdir)/16x16/phone-hang-up.png \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]