- Update to 2.21.3
- Remove patch for RH bug #215467 (fixed upstream). - Remove patch for GNOME bug #499920 (fixed upstream).
This commit is contained in:
Matthew Barnes
parent
d58a834b7f
commit
d93c79add4
@ -1 +1 @@
|
||||
evolution-2.21.2.tar.bz2
|
||||
evolution-2.21.3.tar.bz2
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400
|
||||
+++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400
|
||||
@@ -1919,10 +1919,22 @@
|
||||
@@ -2176,10 +2176,22 @@
|
||||
* try to do better with the filename check.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
diff -up evolution-2.21.2/shell/es-event.c.invalid-include evolution-2.21.2/shell/es-event.c
|
||||
--- evolution-2.21.2/shell/es-event.c.invalid-include 2007-10-28 22:02:14.000000000 -0400
|
||||
+++ evolution-2.21.2/shell/es-event.c 2007-11-29 15:01:31.000000000 -0500
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <glib.h>
|
||||
|
||||
#include "es-event.h"
|
||||
+#include "e-shell.h"
|
||||
|
||||
static GObjectClass *eme_parent;
|
||||
static ESEvent *es_event;
|
||||
diff -up evolution-2.21.2/shell/es-event.h.invalid-include evolution-2.21.2/shell/es-event.h
|
||||
--- evolution-2.21.2/shell/es-event.h.invalid-include 2007-10-23 06:03:16.000000000 -0400
|
||||
+++ evolution-2.21.2/shell/es-event.h 2007-11-29 15:01:31.000000000 -0500
|
||||
@@ -26,13 +26,14 @@
|
||||
#include <glib-object.h>
|
||||
|
||||
#include "e-util/e-event.h"
|
||||
-#include "e-shell.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#pragma }
|
||||
#endif /* __cplusplus */
|
||||
|
||||
+struct _EShell; /* Avoid including "e-shell.h" */
|
||||
+
|
||||
typedef struct _ESEvent ESEvent;
|
||||
typedef struct _ESEventClass ESEventClass;
|
||||
|
||||
@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEve
|
||||
struct _ESEventTargetShell {
|
||||
EEventTarget target;
|
||||
|
||||
- EShell *shell;
|
||||
+ struct _EShell *shell;
|
||||
};
|
||||
|
||||
struct _ESEventTargetState {
|
||||
@@ -91,7 +92,7 @@ GType es_event_get_type(void);
|
||||
ESEvent *es_event_peek(void);
|
||||
|
||||
ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
|
||||
-ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell);
|
||||
+ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell);
|
||||
ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
|
||||
|
||||
/* ********************************************************************** */
|
||||
@ -1,86 +0,0 @@
|
||||
--- 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);
|
||||
@ -44,8 +44,8 @@
|
||||
### Abstract ###
|
||||
|
||||
Name: evolution
|
||||
Version: 2.21.2
|
||||
Release: 4%{?dist}
|
||||
Version: 2.21.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2 and GFDL+
|
||||
Group: Applications/Productivity
|
||||
Summary: GNOME's next-generation groupware suite
|
||||
@ -110,16 +110,10 @@ Patch27: evolution-2.9.1-im-context-reset.patch
|
||||
# RH bug #215478 / GNOME bug #383842
|
||||
Patch30: evolution-2.9.3-source-path-entry.patch
|
||||
|
||||
# RH bug #215467 / GNOME bug #380644
|
||||
Patch31: evolution-2.9.3-meeting-list-view.patch
|
||||
|
||||
# GNOME bug #376991
|
||||
# XXX Disabled due to outstanding issues.
|
||||
#Patch33: evolution-2.10.0-e-passwords.patch
|
||||
|
||||
# GNOME bug #499920
|
||||
Patch34: evolution-2.21.2-invalid-include.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires(post): GConf2
|
||||
@ -252,9 +246,7 @@ PalmOS<tm> devices with %{name}.
|
||||
%patch27 -p1 -b .im-context-reset
|
||||
#%patch29 -p1 -b .view-attachment-uri
|
||||
%patch30 -p1 -b .source-path-entry
|
||||
%patch31 -p1 -b .meeting-list-view
|
||||
#%patch33 -p1 -b .e-passwords
|
||||
%patch34 -p1 -b .invalid-include
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -680,6 +672,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.3-1.fc9
|
||||
- Update to 2.21.3
|
||||
- Remove patch for RH bug #215467 (fixed upstream).
|
||||
- Remove patch for GNOME bug #499920 (fixed upstream).
|
||||
|
||||
* Sat Dec 01 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-4.fc9
|
||||
- Fix a corrupted patch that caused GNOME bug #499291.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user