contacts r465 - in trunk: . src

[rbradford svn gnome org]

Author: rbradford
Date: Wed Oct 22 16:07:57 2008
New Revision: 465
URL: http://svn.gnome.org/viewvc/contacts?rev=465&view=rev

Log:
2008-10-22  Rob Bradford  <rob linux intel com>

  * src/contacts-edit-pane.c (contacts_edit_pane_show):
  * src/contacts-utils.c (contacts_choose_photo):
  Fill the edit button with the stock person icon when no image is set.

Modified:
   trunk/ChangeLog
   trunk/src/contacts-edit-pane.c
   trunk/src/contacts-utils.c

Modified: trunk/src/contacts-edit-pane.c
==============================================================================
--- trunk/src/contacts-edit-pane.c	(original)
+++ trunk/src/contacts-edit-pane.c	Wed Oct 22 16:07:57 2008
@@ -1098,9 +1098,13 @@
 	if (pixbuf)
 	{
 		image = gtk_image_new_from_pixbuf (pixbuf);
-		gtk_button_set_image (GTK_BUTTON (button), image);
 		g_object_unref (pixbuf);
+	} else {
+		image = gtk_image_new_from_icon_name ("stock_person", 
+						      GTK_ICON_SIZE_DIALOG);
 	}
+	gtk_button_set_image (GTK_BUTTON (button), image);
+
 	gtk_widget_show (widget);
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (contacts_edit_choose_photo), data);

Modified: trunk/src/contacts-utils.c
==============================================================================
--- trunk/src/contacts-utils.c	(original)
+++ trunk/src/contacts-utils.c	Wed Oct 22 16:07:57 2008
@@ -543,7 +543,9 @@
 	} else if (result == NO_IMAGE) {
 		if (contact && E_IS_CONTACT (contact)) {
 			e_contact_set (contact, E_CONTACT_PHOTO, NULL);
-			gtk_button_set_image (GTK_BUTTON (button), NULL);
+			image = gtk_image_new_from_icon_name ("stock_person", 
+							      GTK_ICON_SIZE_DIALOG);
+			gtk_button_set_image (GTK_BUTTON (button), image);
 		}
 	}