[evolution-patches] 61738

[JP Rosevear <jpr novell com>]

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

? 61738.patch
? gui/scroll.patch
? gui/select-auto.patch
? gui/select.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2450
diff -u -r1.2450 ChangeLog
--- ChangeLog	19 Jul 2004 22:02:28 -0000	1.2450
+++ ChangeLog	21 Jul 2004 17:50:23 -0000
@@ -1,3 +1,13 @@
+2004-07-21  JP Rosevear  <jpr novell com>
+
+	Fixes #61738
+	
+	* gui/dialogs/meeting-page.c (clear_widgets): by default we have a
+	user as organizer
+	(sensitize_widgets): use user_org to determine widget sensitivity
+	(meeting_page_fill_widgets): set user_org value appropriately
+	(change_clicked_cb): set user_org to TRUE
+
 2004-07-16  JP Rosevear  <jpr novell com>
 
 	Fixes #61451
Index: gui/dialogs/meeting-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/meeting-page.c,v
retrieving revision 1.85
diff -u -r1.85 meeting-page.c
--- gui/dialogs/meeting-page.c	23 Jun 2004 12:30:58 -0000	1.85
+++ gui/dialogs/meeting-page.c	21 Jul 2004 17:50:23 -0000
@@ -85,6 +85,7 @@
 	gint row;
 	
 	/* For handling who the organizer is */
+	gboolean user_org;
 	gboolean existing;
 	
         gboolean updating;
@@ -316,12 +317,13 @@
 	gtk_widget_hide (priv->existing_organizer_table);	
 
 	priv->existing = FALSE;
+	priv->user_org = TRUE;
 }
 
 static void
 sensitize_widgets (MeetingPage *mpage)
 {
-	gboolean read_only;
+	gboolean read_only, user_org;
 	MeetingPagePrivate *priv = mpage->priv;
 
 	if (!e_cal_is_read_only (COMP_EDITOR_PAGE (mpage)->client, &read_only, NULL))
@@ -329,9 +331,9 @@
 
 	gtk_widget_set_sensitive (priv->organizer, !read_only);
 	gtk_widget_set_sensitive (priv->existing_organizer_btn, !read_only);
-	gtk_widget_set_sensitive (priv->add, !read_only);
-	gtk_widget_set_sensitive (priv->remove, !read_only);
-	gtk_widget_set_sensitive (priv->invite, !read_only);
+	gtk_widget_set_sensitive (priv->add, !read_only && priv->user_org);
+	gtk_widget_set_sensitive (priv->remove, !read_only && priv->user_org);
+	gtk_widget_set_sensitive (priv->invite, !read_only && priv->user_org);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
 }
 
@@ -379,6 +381,7 @@
 					    page->client,
 					    CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS))
 					gtk_widget_hide (priv->existing_organizer_btn);
+				priv->user_org = TRUE;
 			} else {
 				if (e_cal_get_static_capability (
 					    page->client,
@@ -387,6 +390,7 @@
 				gtk_widget_set_sensitive (priv->invite, FALSE);
 				gtk_widget_set_sensitive (priv->add, FALSE);
 				gtk_widget_set_sensitive (priv->remove, FALSE);
+				priv->user_org = FALSE;
 			}
 			
 			if (organizer.cn != NULL)
@@ -580,6 +584,7 @@
 	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));
 	
 	priv->existing = FALSE;
+	priv->user_org = TRUE;
 }
 
 static void