rpms/evolution/devel evolution-2.9.3-meeting-list-view.patch, NONE, 1.1 evolution.spec, 1.215, 1.216

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6584

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.9.3-meeting-list-view.patch 
Log Message:

* Mon Dec 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-2.fc7
- Add patch for RH bug #215467 (missing meeting participants).


evolution-2.9.3-meeting-list-view.patch:
 e-meeting-list-view.c |   39 +++++++++++++++++++++++++++++++++------
 e-meeting-store.c     |    9 ++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

--- NEW FILE evolution-2.9.3-meeting-list-view.patch ---
--- evolution-2.9.3/calendar/gui/e-meeting-list-view.c.meeting-list-view	2006-12-11 23:13:47.000000000 -0500
+++ evolution-2.9.3/calendar/gui/e-meeting-list-view.c	2006-12-11 23:14:17.000000000 -0500
@@ -623,18 +623,45 @@
                
 }
  
+void
+attendee_added_cb (EMeetingStore *store, GtkTreePath *path,
+                   GtkTreeIter *iter, EMeetingListView *view)
+{
+	EMeetingAttendee *attendee;
+	gint row;
+
+	/* Add the new attendee to the name selector. */
+	row = gtk_tree_path_get_indices (path) [0];
+	attendee = e_meeting_store_find_attendee_at_row (store, row);
+	e_meeting_list_view_add_attendee_to_name_selector (view, attendee);
+}
+
+void
+attendee_deleted_cb (EMeetingStore *store, GtkTreePath *path,
+                     EMeetingListView *view)
+{
+	EMeetingAttendee *attendee;
+	gint row;
+
+	/* Remove the old attendee from the name selector. */
+	row = gtk_tree_path_get_indices (path) [0];
+	attendee = e_meeting_store_find_attendee_at_row (store, row);
+	e_meeting_list_view_remove_attendee_from_name_selector (view, attendee);
+}
 
 EMeetingListView *
 e_meeting_list_view_new (EMeetingStore *store)
 {
-	EMeetingListView *view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL);
+	EMeetingListView *view;
 	GtkTreeSelection *selection;
 
-	if (view) {
-		view->priv->store = store;
-		gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store));
-		build_table (view);
-	}
+	view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL);
+	view->priv->store = store;
+	gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store));
+	build_table (view);
+
+	g_signal_connect (store, "row-inserted", G_CALLBACK (attendee_added_cb), view);
+	g_signal_connect (store, "row-deleted", G_CALLBACK (attendee_deleted_cb), view);
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
 	g_signal_connect (selection, "changed", G_CALLBACK (row_activated_cb), view);
--- evolution-2.9.3/calendar/gui/e-meeting-store.c.meeting-list-view	2006-12-04 10:44:42.000000000 -0500
+++ evolution-2.9.3/calendar/gui/e-meeting-store.c	2006-12-11 23:14:17.000000000 -0500
@@ -794,14 +794,13 @@
 	}	
 	
 	if (row != -1) {
-
-		g_ptr_array_remove_index (store->priv->attendees, row);		
-		g_object_unref (attendee);
-
 		path = gtk_tree_path_new ();
 		gtk_tree_path_append_index (path, row);
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
 		gtk_tree_path_free (path);
+
+		g_ptr_array_remove_index (store->priv->attendees, row);		
+		g_object_unref (attendee);
 	}
 }
 
@@ -815,10 +814,10 @@
 
 	for (i = 0; i < store->priv->attendees->len; i++) {
 		EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i);
-		g_object_unref (attendee);
 
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
 		gtk_tree_path_next (path);
+		g_object_unref (attendee);
 	}
 
 	g_ptr_array_set_size (store->priv->attendees, 0);


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- evolution.spec	10 Dec 2006 03:13:13 -0000	1.215
+++ evolution.spec	12 Dec 2006 12:08:23 -0000	1.216
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -164,6 +164,9 @@
 # RH bug #218801 / GNOME bug #383953
 Patch43: evolution-2.9.3-unread-messages.patch
 
+# RH bug #215467 / GNOME bug #380644
+Patch44: evolution-2.9.3-meeting-list-view.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -310,6 +313,7 @@
 %patch41 -p1 -b .adopt-icons
 %patch42 -p1 -b .source-path-entry
 %patch43 -p1 -b .unread-messages
+%patch44 -p1 -b .meeting-list-view
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -724,6 +728,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Dec 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-2.fc7
+- Add patch for RH bug #215467 (missing meeting participants).
+
 * Thu Dec 09 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
 - Update to 2.9.3
 - Configure with scrollkeeper disabled.