Remove blog, add home page. (set_entry_changed_signals): Ditto.

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

	* gui/contact-editor/e-contact-editor.c (set_entry_activate_signals):
	Remove blog, add home page.
	(set_entry_changed_signals): Ditto.
	(setup_tab_order): Ditto.
	(field_mapping): Ditto.
	(widget_field_mappings): Ditto.

	* gui/contact-editor/contact-editor.glade: Replace blog with home
	page.

svn path=/trunk/; revision=25795

3 files changed, 21 insertions, 9 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8da8f7d719..e604b7f703 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2004-05-04  Hans Petter Jansson  <hpj@ximian.com>
+
+	* gui/contact-editor/e-contact-editor.c (set_entry_activate_signals):
+	Remove blog, add home page.
+	(set_entry_changed_signals): Ditto.
+	(setup_tab_order): Ditto.
+	(field_mapping): Ditto.
+	(widget_field_mappings): Ditto.
+
+	* gui/contact-editor/contact-editor.glade: Replace blog with home
+	page.
+
 2004-05-03  Hans Petter Jansson  <hpj@ximian.com>
 
 	* gui/widgets/e-minicard.c (e_minicard_set_property): Do ref, unref
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index c9d7b07437..4e0fa61c6c 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -1580,9 +1580,9 @@
 		      <property name="column_spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="accellabel-blog">
+			<widget class="GtkLabel" id="accellabel-homepage">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Blog:</property>
+			  <property name="label" translatable="yes">Home Page:</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1676,7 +1676,7 @@
 		      </child>
 
 		      <child>
-			<widget class="Custom" id="entry-blog">
+			<widget class="Custom" id="entry-homepage">
 			  <property name="visible">True</property>
 			  <property name="creation_function">e_contact_editor_create_web</property>
 			  <property name="int1">0</property>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 22e39c36cd..f3082c3ab3 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1546,7 +1546,7 @@ set_urlentry_activate_signal_field (EContactEditor *editor, char *id)
 static void
 set_entry_activate_signals (EContactEditor *editor)
 {
-	set_urlentry_activate_signal_field (editor, "entry-blog");
+	set_urlentry_activate_signal_field (editor, "entry-homepage");
 	set_urlentry_activate_signal_field (editor, "entry-caluri");
 	set_urlentry_activate_signal_field (editor, "entry-fburl");
 	set_urlentry_activate_signal_field (editor, "entry-videourl");
@@ -1574,7 +1574,7 @@ set_entry_changed_signals (EContactEditor *editor)
 	widget = glade_xml_get_widget (editor->gui, "entry-company");
 	g_signal_connect (widget, "changed", G_CALLBACK (company_entry_changed), editor);
 
-	set_urlentry_changed_signal_field (editor, "entry-blog");
+	set_urlentry_changed_signal_field (editor, "entry-homepage");
 	set_urlentry_changed_signal_field (editor, "entry-caluri");
 	set_urlentry_changed_signal_field (editor, "entry-fburl");
 	set_urlentry_changed_signal_field (editor, "entry-videourl");
@@ -1938,7 +1938,7 @@ setup_tab_order(GladeXML *gui)
 		list = add_to_tab_order(list, gui, "entry-email1");
 		list = add_to_tab_order(list, gui, "alignment-htmlmail");
 		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "entry-blog");
+		list = add_to_tab_order(list, gui, "entry-homepage");
 		list = add_to_tab_order(list, gui, "button-fulladdr");
 		list = add_to_tab_order(list, gui, "text-address");
 		list = g_list_reverse(list);
@@ -2353,7 +2353,7 @@ static struct {
 	EContactField field;
 } field_mapping [] = {
 	{ "entry-fullname", E_CONTACT_FULL_NAME },
-	{ "entry-blog", E_CONTACT_BLOG_URL },
+	{ "entry-homepage", E_CONTACT_HOMEPAGE_URL },
 	{ "entry-company", E_CONTACT_ORG },
 	{ "entry-department", E_CONTACT_ORG_UNIT },
 	{ "entry-jobtitle", E_CONTACT_TITLE },
@@ -2404,8 +2404,8 @@ static struct {
 	EContactField field_id;
 	gboolean desensitize_for_read_only;
 } widget_field_mappings[] = {
-	{ "entry-blog", E_CONTACT_BLOG_URL, TRUE },
-	{ "accellabel-blog", E_CONTACT_BLOG_URL },
+	{ "entry-homepage", E_CONTACT_HOMEPAGE_URL, TRUE },
+	{ "accellabel-homepage", E_CONTACT_HOMEPAGE_URL },
 
 	{ "entry-jobtitle", E_CONTACT_TITLE, TRUE },
 	{ "label-jobtitle", E_CONTACT_TITLE },