From 2983d377425a6a34411630363e91e0951b58d2b9 Mon Sep 17 00:00:00 2001
From: Hans Petter Jansson <hpj@ximian.com>
Date: Tue, 18 May 2004 02:59:02 +0000
Subject: Hook up image button. (e_contact_editor_dispose): Dispose of file
 selector

2004-05-17  Hans Petter Jansson  <hpj@ximian.com>

	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
	Hook up image button.
	(e_contact_editor_dispose): Dispose of file selector if it's around.
	(image_clicked): Implement.
	(file_selector_deleted): Implement.
	(image_cleared_cb): Implement.
	(image_selected_cb): Implement.

	* gui/contact-editor/contact-editor.glade: Make the contact image
	be a button that lets you change or discard the image.

svn path=/trunk/; revision=25943
---
 addressbook/gui/contact-editor/contact-editor.glade | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'addressbook/gui/contact-editor/contact-editor.glade')

diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 92f0eb8c63..e44f6f6082 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -94,15 +94,10 @@
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkAspectFrame" id="aspectframe1">
+		    <widget class="GtkButton" id="button-image">
 		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0</property>
-		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="ratio">1</property>
-		      <property name="obey_child">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
 
 		      <child>
 			<widget class="Custom" id="image-chooser">
@@ -117,7 +112,7 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
+		      <property name="expand">False</property>
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-- 
cgit