From 8eb6a561ab9013d3ad12599176c077c57f12ce08 Mon Sep 17 00:00:00 2001
From: Christopher James Lahey <clahey@helixcode.com>
Date: Thu, 18 May 2000 22:28:38 +0000
Subject: Fixed e_card_name_copy and e_card_arbitrary_copy to deal correctly
 with a

2000-05-18  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/e-card.c: Fixed e_card_name_copy and
	e_card_arbitrary_copy to deal correctly with a passed NULL.

	* contact-editor/Makefile.am: Removed imagesdir stuff.

	* contact-editor/arrow.png: Made this transparent.

	* contact-editor/contact-editor.glade,
	contact-editor/e-contact-editor-strings.h: Renamed some widgets
	and added custom widgets for all of the images.

	* contact-editor/e-contact-editor.c: Worked on making this work
	decently well with messed up glade files.  Cleaned up a lot of code.

svn path=/trunk/; revision=3121
---
 addressbook/contact-editor/contact-editor.glade | 316 +++++++++++++++++++++---
 1 file changed, 277 insertions(+), 39 deletions(-)

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

diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index a450743ff8..af77945c56 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -56,7 +56,7 @@
       <name>table-contact-editor-general</name>
       <border_width>7</border_width>
       <cxx_use_heap>True</cxx_use_heap>
-      <rows>13</rows>
+      <rows>14</rows>
       <columns>8</columns>
       <homogeneous>False</homogeneous>
       <row_spacing>4</row_spacing>
@@ -710,7 +710,7 @@
 	  <class>GtkCheckButton</class>
 	  <name>checkbutton-htmlmail</name>
 	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Wants _HTML mail</label>
+	  <label>Wants to receive _HTML mail</label>
 	  <active>False</active>
 	  <draw_indicator>True</draw_indicator>
 	</widget>
@@ -741,7 +741,7 @@
 
 	<widget>
 	  <class>GtkButton</class>
-	  <name>button-address1</name>
+	  <name>button-address</name>
 	  <cxx_use_heap>True</cxx_use_heap>
 
 	  <widget>
@@ -969,7 +969,7 @@
 
 	<widget>
 	  <class>GtkLabel</class>
-	  <name>label-address1</name>
+	  <name>label-address</name>
 	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Business</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
@@ -1221,6 +1221,188 @@
 	  <ypad>0</ypad>
 	</widget>
       </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom1</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>malehead.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:19:47 GMT</last_modification_time>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>0</top_attach>
+	  <bottom_attach>4</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom2</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>cellphone.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:20:02 GMT</last_modification_time>
+	<child>
+	  <left_attach>4</left_attach>
+	  <right_attach>5</right_attach>
+	  <top_attach>0</top_attach>
+	  <bottom_attach>4</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom3</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>envelope.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:19:51 GMT</last_modification_time>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>5</top_attach>
+	  <bottom_attach>7</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom4</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>house.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:20:06 GMT</last_modification_time>
+	<child>
+	  <left_attach>4</left_attach>
+	  <right_attach>5</right_attach>
+	  <top_attach>5</top_attach>
+	  <bottom_attach>10</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom5</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>evolution-contacts.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:19:59 GMT</last_modification_time>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>12</top_attach>
+	  <bottom_attach>14</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom6</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>briefcase.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:20:09 GMT</last_modification_time>
+	<child>
+	  <left_attach>4</left_attach>
+	  <right_attach>5</right_attach>
+	  <top_attach>12</top_attach>
+	  <bottom_attach>14</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom10</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>globe.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:19:56 GMT</last_modification_time>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>8</top_attach>
+	  <bottom_attach>10</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
     </widget>
 
     <widget>
@@ -1764,11 +1946,85 @@
       </widget>
 
       <widget>
-	<class>GtkHBox</class>
-	<name>hbox5</name>
+	<class>GtkHSeparator</class>
+	<name>hseparator8</name>
 	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>6</right_attach>
+	  <top_attach>6</top_attach>
+	  <bottom_attach>7</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>True</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom7</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>briefcase.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>0</top_attach>
+	  <bottom_attach>2</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>Custom</class>
+	<name>custom8</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>malehead.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:20:16 GMT</last_modification_time>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>4</top_attach>
+	  <bottom_attach>6</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkScrolledWindow</class>
+	<name>scrolledwindow2</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
 	<child>
 	  <left_attach>1</left_attach>
 	  <right_attach>6</right_attach>
@@ -1776,7 +2032,7 @@
 	  <bottom_attach>9</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
+	  <xexpand>True</xexpand>
 	  <yexpand>True</yexpand>
 	  <xshrink>False</xshrink>
 	  <yshrink>False</yshrink>
@@ -1787,49 +2043,31 @@
 	<widget>
 	  <class>GtkText</class>
 	  <name>text-comments</name>
-	  <height>50</height>
 	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkVScrollbar</class>
-	  <name>vscrollbar-comments</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <policy>GTK_UPDATE_CONTINUOUS</policy>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>0</upper>
-	  <step>0</step>
-	  <page>0</page>
-	  <page_size>0</page_size>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
 	</widget>
       </widget>
 
       <widget>
-	<class>GtkHSeparator</class>
-	<name>hseparator8</name>
+	<class>Custom</class>
+	<name>custom9</name>
 	<cxx_use_heap>True</cxx_use_heap>
+	<creation_function>e_create_image_widget</creation_function>
+	<string1>globe.png</string1>
+	<string2></string2>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Thu, 18 May 2000 12:20:19 GMT</last_modification_time>
 	<child>
 	  <left_attach>0</left_attach>
-	  <right_attach>6</right_attach>
-	  <top_attach>6</top_attach>
-	  <bottom_attach>7</bottom_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>7</top_attach>
+	  <bottom_attach>9</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
+	  <xexpand>False</xexpand>
 	  <yexpand>False</yexpand>
 	  <xshrink>False</xshrink>
 	  <yshrink>False</yshrink>
-- 
cgit