[ekiga] Call History: Use theme icons instead of our own.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Call History: Use theme icons instead of our own.
- Date: Sat, 29 Sep 2012 16:35:00 +0000 (UTC)
commit d085a5439ef9fbef5681cb55a112f0d6e2d07da9
Author: Damien Sandras <dsandras beip be>
Date: Sat Sep 29 17:19:22 2012 +0200
Call History: Use theme icons instead of our own.
.../gui/gtk-frontend/call-history-view-gtk.cpp | 9 ++++-----
lib/gui/gmstockicons.c | 3 ---
pixmaps/16x16/call-missed.png | Bin 409 -> 0 bytes
pixmaps/16x16/call-placed.png | Bin 655 -> 0 bytes
pixmaps/16x16/call-received.png | Bin 676 -> 0 bytes
pixmaps/Makefile.am | 6 ------
6 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index 2303e01..1857e39 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -45,7 +45,6 @@
#include "menu-builder-tools.h"
#include "menu-builder-gtk.h"
#include "gm-cell-renderer-bitext.h"
-#include "gmstockicons.h"
struct _CallHistoryViewGtkPrivate
@@ -99,17 +98,17 @@ on_contact_added (Ekiga::ContactPtr contact,
case History::RECEIVED:
- id = "call-received";
+ id = "back";
break;
case History::PLACED:
- id = "call-placed";
+ id = "forward";
break;
case History::MISSED:
- id = "call-missed";
+ id = "gtk-close";
break;
default:
@@ -344,7 +343,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book)
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_add_attribute (column, renderer,
- "icon_name", COLUMN_PIXBUF);
+ "icon-name", COLUMN_PIXBUF);
/* show name and text */
renderer = gm_cell_renderer_bitext_new ();
diff --git a/lib/gui/gmstockicons.c b/lib/gui/gmstockicons.c
index db61dfd..f6a08ac 100644
--- a/lib/gui/gmstockicons.c
+++ b/lib/gui/gmstockicons.c
@@ -58,9 +58,6 @@ gnomemeeting_stock_icons_init (void)
{
{ "audio-volume", 16, gm_audio_volume_16 },
{ "brightness", 16, gm_brightness_16},
- { "call-placed", 16, gm_call_placed_16},
- { "call-missed", 16, gm_call_missed_16},
- { "call-received", 16, gm_call_received_16},
{ "call-transfer", 16, gm_call_transfer_16},
{ "color", 16, gm_color_16},
{ "contrast", 16, gm_contrast_16},
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 6c9d04c..8a22848 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -28,9 +28,6 @@ IMAGES_FILES= \
256x256/multimedia-headset.png \
16x16/audio-volume.png \
16x16/brightness.png \
- 16x16/call-placed.png \
- 16x16/call-missed.png \
- 16x16/call-received.png \
16x16/call-transfer.png \
16x16/color.png \
16x16/contrast.png \
@@ -56,9 +53,6 @@ IMAGES_FILES= \
IMAGES= \
gm_audio_volume_16 $(srcdir)/16x16/audio-volume.png \
gm_brightness_16 $(srcdir)/16x16/brightness.png \
- gm_call_placed_16 $(srcdir)/16x16/call-placed.png \
- gm_call_missed_16 $(srcdir)/16x16/call-missed.png \
- gm_call_received_16 $(srcdir)/16x16/call-received.png \
gm_call_transfer_16 $(srcdir)/16x16/call-transfer.png \
gm_color_16 $(srcdir)/16x16/color.png \
gm_contrast_16 $(srcdir)/16x16/contrast.png \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]