[ekiga] Removed a bunch of icons. They are now coming from the GTK theme.



commit 776abdcccca9e621239806004c6062512e3bad0c
Author: Damien Sandras <dsandras beip be>
Date:   Thu May 17 14:11:32 2012 +0200

    Removed a bunch of icons. They are now coming from the GTK theme.

 lib/engine/gui/gtk-frontend/call-window.cpp |    5 ++---
 lib/gui/gmstockicons.c                      |    4 ----
 lib/gui/gmstockicons.h                      |    4 ----
 pixmaps/16x16/media-playback-pause.png      |  Bin 464 -> 0 bytes
 pixmaps/16x16/system-search.png             |  Bin 935 -> 0 bytes
 pixmaps/24x24/audio-input-microphone.png    |  Bin 801 -> 0 bytes
 pixmaps/24x24/contact-new.png               |  Bin 887 -> 0 bytes
 pixmaps/Makefile.am                         |    7 -------
 8 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 9cf33a0..8a5a0c3 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -1891,7 +1891,7 @@ gm_cw_audio_settings_window_new (EkigaCallWindow *cw)
   /* Input volume */
   hbox = gtk_hbox_new (false, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_image_new_from_icon_name (GM_ICON_MICROPHONE,
+		      gtk_image_new_from_icon_name ("audio-input-microphone",
 						    GTK_ICON_SIZE_SMALL_TOOLBAR),
 		      false, false, 0);
 
@@ -2418,8 +2418,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
   /* Call Pause */
   item = gtk_tool_item_new ();
   cw->priv->hold_button = gtk_toggle_button_new ();
-  image = gtk_image_new_from_icon_name (GM_ICON_MEDIA_PLAYBACK_PAUSE,
-                                        GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("media-playback-pause", GTK_ICON_SIZE_MENU);
   gtk_button_set_relief (GTK_BUTTON (cw->priv->hold_button), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER (cw->priv->hold_button), image);
   gtk_container_add (GTK_CONTAINER (item), cw->priv->hold_button);
diff --git a/lib/gui/gmstockicons.c b/lib/gui/gmstockicons.c
index ab13f67..2575cbc 100644
--- a/lib/gui/gmstockicons.c
+++ b/lib/gui/gmstockicons.c
@@ -84,7 +84,6 @@ gnomemeeting_stock_icons_init (void)
 
 	static const GmThemeIcon theme_builtins[] =
 	{
-		{ GM_ICON_ADD_CONTACT, 24, gm_add_contact_24_stock_data},
 	        { GM_ICON_AUDIO_VOLUME_HIGH, 16, gm_audio_volume_high_16_stock_data },
 		{ GM_ICON_BRIGHTNESS, 16, gm_brightness_16_stock_data},
 		{ GM_ICON_COLOURNESS, 16, gm_colourness_16_stock_data},
@@ -96,9 +95,6 @@ gnomemeeting_stock_icons_init (void)
 	        { GM_ICON_LOGO, 48, gm_logo_48_stock_data },
 	        { GM_ICON_LOGO, 72, gm_logo_72_stock_data },
 		{ GM_ICON_AVATAR, 256, gm_avatar_256_stock_data},
-		{ GM_ICON_MEDIA_PLAYBACK_PAUSE, 16, gm_media_playback_pause_16_stock_data },
-		{ GM_ICON_MICROPHONE, 24, gm_microphone_24_stock_data },
-		{ GM_ICON_SYSTEM_SEARCH, 16, gm_system_search_16_stock_data},
 		{ GM_ICON_WHITENESS, 16, gm_whiteness_16_stock_data},
 	};
 
diff --git a/lib/gui/gmstockicons.h b/lib/gui/gmstockicons.h
index 1745638..0edfb33 100644
--- a/lib/gui/gmstockicons.h
+++ b/lib/gui/gmstockicons.h
@@ -40,16 +40,12 @@
 G_BEGIN_DECLS
 
 /* Icon theme builtins */
-#define GM_ICON_ADD_CONTACT                "contact-new"
 #define GM_ICON_AUDIO_VOLUME_HIGH          "audio-volume-high"
 #define GM_ICON_BRIGHTNESS                 "stock_brightness"
 #define GM_ICON_COLOURNESS                 "stock_color"
 #define GM_ICON_CONTRAST                   "stock_contrast"
 #define GM_ICON_INTERNET_GROUP_CHAT        "internet-group-chat"
 #define GM_ICON_LOGO                       PACKAGE_NAME
-#define GM_ICON_MEDIA_PLAYBACK_PAUSE       "media-playback-pause"
-#define GM_ICON_MICROPHONE                 "audio-input-microphone"
-#define GM_ICON_SYSTEM_SEARCH              "system-search"
 #define GM_ICON_WHITENESS                  "stock_channel-blue"
 #define GM_ICON_ADDRESSBOOK                "stock_addressbook"
 #define GM_ICON_AVATAR                     "avatar"
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index b8752d5..8b3ac1e 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -28,13 +28,10 @@ IMAGES_FILES= \
 	256x256/multimedia-headset.png \
 	256x256/avatar-default.png \
 	16x16/audio-volume-high.png \
-	16x16/media-playback-pause.png \
 	16x16/stock_brightness.png \
 	16x16/stock_channel-blue.png \
 	16x16/stock_color.png \
 	16x16/stock_contrast.png \
-	16x16/system-search.png \
-	24x24/audio-input-microphone.png \
 	24x24/contact-new.png \
 	24x24/internet-group-chat.png \
 	color-brightness-contrast.png \
@@ -61,7 +58,6 @@ IMAGES_FILES= \
 
 
 IMAGES= \
-	gm_add_contact_24_stock_data $(srcdir)/24x24/contact-new.png \
 	gm_audio_volume_high_16_stock_data $(srcdir)/16x16/audio-volume-high.png \
 	gm_brightness_16_stock_data $(srcdir)/16x16/stock_brightness.png \
 	gm_colourness_16_stock_data $(srcdir)/16x16/stock_color.png \
@@ -74,9 +70,6 @@ IMAGES= \
 	gm_logo_48_stock_data $(srcdir)/48x48/apps/@PACKAGE_NAME  png \
 	gm_logo_72_stock_data $(srcdir)/72x72/apps/@PACKAGE_NAME  png \
         gm_avatar_256_stock_data $(srcdir)/256x256/avatar-default.png \
-	gm_media_playback_pause_16_stock_data $(srcdir)/16x16/media-playback-pause.png \
-	gm_microphone_24_stock_data $(srcdir)/24x24/audio-input-microphone.png \
-	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_remote_contact_stock_data $(srcdir)/remote_contact.png \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]