Add PO box entries.

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

	* gui/contact-editor/contact-editor.glade: Add PO box entries.

	* gui/contact-editor/e-contact-editor.c (init_address_record): Hook
	up PO box entry.
	(fill_in_address_record): Ditto.
	(extract_address_record): Ditto.

svn path=/trunk/; revision=25884

3 files changed, 155 insertions, 8 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index bbb3b1d8b9..c1424e8512 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-12  Hans Petter Jansson  <hpj@ximian.com>
+
+	* gui/contact-editor/contact-editor.glade: Add PO box entries.
+
+	* gui/contact-editor/e-contact-editor.c (init_address_record): Hook
+	up PO box entry.
+	(fill_in_address_record): Ditto.
+	(extract_address_record): Ditto.
+
 2004-04-18  S N Tejasvi  <tejasvi_sn@gawab.com>
 
 	Fixes bug #55208.
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index a25ae8fb9b..92f0eb8c63 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -2558,10 +2558,55 @@
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="bottom_attach">3</property>
 			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkEntry" id="entry-home-pobox">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="activates_default">False</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label447">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">PO Box:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -2789,6 +2834,30 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkLabel" id="label430">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Address:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options">fill</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkScrolledWindow" id="scrolledwindow43">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
@@ -2819,15 +2888,36 @@
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="bottom_attach">3</property>
 			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="label430">
+			<widget class="GtkEntry" id="entry-work-pobox">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Address:</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="activates_default">False</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label448">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">PO Box:</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2841,10 +2931,10 @@
 			<packing>
 			  <property name="left_attach">0</property>
 			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 		    </widget>
@@ -3128,10 +3218,55 @@
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">4</property>
+			  <property name="bottom_attach">3</property>
 			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<widget class="GtkEntry" id="entry-other-pobox">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="activates_default">False</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label449">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">PO Box:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
 		  </child>
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 8d5bac7ac3..c3e6d3b99b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1115,6 +1115,7 @@ init_address_record (EContactEditor *editor, gint record)
 	init_address_field (editor, record, "state");
 	init_address_field (editor, record, "zip");
 	init_address_field (editor, record, "country");
+	init_address_field (editor, record, "pobox");
 }
 
 static void
@@ -1173,6 +1174,7 @@ fill_in_address_record (EContactEditor *editor, gint record)
 	fill_in_address_field (editor, record, "state", address->region);
 	fill_in_address_field (editor, record, "zip", address->code);
 	fill_in_address_field (editor, record, "country", address->country);
+	fill_in_address_field (editor, record, "pobox", address->po);
 
 	g_boxed_free (e_contact_address_get_type (), address);
 }
@@ -1250,6 +1252,7 @@ extract_address_record (EContactEditor *editor, gint record)
 	address->region   = extract_address_field (editor, record, "state");
 	address->code     = extract_address_field (editor, record, "zip");
 	address->country  = extract_address_field (editor, record, "country");
+	address->po       = extract_address_field (editor, record, "pobox");
 
 	if (nonempty (address->street) ||
 	    nonempty (address->ext) ||