rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.11.90

Browse Source
This commit is contained in:
Matthew Barnes 2007-08-15 18:09:49 +00:00
parent cc1656ae6b
commit b4dc82c07a
5 changed files with 256 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-2.11.6.1.tar.bz2 evolution-2.11.90.tar.bz2

132
evolution-2.10.0-e-source-combo-box.patch
View File

@ -1,5 +1,5 @@
--- evolution-2.11.6/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-17 12:44:06.000000000 -0400 --- evolution-2.11.90/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-07-05 02:11:06.000000000 -0400
+++ evolution-2.11.6/widgets/misc/e-pilot-settings.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/widgets/misc/e-pilot-settings.c 2007-08-15 13:42:01.000000000 -0400
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -40,8 +40,8 @@
} }
gboolean gboolean
--- evolution-2.11.6/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-07-30 10:18:01.000000000 -0400 --- evolution-2.11.90/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-08-09 02:46:59.000000000 -0400
+++ evolution-2.11.6/plugins/itip-formatter/itip-formatter.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c 2007-08-15 13:42:01.000000000 -0400
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
#include <camel/camel-store.h> #include <camel/camel-store.h>
#include <libecal/e-cal.h> #include <libecal/e-cal.h>
@ -51,8 +51,8 @@
#include <libedataserverui/e-source-selector.h> #include <libedataserverui/e-source-selector.h>
#include <gtkhtml/gtkhtml-embedded.h> #include <gtkhtml/gtkhtml-embedded.h>
#include <mail/em-format-hook.h> #include <mail/em-format-hook.h>
--- evolution-2.11.6/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-30 10:18:01.000000000 -0400 --- evolution-2.11.90/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-28 15:37:56.000000000 -0400
+++ evolution-2.11.6/plugins/itip-formatter/itip-view.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/plugins/itip-formatter/itip-view.c 2007-08-15 13:42:01.000000000 -0400
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include <camel/camel-mime-message.h> #include <camel/camel-mime-message.h>
#include <libedataserver/e-time-utils.h> #include <libedataserver/e-time-utils.h>
@ -177,8 +177,8 @@
} }
void void
--- evolution-2.11.6/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400 --- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400
+++ evolution-2.11.6/plugins/bbdb/gaimbuddies.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c 2007-08-15 13:42:01.000000000 -0400
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
#include <string.h> #include <string.h>
@ -188,8 +188,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/stat.h> #include <sys/stat.h>
--- evolution-2.11.6/plugins/bbdb/bbdb.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400 --- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400
+++ evolution-2.11.6/plugins/bbdb/bbdb.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/plugins/bbdb/bbdb.c 2007-08-15 13:42:01.000000000 -0400
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
#include <string.h> #include <string.h>
@ -199,7 +199,7 @@
#include <e-util/e-config.h> #include <e-util/e-config.h>
#include <mail/em-config.h> #include <mail/em-config.h>
@@ -353,7 +353,8 @@ enable_toggled_cb (GtkWidget *widget, gp @@ -345,7 +345,8 @@ enable_toggled_cb (GtkWidget *widget, gp
gtk_widget_set_sensitive (stuff->option_menu, active); gtk_widget_set_sensitive (stuff->option_menu, active);
if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) { if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) {
@ -209,7 +209,7 @@
gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
} }
} }
@@ -372,7 +373,8 @@ enable_gaim_toggled_cb (GtkWidget *widge @@ -364,7 +365,8 @@ enable_gaim_toggled_cb (GtkWidget *widge
gtk_widget_set_sensitive (stuff->gaim_option_menu, active); gtk_widget_set_sensitive (stuff->gaim_option_menu, active);
if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) { if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) {
@ -219,7 +219,7 @@
gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL); gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL);
} }
} }
@@ -401,31 +403,32 @@ gaim_source_changed_cb (GtkWidget *widge @@ -393,31 +395,32 @@ gaim_source_changed_cb (GtkWidget *widge
static GtkWidget * static GtkWidget *
create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) create_addressbook_option_menu (struct bbdb_stuff *stuff, int type)
{ {
@ -259,8 +259,8 @@
} }
GtkWidget * GtkWidget *
--- evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 --- evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400
+++ evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-15 13:42:01.000000000 -0400
@@ -158,9 +158,9 @@ @@ -158,9 +158,9 @@
</child> </child>
@ -273,8 +273,8 @@
<property name="int1">0</property> <property name="int1">0</property>
<property name="int2">0</property> <property name="int2">0</property>
<property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property> <property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
--- evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 --- evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400
+++ evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-15 13:42:01.000000000 -0400
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
#include <gtk/gtktogglebutton.h> #include <gtk/gtktogglebutton.h>
#include <gtk/gtkdialog.h> #include <gtk/gtkdialog.h>
@ -390,8 +390,8 @@
gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
} }
--- evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 --- evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-08 22:46:43.000000000 -0400
+++ evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade 2007-08-15 13:42:01.000000000 -0400
@@ -356,9 +356,9 @@ @@ -356,9 +356,9 @@
</child> </child>
@ -404,8 +404,8 @@
<property name="int1">0</property> <property name="int1">0</property>
<property name="int2">0</property> <property name="int2">0</property>
<property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property> <property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
--- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 --- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-08-09 02:46:47.000000000 -0400
+++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c 2007-07-31 10:10:58.000000000 -0400 +++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-15 13:42:01.000000000 -0400
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
#include <text/e-entry.h> #include <text/e-entry.h>
@ -436,7 +436,7 @@
} }
static void static void
@@ -2521,13 +2522,15 @@ new_target_cb (EBook *new_book, EBookSta @@ -2527,13 +2528,15 @@ new_target_cb (EBook *new_book, EBookSta
editor->load_book = NULL; editor->load_book = NULL;
if (status != E_BOOK_ERROR_OK || new_book == NULL) { if (status != E_BOOK_ERROR_OK || new_book == NULL) {
@ -456,7 +456,7 @@
if (new_book) if (new_book)
g_object_unref (new_book); g_object_unref (new_book);
@@ -2551,8 +2554,12 @@ cancel_load (EContactEditor *editor) @@ -2557,8 +2560,12 @@ cancel_load (EContactEditor *editor)
} }
static void static void
@ -470,7 +470,7 @@
cancel_load (editor); cancel_load (editor);
if (e_source_equal (e_book_get_source (editor->target_book), source)) if (e_source_equal (e_book_get_source (editor->target_book), source))
@@ -3373,8 +3380,8 @@ e_contact_editor_init (EContactEditor *e @@ -3383,8 +3390,8 @@ e_contact_editor_init (EContactEditor *e
g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor);
widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor);
@ -481,7 +481,7 @@
label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); label = glade_xml_get_widget (e_contact_editor->gui, "where-label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok");
@@ -3825,26 +3832,26 @@ e_contact_editor_create_web(gchar *name, @@ -3835,26 +3842,26 @@ e_contact_editor_create_web(gchar *name,
} }
GtkWidget * GtkWidget *
@ -518,8 +518,8 @@
+ gtk_widget_show (combo_box); + gtk_widget_show (combo_box);
+ return combo_box; + return combo_box;
} }
--- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 --- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-28 15:38:05.000000000 -0400
+++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-07-31 10:12:50.000000000 -0400 +++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-15 13:42:01.000000000 -0400
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
#include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h> #include <libebook/e-book.h>
@ -568,9 +568,9 @@
g_object_unref (source_list); g_object_unref (source_list);
--- evolution-2.11.6/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:27:56.000000000 -0500 --- evolution-2.11.90/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400
+++ evolution-2.11.6/calendar/gui/dialogs/memo-page.glade 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade 2007-08-15 13:42:01.000000000 -0400
@@ -141,7 +141,7 @@ @@ -194,7 +194,7 @@
<child> <child>
<widget class="Custom" id="source"> <widget class="Custom" id="source">
<property name="visible">True</property> <property name="visible">True</property>
@ -579,9 +579,9 @@
<property name="int1">0</property> <property name="int1">0</property>
<property name="int2">0</property> <property name="int2">0</property>
<property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property> <property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
--- evolution-2.11.6/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 --- evolution-2.11.90/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400
+++ evolution-2.11.6/calendar/gui/dialogs/event-page.glade 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade 2007-08-15 13:42:01.000000000 -0400
@@ -775,7 +775,7 @@ @@ -827,7 +827,7 @@
<child> <child>
<widget class="Custom" id="source"> <widget class="Custom" id="source">
<property name="visible">True</property> <property name="visible">True</property>
@ -590,9 +590,9 @@
<property name="int1">0</property> <property name="int1">0</property>
<property name="int2">0</property> <property name="int2">0</property>
<property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property> <property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
--- evolution-2.11.6/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 --- evolution-2.11.90/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400
+++ evolution-2.11.6/calendar/gui/dialogs/task-page.glade 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade 2007-08-15 13:42:01.000000000 -0400
@@ -618,7 +618,7 @@ @@ -671,7 +671,7 @@
<widget class="Custom" id="source"> <widget class="Custom" id="source">
<property name="height_request">24</property> <property name="height_request">24</property>
<property name="visible">True</property> <property name="visible">True</property>
@ -601,8 +601,8 @@
<property name="int1">0</property> <property name="int1">0</property>
<property name="int2">0</property> <property name="int2">0</property>
<property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property> <property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
--- evolution-2.11.6/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 --- evolution-2.11.90/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400
+++ evolution-2.11.6/calendar/gui/dialogs/memo-page.c 2007-07-31 10:14:31.000000000 -0400 +++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c 2007-08-15 13:42:01.000000000 -0400
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h> #include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -612,7 +612,7 @@
#include <libedataserverui/e-name-selector.h> #include <libedataserverui/e-name-selector.h>
#include <libedataserverui/e-name-selector-entry.h> #include <libedataserverui/e-name-selector-entry.h>
#include <libedataserverui/e-name-selector-list.h> #include <libedataserverui/e-name-selector-list.h>
@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage * @@ -349,7 +349,6 @@ memo_page_fill_widgets (CompEditorPage *
ECalComponentDateTime d; ECalComponentDateTime d;
GSList *l; GSList *l;
const char *categories; const char *categories;
@ -620,7 +620,7 @@
mpage = MEMO_PAGE (page); mpage = MEMO_PAGE (page);
priv = mpage->priv; priv = mpage->priv;
@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage * @@ -442,8 +441,9 @@ memo_page_fill_widgets (CompEditorPage *
} }
/* Source */ /* Source */
@ -632,7 +632,7 @@
priv->updating = FALSE; priv->updating = FALSE;
@@ -840,13 +840,12 @@ field_changed_cb (GtkWidget *widget, gpo @@ -885,13 +885,12 @@ field_changed_cb (GtkWidget *widget, gpo
} }
static void static void
@ -650,7 +650,7 @@
if (!priv->updating) { if (!priv->updating) {
ECal *client; ECal *client;
@@ -858,8 +857,9 @@ source_changed_cb (GtkWidget *widget, ES @@ -903,8 +902,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client) if (client)
g_object_unref (client); g_object_unref (client);
@ -662,7 +662,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
@@ -969,7 +969,7 @@ init_widgets (MemoPage *mpage) @@ -1028,7 +1028,7 @@ init_widgets (MemoPage *mpage)
G_CALLBACK (categories_clicked_cb), mpage); G_CALLBACK (categories_clicked_cb), mpage);
/* Source selector */ /* Source selector */
@ -671,7 +671,7 @@
G_CALLBACK (source_changed_cb), mpage); G_CALLBACK (source_changed_cb), mpage);
/* Connect the default signal handler to use to make sure the "changed" /* Connect the default signal handler to use to make sure the "changed"
@@ -1163,22 +1163,23 @@ memo_page_create_date_edit (void) @@ -1280,22 +1280,23 @@ memo_page_create_date_edit (void)
return dedit; return dedit;
} }
@ -702,8 +702,8 @@
+ gtk_widget_show (combo_box); + gtk_widget_show (combo_box);
+ return combo_box; + return combo_box;
} }
--- evolution-2.11.6/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 --- evolution-2.11.90/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400
+++ evolution-2.11.6/calendar/gui/dialogs/event-page.c 2007-07-31 10:38:26.000000000 -0400 +++ evolution-2.11.90/calendar/gui/dialogs/event-page.c 2007-08-15 13:42:59.000000000 -0400
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -713,15 +713,15 @@
#include "common/authentication.h" #include "common/authentication.h"
#include "e-util/e-categories-config.h" #include "e-util/e-categories-config.h"
#include "e-util/e-dialog-widgets.h" #include "e-util/e-dialog-widgets.h"
@@ -978,7 +978,6 @@ event_page_fill_widgets (CompEditorPage @@ -995,7 +995,6 @@ event_page_fill_widgets (CompEditorPage
ECalComponentDateTime start_date, end_date;
const char *location, *uid = NULL; const char *location, *uid = NULL;
const char *categories; const char *categories;
gchar *backend_addr = NULL;
- ESource *source; - ESource *source;
GSList *l; GSList *l;
gboolean validated = TRUE; gboolean validated = TRUE;
@@ -1174,8 +1173,9 @@ event_page_fill_widgets (CompEditorPage @@ -1208,8 +1207,9 @@ event_page_fill_widgets (CompEditorPage
e_dialog_editable_set (priv->categories, categories); e_dialog_editable_set (priv->categories, categories);
/* Source */ /* Source */
@ -733,7 +733,7 @@
e_cal_component_get_uid (comp, &uid); e_cal_component_get_uid (comp, &uid);
if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE)
@@ -2577,7 +2577,8 @@ event_page_sendoptions_clicked_cb (Event @@ -2655,7 +2655,8 @@ event_page_sendoptions_clicked_cb (Event
if (!priv->sod) { if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new (); priv->sod = e_sendoptions_dialog_new ();
@ -743,7 +743,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
priv->sod->data->initialized = TRUE; priv->sod->data->initialized = TRUE;
} }
@@ -2606,13 +2607,12 @@ field_changed_cb (GtkWidget *widget, gpo @@ -2684,13 +2685,12 @@ field_changed_cb (GtkWidget *widget, gpo
} }
static void static void
@ -761,7 +761,7 @@
if (!priv->updating) { if (!priv->updating) {
ECal *client; ECal *client;
@@ -2631,8 +2631,9 @@ source_changed_cb (GtkWidget *widget, ES @@ -2709,8 +2709,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client) if (client)
g_object_unref (client); g_object_unref (client);
@ -773,7 +773,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
@@ -2860,7 +2861,7 @@ init_widgets (EventPage *epage) @@ -2975,7 +2976,7 @@ init_widgets (EventPage *epage)
G_CALLBACK (categories_clicked_cb), epage); G_CALLBACK (categories_clicked_cb), epage);
/* Source selector */ /* Source selector */
@ -782,7 +782,7 @@
G_CALLBACK (source_changed_cb), epage); G_CALLBACK (source_changed_cb), epage);
/* Alarms */ /* Alarms */
priv->alarm_list_store = e_alarm_list_new (); priv->alarm_list_store = e_alarm_list_new ();
@@ -3161,24 +3162,25 @@ make_timezone_entry (void) @@ -3315,24 +3316,25 @@ make_timezone_entry (void)
return w; return w;
} }
@ -815,8 +815,8 @@
} }
GtkWidget *make_status_icons (void); GtkWidget *make_status_icons (void);
--- evolution-2.11.6/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 --- evolution-2.11.90/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400
+++ evolution-2.11.6/calendar/gui/dialogs/task-page.c 2007-07-31 10:39:29.000000000 -0400 +++ evolution-2.11.90/calendar/gui/dialogs/task-page.c 2007-08-15 13:42:01.000000000 -0400
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h> #include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -826,7 +826,7 @@
#include <misc/e-dateedit.h> #include <misc/e-dateedit.h>
#include <e-util/e-dialog-utils.h> #include <e-util/e-dialog-utils.h>
#include "common/authentication.h" #include "common/authentication.h"
@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage * @@ -528,7 +528,6 @@ task_page_fill_widgets (CompEditorPage *
icalcomponent *icalcomp; icalcomponent *icalcomp;
const char *categories, *uid; const char *categories, *uid;
icaltimezone *zone, *default_zone; icaltimezone *zone, *default_zone;
@ -834,7 +834,7 @@
tpage = TASK_PAGE (page); tpage = TASK_PAGE (page);
priv = tpage->priv; priv = tpage->priv;
@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage * @@ -672,8 +671,9 @@ task_page_fill_widgets (CompEditorPage *
e_dialog_editable_set (priv->categories, categories); e_dialog_editable_set (priv->categories, categories);
/* Source */ /* Source */
@ -846,7 +846,7 @@
if (priv->is_assignment) { if (priv->is_assignment) {
ECalComponentOrganizer organizer; ECalComponentOrganizer organizer;
@@ -1613,13 +1613,12 @@ field_changed_cb (GtkWidget *widget, gpo @@ -1686,13 +1686,12 @@ field_changed_cb (GtkWidget *widget, gpo
} }
static void static void
@ -864,7 +864,7 @@
if (!priv->updating) { if (!priv->updating) {
ECal *client; ECal *client;
@@ -1638,8 +1637,9 @@ source_changed_cb (GtkWidget *widget, ES @@ -1711,8 +1710,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client) if (client)
g_object_unref (client); g_object_unref (client);
@ -876,7 +876,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
@@ -1651,7 +1651,7 @@ source_changed_cb (GtkWidget *widget, ES @@ -1724,7 +1724,7 @@ source_changed_cb (GtkWidget *widget, ES
comp_editor_notify_client_changed ( comp_editor_notify_client_changed (
COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
client); client);
@ -885,7 +885,7 @@
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
task_page_show_options (tpage); task_page_show_options (tpage);
else else
@@ -1675,7 +1675,8 @@ task_page_sendoptions_clicked_cb (TaskPa @@ -1758,7 +1758,8 @@ task_page_sendoptions_clicked_cb (TaskPa
if (!priv->sod) { if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new (); priv->sod = e_sendoptions_dialog_new ();
priv->sod->data->initialized = TRUE; priv->sod->data->initialized = TRUE;
@ -895,7 +895,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "task"); e_sendoptions_utils_set_default_data (priv->sod, source, "task");
} }
@@ -1730,7 +1731,7 @@ init_widgets (TaskPage *tpage) @@ -1816,7 +1817,7 @@ init_widgets (TaskPage *tpage)
G_CALLBACK (categories_clicked_cb), tpage); G_CALLBACK (categories_clicked_cb), tpage);
/* Source selector */ /* Source selector */
@ -904,7 +904,7 @@
G_CALLBACK (source_changed_cb), tpage); G_CALLBACK (source_changed_cb), tpage);
/* Connect the default signal handler to use to make sure the "changed" /* Connect the default signal handler to use to make sure the "changed"
@@ -1951,22 +1952,23 @@ task_page_create_date_edit (void) @@ -2093,22 +2094,23 @@ task_page_create_date_edit (void)
return dedit; return dedit;
} }
@ -935,8 +935,8 @@
+ gtk_widget_show (combo_box); + gtk_widget_show (combo_box);
+ return combo_box; + return combo_box;
} }
--- evolution-2.11.6/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-30 10:19:22.000000000 -0400 --- evolution-2.11.90/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-05 02:11:20.000000000 -0400
+++ evolution-2.11.6/calendar/gui/e-itip-control.c 2007-07-31 10:01:40.000000000 -0400 +++ evolution-2.11.90/calendar/gui/e-itip-control.c 2007-08-15 13:42:01.000000000 -0400
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
#include <gtkhtml/gtkhtml-embedded.h> #include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-stream.h> #include <gtkhtml/gtkhtml-stream.h>

362
evolution-2.8.1-kill-ethread.patch
View File

File diff suppressed because it is too large Load Diff

5
evolution.spec
View File

@ -44,7 +44,7 @@
### Abstract ### ### Abstract ###
Name: evolution Name: evolution
Version: 2.11.6.1 Version: 2.11.90
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so %{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog %changelog
* Wed Aug 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-1.fc8
- Update to 2.11.90
* Wed Aug 8 2007 Matthias Clasen <mclasen@redhat.com> - 2.11.6.1-2 * Wed Aug 8 2007 Matthias Clasen <mclasen@redhat.com> - 2.11.6.1-2
- Update the license field - Update the license field
- Use %%find_lang for help files - Use %%find_lang for help files

2
sources
View File

@ -1 +1 @@
b27f011166d16b2484f9f68992c48108 evolution-2.11.6.1.tar.bz2 50b811f8799ef4e7143a53ffd1709c2b evolution-2.11.90.tar.bz2