rpms/evolution/devel .cvsignore, 1.77, 1.78 evolution-2.10.0-e-source-combo-box.patch, 1.5, 1.6 evolution.spec, 1.290, 1.291 sources, 1.77, 1.78 evolution-2.9.1-first-ascii.patch, 1.1, NONE
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon Sep 17 20:05:54 UTC 2007
- Previous message (by thread): rpms/gcstar/FC-6 gcstar.spec,1.6,1.7 sources,1.4,1.5
- Next message (by thread): rpms/qt4/EL-5 dead.package, NONE, 1.1 .cvsignore, 1.14, NONE 0154-qdbuscpp2xml-moc_path.diff, 1.1, NONE Trolltech.conf, 1.1, NONE assistant.desktop, 1.3, NONE designer.desktop, 1.2, NONE linguist.desktop, 1.2, NONE qconfig-multilib.h, 1.2, NONE qt-x11-opensource-src-4.1.2-assistant4.patch, 1.2, NONE qt-x11-opensource-src-4.2.2-multilib.patch, 1.1, NONE qt4-wrapper.sh, 1.3, NONE qt4.csh, 1.1, NONE qt4.macros, 1.1, NONE qt4.sh, 1.1, NONE qt4.spec, 1.31, NONE qtconfig.desktop, 1.3, NONE qtdemo.desktop, 1.2, NONE sources, 1.12, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27582
Modified Files:
.cvsignore evolution-2.10.0-e-source-combo-box.patch
evolution.spec sources
Removed Files:
evolution-2.9.1-first-ascii.patch
Log Message:
* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
- Update to 2.12.0
- Remove patch for RH bug #182247 (fixed upstream).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore 4 Sep 2007 03:23:24 -0000 1.77
+++ .cvsignore 17 Sep 2007 20:05:20 -0000 1.78
@@ -1 +1 @@
-evolution-2.11.92.tar.bz2
+evolution-2.12.0.tar.bz2
evolution-2.10.0-e-source-combo-box.patch:
Index: evolution-2.10.0-e-source-combo-box.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.10.0-e-source-combo-box.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-2.10.0-e-source-combo-box.patch 21 Aug 2007 02:45:51 -0000 1.5
+++ evolution-2.10.0-e-source-combo-box.patch 17 Sep 2007 20:05:20 -0000 1.6
@@ -1,5 +1,6 @@
---- 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.90/widgets/misc/e-pilot-settings.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.12.0/widgets/misc/e-pilot-settings.c
+--- evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-09-16 15:33:23.000000000 -0400
++++ evolution-2.12.0/widgets/misc/e-pilot-settings.c 2007-09-17 14:31:05.000000000 -0400
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
@@ -40,8 +41,9 @@
}
gboolean
---- 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.90/plugins/itip-formatter/itip-formatter.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-formatter.c
+--- evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-09-16 15:16:41.000000000 -0400
++++ evolution-2.12.0/plugins/itip-formatter/itip-formatter.c 2007-09-17 14:31:05.000000000 -0400
@@ -40,7 +40,7 @@
#include <camel/camel-store.h>
#include <libecal/e-cal.h>
@@ -51,8 +53,9 @@
#include <libedataserverui/e-source-selector.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include <mail/em-format-hook.h>
---- 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.90/plugins/itip-formatter/itip-view.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-view.c
+--- evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-09-16 15:16:41.000000000 -0400
++++ evolution-2.12.0/plugins/itip-formatter/itip-view.c 2007-09-17 14:31:05.000000000 -0400
@@ -35,7 +35,7 @@
#include <camel/camel-mime-message.h>
#include <libedataserver/e-time-utils.h>
@@ -177,8 +180,9 @@
}
void
---- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400
-+++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/gaimbuddies.c
+--- evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-09-16 15:16:13.000000000 -0400
++++ evolution-2.12.0/plugins/bbdb/gaimbuddies.c 2007-09-17 14:31:05.000000000 -0400
@@ -44,7 +44,7 @@
#include <string.h>
@@ -188,8 +192,9 @@
#include <sys/time.h>
#include <sys/stat.h>
---- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400
-+++ evolution-2.11.90/plugins/bbdb/bbdb.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/bbdb.c
+--- evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box 2007-09-16 15:16:13.000000000 -0400
++++ evolution-2.12.0/plugins/bbdb/bbdb.c 2007-09-17 14:31:05.000000000 -0400
@@ -40,7 +40,7 @@
#include <string.h>
@@ -408,8 +413,9 @@
gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL));
gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0);
stuff->gaim_option_menu = gaim_option;
---- 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.90/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade
+--- evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-09-16 14:53:41.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-09-17 14:31:05.000000000 -0400
@@ -158,9 +158,9 @@
</child>
@@ -422,8 +428,9 @@
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
---- 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.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+--- evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-09-16 14:53:41.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-09-17 14:31:05.000000000 -0400
@@ -33,7 +33,7 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkdialog.h>
@@ -539,8 +546,9 @@
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);
}
---- 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.90/addressbook/gui/contact-editor/contact-editor.glade 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade
+--- evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade 2007-09-17 14:31:05.000000000 -0400
@@ -356,9 +356,9 @@
</child>
@@ -553,8 +561,9 @@
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
---- 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.90/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-09-17 14:31:05.000000000 -0400
@@ -46,7 +46,7 @@
#include <text/e-entry.h>
@@ -667,8 +676,9 @@
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- 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.90/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400
++++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-09-17 14:31:05.000000000 -0400
@@ -37,7 +37,7 @@
#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
@@ -717,8 +727,9 @@
g_object_unref (source_list);
---- 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.90/calendar/gui/dialogs/memo-page.glade 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/memo-page.glade 2007-09-17 14:31:05.000000000 -0400
@@ -194,7 +194,7 @@
<child>
<widget class="Custom" id="source">
@@ -728,8 +739,9 @@
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
---- 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.90/calendar/gui/dialogs/event-page.glade 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-page.glade 2007-09-17 14:31:05.000000000 -0400
@@ -827,7 +827,7 @@
<child>
<widget class="Custom" id="source">
@@ -739,8 +751,9 @@
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
---- 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.90/calendar/gui/dialogs/task-page.glade 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.glade
+--- evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-page.glade 2007-09-17 14:31:05.000000000 -0400
@@ -671,7 +671,7 @@
<widget class="Custom" id="source">
<property name="height_request">24</property>
@@ -750,8 +763,9 @@
<property name="int1">0</property>
<property name="int2">0</property>
<property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
---- 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.90/calendar/gui/dialogs/memo-page.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/memo-page.c 2007-09-17 14:31:44.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h>
@@ -761,16 +775,16 @@
#include <libedataserverui/e-name-selector.h>
#include <libedataserverui/e-name-selector-entry.h>
#include <libedataserverui/e-name-selector-list.h>
-@@ -349,7 +349,6 @@ memo_page_fill_widgets (CompEditorPage *
- ECalComponentDateTime d;
+@@ -352,7 +352,6 @@ memo_page_fill_widgets (CompEditorPage *
GSList *l;
const char *categories;
+ gchar *backend_addr = NULL;
- ESource *source;
mpage = MEMO_PAGE (page);
priv = mpage->priv;
-@@ -442,8 +441,9 @@ memo_page_fill_widgets (CompEditorPage *
- }
+@@ -451,8 +450,9 @@ memo_page_fill_widgets (CompEditorPage *
+ g_free (backend_addr);
/* Source */
- source = e_cal_get_source (page->client);
@@ -781,7 +795,7 @@
priv->updating = FALSE;
-@@ -885,13 +885,12 @@ field_changed_cb (GtkWidget *widget, gpo
+@@ -893,13 +893,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -799,7 +813,7 @@
if (!priv->updating) {
ECal *client;
-@@ -903,8 +902,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -911,8 +910,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -811,7 +825,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1028,7 +1028,7 @@ init_widgets (MemoPage *mpage)
+@@ -1055,7 +1055,7 @@ init_widgets (MemoPage *mpage)
G_CALLBACK (categories_clicked_cb), mpage);
/* Source selector */
@@ -820,7 +834,7 @@
G_CALLBACK (source_changed_cb), mpage);
/* Connect the default signal handler to use to make sure the "changed"
-@@ -1280,22 +1280,23 @@ memo_page_create_date_edit (void)
+@@ -1271,22 +1271,23 @@ memo_page_create_date_edit (void)
return dedit;
}
@@ -851,8 +865,9 @@
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- 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.90/calendar/gui/dialogs/event-page.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/event-page.c 2007-09-17 14:31:05.000000000 -0400
@@ -33,7 +33,7 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
@@ -862,7 +877,7 @@
#include "common/authentication.h"
#include "e-util/e-categories-config.h"
#include "e-util/e-dialog-widgets.h"
-@@ -995,7 +995,6 @@ event_page_fill_widgets (CompEditorPage
+@@ -1000,7 +1000,6 @@ event_page_fill_widgets (CompEditorPage
const char *location, *uid = NULL;
const char *categories;
gchar *backend_addr = NULL;
@@ -870,7 +885,7 @@
GSList *l;
gboolean validated = TRUE;
-@@ -1208,8 +1207,9 @@ event_page_fill_widgets (CompEditorPage
+@@ -1215,8 +1214,9 @@ event_page_fill_widgets (CompEditorPage
e_dialog_editable_set (priv->categories, categories);
/* Source */
@@ -882,7 +897,7 @@
e_cal_component_get_uid (comp, &uid);
if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE)
-@@ -2655,7 +2655,8 @@ event_page_sendoptions_clicked_cb (Event
+@@ -2662,7 +2662,8 @@ event_page_sendoptions_clicked_cb (Event
if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new ();
@@ -892,7 +907,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
priv->sod->data->initialized = TRUE;
}
-@@ -2684,13 +2685,12 @@ field_changed_cb (GtkWidget *widget, gpo
+@@ -2691,13 +2692,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -910,7 +925,7 @@
if (!priv->updating) {
ECal *client;
-@@ -2709,8 +2709,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -2716,8 +2716,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -922,7 +937,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2975,7 +2976,7 @@ init_widgets (EventPage *epage)
+@@ -2980,7 +2981,7 @@ init_widgets (EventPage *epage)
G_CALLBACK (categories_clicked_cb), epage);
/* Source selector */
@@ -931,7 +946,7 @@
G_CALLBACK (source_changed_cb), epage);
/* Alarms */
priv->alarm_list_store = e_alarm_list_new ();
-@@ -3315,24 +3316,25 @@ make_timezone_entry (void)
+@@ -3306,24 +3307,25 @@ make_timezone_entry (void)
return w;
}
@@ -964,8 +979,9 @@
}
GtkWidget *make_status_icons (void);
---- 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.90/calendar/gui/dialogs/task-page.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.c
+--- evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400
++++ evolution-2.12.0/calendar/gui/dialogs/task-page.c 2007-09-17 14:31:58.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h>
@@ -975,15 +991,15 @@
#include <misc/e-dateedit.h>
#include <e-util/e-dialog-utils.h>
#include "common/authentication.h"
-@@ -528,7 +528,6 @@ task_page_fill_widgets (CompEditorPage *
- icalcomponent *icalcomp;
+@@ -533,7 +533,6 @@ task_page_fill_widgets (CompEditorPage *
const char *categories, *uid;
icaltimezone *zone, *default_zone;
+ gchar *backend_addr = NULL;
- ESource *source;
tpage = TASK_PAGE (page);
priv = tpage->priv;
-@@ -672,8 +671,9 @@ task_page_fill_widgets (CompEditorPage *
+@@ -677,8 +676,9 @@ task_page_fill_widgets (CompEditorPage *
e_dialog_editable_set (priv->categories, categories);
/* Source */
@@ -993,9 +1009,9 @@
+ E_SOURCE_COMBO_BOX (priv->source_selector),
+ e_cal_get_source (page->client));
- if (priv->is_assignment) {
- ECalComponentOrganizer organizer;
-@@ -1686,13 +1686,12 @@ field_changed_cb (GtkWidget *widget, gpo
+ e_cal_get_cal_address (COMP_EDITOR_PAGE (tpage)->client, &backend_addr, NULL);
+ set_subscriber_info_string (tpage, backend_addr);
+@@ -1688,13 +1688,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -1013,7 +1029,7 @@
if (!priv->updating) {
ECal *client;
-@@ -1711,8 +1710,9 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -1713,8 +1712,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -1025,7 +1041,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1724,7 +1724,7 @@ source_changed_cb (GtkWidget *widget, ES
+@@ -1726,7 +1726,7 @@ source_changed_cb (GtkWidget *widget, ES
comp_editor_notify_client_changed (
COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
client);
@@ -1034,7 +1050,7 @@
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
task_page_show_options (tpage);
else
-@@ -1758,7 +1758,8 @@ task_page_sendoptions_clicked_cb (TaskPa
+@@ -1778,7 +1778,8 @@ task_page_sendoptions_clicked_cb (TaskPa
if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new ();
priv->sod->data->initialized = TRUE;
@@ -1044,7 +1060,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "task");
}
-@@ -1816,7 +1817,7 @@ init_widgets (TaskPage *tpage)
+@@ -1836,7 +1837,7 @@ init_widgets (TaskPage *tpage)
G_CALLBACK (categories_clicked_cb), tpage);
/* Source selector */
@@ -1053,7 +1069,7 @@
G_CALLBACK (source_changed_cb), tpage);
/* Connect the default signal handler to use to make sure the "changed"
-@@ -2093,22 +2094,23 @@ task_page_create_date_edit (void)
+@@ -2081,22 +2082,23 @@ task_page_create_date_edit (void)
return dedit;
}
@@ -1084,8 +1100,9 @@
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- 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.90/calendar/gui/e-itip-control.c 2007-08-20 21:59:26.000000000 -0400
+diff -up evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.12.0/calendar/gui/e-itip-control.c
+--- evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-09-16 15:34:45.000000000 -0400
++++ evolution-2.12.0/calendar/gui/e-itip-control.c 2007-09-17 14:31:05.000000000 -0400
@@ -44,7 +44,7 @@
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-stream.h>
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- evolution.spec 15 Sep 2007 21:38:15 -0000 1.290
+++ evolution.spec 17 Sep 2007 20:05:20 -0000 1.291
@@ -44,8 +44,8 @@
### Abstract ###
Name: evolution
-Version: 2.11.92
-Release: 4%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -103,9 +103,6 @@
# RH bug #176400
Patch27: evolution-2.9.1-im-context-reset.patch
-# RH bug #182247
-Patch28: evolution-2.9.1-first-ascii.patch
-
# RH bug #216537 / GNOME bug #383047
#Patch29: evolution-2.9.3-view-attachment-uri.patch
@@ -260,7 +257,6 @@
%patch25 -p1 -b .kill-ethread
%patch26 -p1 -b .kill-ememory
%patch27 -p1 -b .im-context-reset
-%patch28 -p1 -b .first-ascii
#%patch29 -p1 -b .view-attachment-uri
%patch30 -p1 -b .source-path-entry
%patch31 -p1 -b .meeting-list-view
@@ -674,7 +670,6 @@
%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
%{evo_plugin_dir}/org-gnome-publish-calendar.xml
-%{evo_plugin_dir}/publish-calendar.glade
%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
@@ -717,6 +712,10 @@
# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
%changelog
+* Mon Sep 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+- Remove patch for RH bug #182247 (fixed upstream).
+
* Sat Sep 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.92-4.fc8
- Add patch for GNOME bug #477045 (use standard icon names).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources 4 Sep 2007 03:23:24 -0000 1.77
+++ sources 17 Sep 2007 20:05:20 -0000 1.78
@@ -1 +1 @@
-4149faf2ee5f0b0ed10114b076fb0ade evolution-2.11.92.tar.bz2
+aaa378a63477b56de214ea9eaa7f8560 evolution-2.12.0.tar.bz2
--- evolution-2.9.1-first-ascii.patch DELETED ---
- Previous message (by thread): rpms/gcstar/FC-6 gcstar.spec,1.6,1.7 sources,1.4,1.5
- Next message (by thread): rpms/qt4/EL-5 dead.package, NONE, 1.1 .cvsignore, 1.14, NONE 0154-qdbuscpp2xml-moc_path.diff, 1.1, NONE Trolltech.conf, 1.1, NONE assistant.desktop, 1.3, NONE designer.desktop, 1.2, NONE linguist.desktop, 1.2, NONE qconfig-multilib.h, 1.2, NONE qt-x11-opensource-src-4.1.2-assistant4.patch, 1.2, NONE qt-x11-opensource-src-4.2.2-multilib.patch, 1.1, NONE qt4-wrapper.sh, 1.3, NONE qt4.csh, 1.1, NONE qt4.macros, 1.1, NONE qt4.sh, 1.1, NONE qt4.spec, 1.31, NONE qtconfig.desktop, 1.3, NONE qtdemo.desktop, 1.2, NONE sources, 1.12, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list