src/addressbook.c: removed unused xpm objects. Added person icon.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2368 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 10 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 43c0e621..6fc3205a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-08
 
+	* src/addressbook.c: removed unused xpm objects. Added person icon.
+
+2009-12-08
+
 	* src/icons/address.xpm: modified icon.
 	* src/icons/stock_person.png
 	  src/stock_pixmap.[ch]: added new icon.
diff --git a/src/addressbook.c b/src/addressbook.c
index 1a8ddddc..3ef7f8f8 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -109,33 +109,13 @@ static GdkPixbuf *folderopenpix;
 static GdkPixbuf *grouppix;
 static GdkPixbuf *interfacepix;
 static GdkPixbuf *bookpix;
+static GdkPixbuf *personpix;
 static GdkPixbuf *addresspix;
 static GdkPixbuf *vcardpix;
 static GdkPixbuf *jpilotpix;
 static GdkPixbuf *categorypix;
 static GdkPixbuf *ldappix;
 
-static GdkPixmap *folderxpm;
-static GdkBitmap *folderxpmmask;
-static GdkPixmap *folderopenxpm;
-static GdkBitmap *folderopenxpmmask;
-static GdkPixmap *groupxpm;
-static GdkBitmap *groupxpmmask;
-static GdkPixmap *interfacexpm;
-static GdkBitmap *interfacexpmmask;
-static GdkPixmap *bookxpm;
-static GdkBitmap *bookxpmmask;
-static GdkPixmap *addressxpm;
-static GdkBitmap *addressxpmmask;
-static GdkPixmap *vcardxpm;
-static GdkBitmap *vcardxpmmask;
-static GdkPixmap *jpilotxpm;
-static GdkBitmap *jpilotxpmmask;
-static GdkPixmap *categoryxpm;
-static GdkBitmap *categoryxpmmask;
-static GdkPixmap *ldapxpm;
-static GdkBitmap *ldapxpmmask;
-
 /* Message buffer */
 static gchar addressbook_msgbuf[ADDRESSBOOK_MSGBUF_SIZE];
 
@@ -861,8 +841,6 @@ static void addressbook_create(void)
 
 	/* Build icons for interface */
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_INTERFACE, &interfacepix);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_INTERFACE,
-			 &interfacexpm, &interfacexpmmask);
 	/* Build control tables */
 	addrbookctl_build_map(window);
 	addrbookctl_build_iflist();
@@ -3694,21 +3672,12 @@ void addrbookctl_build_map(GtkWidget *window)
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_GROUP, &grouppix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_VCARD, &vcardpix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_BOOK, &bookpix);
+	stock_pixbuf_gdk(window, STOCK_PIXMAP_PERSON, &personpix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS, &addresspix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotpix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_CATEGORY, &categorypix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_LDAP, &ldappix);
 
-	stock_pixmap_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm, &folderxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm, &folderopenxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm, &groupxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm, &vcardxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm, &bookxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm, &addressxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm, &jpilotxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm, &categoryxpmmask);
-	stock_pixmap_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm, &ldapxpmmask);
-
 	_addressBookTypeHash_ = g_hash_table_new(g_int_hash, g_int_equal);
 	_addressBookTypeList_ = NULL;
 
@@ -3748,8 +3717,8 @@ void addrbookctl_build_map(GtkWidget *window)
 	atci->treeExpand = FALSE;
 	atci->treeLeaf = FALSE;
 	atci->displayName = _("Person");
-	atci->icon_pixbuf = NULL;
-	atci->icon_open_pixbuf = NULL;
+	atci->icon_pixbuf = personpix;
+	atci->icon_open_pixbuf = personpix;
 	atci->menuCommand = NULL;
 	g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
 	_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index c75726b7..46f22754 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 3ee6218a..b04f831d 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by