ekiga r6877 - in trunk: . lib/engine/gui/gtk-frontend lib/gui pixmaps pixmaps/16x16 pixmaps/24x24

[dsandras svn gnome org]

Author: dsandras
Date: Mon Sep  8 17:45:23 2008
New Revision: 6877
URL: http://svn.gnome.org/viewvc/ekiga?rev=6877&view=rev

Log:
Use theme icons instead of our internal icons for the address book
icon.


Removed:
   trunk/pixmaps/16x16/stock_addressbook.png
   trunk/pixmaps/24x24/stock_addressbook.png
Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   trunk/lib/gui/gmstockicons.c
   trunk/lib/gui/gmstockicons.h
   trunk/pixmaps/Makefile.am

Modified: trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Mon Sep  8 17:45:23 2008
@@ -644,7 +644,6 @@
 
   sigc::connection conn;
 
-  GdkPixbuf *pixbuf = NULL;
   GtkWidget *menu_bar = NULL;
   GtkWidget *frame = NULL;
   GtkWidget *vbox = NULL;
@@ -660,11 +659,7 @@
   gtk_window_set_title (GTK_WINDOW (self), _("Address Book"));
   gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER);
 
-  pixbuf = gtk_widget_render_icon (GTK_WIDGET (self),
-				   GM_ICON_ADDRESSBOOK,
-				   GTK_ICON_SIZE_MENU, NULL);
-  gtk_window_set_icon (GTK_WINDOW (self), pixbuf);
-  g_object_unref (pixbuf);
+  gtk_window_set_icon_name (GTK_WINDOW (self), GM_ICON_ADDRESSBOOK);
 
   /* Start building the window */
   vbox = gtk_vbox_new (FALSE, 2);

Modified: trunk/lib/gui/gmstockicons.c
==============================================================================
--- trunk/lib/gui/gmstockicons.c	(original)
+++ trunk/lib/gui/gmstockicons.c	Mon Sep  8 17:45:23 2008
@@ -83,8 +83,6 @@
 		{ GM_STOCK_PHONE_PICK_UP_16, gm_phone_pick_up_stock_data_16},
 		{ GM_STOCK_PHONE_HANG_UP_24, gm_phone_hang_up_stock_data_24},
 		{ GM_STOCK_PHONE_PICK_UP_24, gm_phone_pick_up_stock_data_24},
-
-	        { GM_STOCK_ADDRESSBOOK, gm_addressbook_16_stock_data },
 	};
 
         typedef struct 
@@ -97,8 +95,6 @@
 	static const GmThemeIcon theme_builtins[] =
 	{
 		{ GM_ICON_ADD_CONTACT, 24, gm_add_contact_24_stock_data},
-	        { GM_ICON_ADDRESSBOOK, 16, gm_addressbook_16_stock_data },
-	        { GM_ICON_ADDRESSBOOK, 24, gm_addressbook_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_CAMERA_VIDEO, 16, gm_camera_video_16_stock_data },

Modified: trunk/lib/gui/gmstockicons.h
==============================================================================
--- trunk/lib/gui/gmstockicons.h	(original)
+++ trunk/lib/gui/gmstockicons.h	Mon Sep  8 17:45:23 2008
@@ -41,7 +41,6 @@
 
 /* Icon theme builtins */
 #define GM_ICON_ADD_CONTACT                "contact-new"
-#define GM_ICON_ADDRESSBOOK                "stock_addressbook"
 #define GM_ICON_AUDIO_VOLUME_HIGH          "audio-volume-high"
 #define GM_ICON_BRIGHTNESS                 "stock_brightness"
 #define GM_ICON_CAMERA_VIDEO               "camera-video"
@@ -53,6 +52,7 @@
 #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"
 
 /* True stock icons */
 #define GM_STOCK_COLOR_BRIGHTNESS_CONTRAST   "gm_color_brightness_contrast_stock"
@@ -78,8 +78,6 @@
 #define GM_STOCK_PHONE_HANG_UP_24    "gm_phone_up_stock_24"
 #define GM_STOCK_PHONE_PICK_UP_24    "gm_phone_pick_up_stock_24"
 
-#define GM_STOCK_ADDRESSBOOK          "stock_addressbook"
-
 void gnomemeeting_stock_icons_init (void);
 
 G_END_DECLS

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Mon Sep  8 17:45:23 2008
@@ -26,7 +26,6 @@
 	16x16/audio-volume-high.png \
 	16x16/camera-video.png \
 	16x16/media-playback-pause.png \
-	16x16/stock_addressbook.png \
 	16x16/stock_brightness.png \
 	16x16/stock_channel-blue.png \
 	16x16/stock_color.png \
@@ -35,7 +34,6 @@
 	24x24/audio-input-microphone.png \
 	24x24/contact-new.png \
 	24x24/internet-group-chat.png \
-	24x24/stock_addressbook.png \
 	color-brightness-contrast.png \
 	status-ringing-16.png \
 	local_contact.png \
@@ -67,8 +65,6 @@
 
 IMAGES= \
 	gm_add_contact_24_stock_data $(srcdir)/24x24/contact-new.png \
-	gm_addressbook_16_stock_data $(srcdir)/16x16/stock_addressbook.png \
-	gm_addressbook_24_stock_data $(srcdir)/24x24/stock_addressbook.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_camera_video_16_stock_data $(srcdir)/16x16/camera-video.png \