From 99057deafb9038dd1f5cfc984b61a2ba3d99a99b Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Thu, 6 Dec 2001 19:54:01 +0000
Subject: we need to be able to disable non-labels here as well. since we're
 using

2001-12-05  Chris Toshok  <toshok@ximian.com>

	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
	we need to be able to disable non-labels here as well.  since
	we're using enable_widget and not gtk_widget_set_sensitive, it's
	okay to handle entries/text's, etc, here.
	(widget_field_mappings): add label-caluri and label-fburl here.

	* gui/contact-editor/contact-editor.glade: change the label names
	for the freebusy/calendar urls to have more descriptive names,
	since we use them in e-contact-editor.c now.

	* backend/pas/pas-backend-ldap.c: add support for
	caluri/calendarURI, fburl/freeBusyURI.

	* backend/pas/evolutionperson.schema: add calendarURI and
	freeBusyURI.

svn path=/trunk/; revision=14908
---
 addressbook/gui/contact-editor/contact-editor.glade | 4 ++--
 addressbook/gui/contact-editor/e-contact-editor.c   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'addressbook/gui')

diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 7d9e7b1f7d..6e554c36ea 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -2403,7 +2403,7 @@ of that information here.</label>
 
 	    <widget>
 	      <class>GtkLabel</class>
-	      <name>label22</name>
+	      <name>label-caluri</name>
 	      <label>_Public Calendar URL:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
@@ -2430,7 +2430,7 @@ of that information here.</label>
 
 	    <widget>
 	      <class>GtkLabel</class>
-	      <name>label23</name>
+	      <name>label-fburl</name>
 	      <label>F_ree/Busy URL:</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 90c81edef5..ea28563cc1 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2169,7 +2169,10 @@ static struct {
 	{ "button-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },
 	{ "entry-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },
 
+	{ "label-caluri", E_CARD_SIMPLE_FIELD_CALURI },
 	{ "entry-caluri", E_CARD_SIMPLE_FIELD_CALURI, TRUE },
+
+	{ "label-fburl", E_CARD_SIMPLE_FIELD_FBURL },
 	{ "entry-fburl", E_CARD_SIMPLE_FIELD_FBURL, TRUE }
 };
 static int num_widget_field_mappings = sizeof(widget_field_mappings) / sizeof (widget_field_mappings[0]);
@@ -2285,8 +2288,6 @@ enable_writable_fields(EContactEditor *editor)
 				   widget_field_mappings[i].widget_name);
 			continue;
 		}
-		if (!GTK_IS_LABEL (w))
-			continue;
 		field = e_card_simple_get_ecard_field (simple,
 						       widget_field_mappings[i].field_id);
 
-- 
cgit v1.2.3