rpms/evolution/devel .cvsignore, 1.73, 1.74 evolution-2.10.0-e-source-combo-box.patch, 1.2, 1.3 evolution.spec, 1.273, 1.274 sources, 1.73, 1.74 evolution-2.11.3-e-clipped-label.patch, 1.1, NONE evolution-2.11.5-implicit-function-declarations.patch, 1.1, NONE evolution-2.11.5-version-checks.patch, 1.1, NONE
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Wed Aug 1 18:21:07 UTC 2007
- Previous message (by thread): rpms/kernel/F-7 linux-2.6-net-dst_entry-reorder-crash.patch, NONE, 1.1 kernel-2.6.spec, 1.3302, 1.3303
- Next message (by thread): rpms/evolution-exchange/devel .cvsignore, 1.4, 1.5 evolution-exchange.spec, 1.4, 1.5 sources, 1.4, 1.5 evolution-exchange-2.11.5-fix-warnings.patch, 1.1, NONE evolution-exchange-2.11.5-version-checks.patch, 1.1, 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-serv5420
Modified Files:
.cvsignore evolution-2.10.0-e-source-combo-box.patch
evolution.spec sources
Removed Files:
evolution-2.11.3-e-clipped-label.patch
evolution-2.11.5-implicit-function-declarations.patch
evolution-2.11.5-version-checks.patch
Log Message:
* Wed Aug 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.6.1-1.fc8
- Update to 2.11.6.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore 14 Jul 2007 17:14:42 -0000 1.73
+++ .cvsignore 1 Aug 2007 18:20:35 -0000 1.74
@@ -1 +1 @@
-evolution-2.11.5.tar.bz2
+evolution-2.11.6.1.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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.10.0-e-source-combo-box.patch 19 May 2007 00:56:12 -0000 1.2
+++ evolution-2.10.0-e-source-combo-box.patch 1 Aug 2007 18:20:35 -0000 1.3
@@ -1,5 +1,5 @@
---- evolution-2.11.2/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-18 06:18:34.000000000 -0400
-+++ evolution-2.11.2/widgets/misc/e-pilot-settings.c 2007-05-18 15:49:15.000000000 -0400
+--- 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.6/widgets/misc/e-pilot-settings.c 2007-07-31 10:01:40.000000000 -0400
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
@@ -9,7 +9,7 @@
#include "e-pilot-settings.h"
struct _EPilotSettingsPrivate
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ build_ui (EPilotSettings *ps, ESourceLis
lbl = gtk_label_new (_("Sync with:"));
gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
@@ -18,7 +18,7 @@
gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1);
gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1);
gtk_widget_show (lbl);
-@@ -152,8 +152,9 @@
+@@ -152,8 +152,9 @@ e_pilot_settings_get_source (EPilotSetti
g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE);
priv = ps->priv;
@@ -30,7 +30,7 @@
}
void
-@@ -166,7 +167,8 @@
+@@ -166,7 +167,8 @@ e_pilot_settings_set_source (EPilotSetti
priv = ps->priv;
@@ -40,9 +40,9 @@
}
gboolean
---- evolution-2.11.2/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-04-18 06:17:20.000000000 -0400
-+++ evolution-2.11.2/plugins/itip-formatter/itip-formatter.c 2007-05-18 15:48:37.000000000 -0400
-@@ -39,7 +39,7 @@
+--- 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.6/plugins/itip-formatter/itip-formatter.c 2007-07-31 10:01:40.000000000 -0400
+@@ -40,7 +40,7 @@
#include <camel/camel-store.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
@@ -51,8 +51,8 @@
#include <libedataserverui/e-source-selector.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include <mail/em-format-hook.h>
---- evolution-2.11.2/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-05-13 13:41:08.000000000 -0400
-+++ evolution-2.11.2/plugins/itip-formatter/itip-view.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/plugins/itip-formatter/itip-view.c 2007-07-31 10:01:40.000000000 -0400
@@ -35,7 +35,7 @@
#include <camel/camel-mime-message.h>
#include <libedataserver/e-time-utils.h>
@@ -62,7 +62,7 @@
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
#include <gtkhtml/gtkhtml-embedded.h>
-@@ -103,8 +103,8 @@
+@@ -105,8 +105,8 @@ struct _ItipViewPrivate {
char *description;
GtkWidget *selector_box;
@@ -73,7 +73,7 @@
ESourceList *source_list;
GtkWidget *rsvp_box;
-@@ -1671,10 +1671,12 @@
+@@ -1788,10 +1788,12 @@ itip_view_clear_lower_info_items (ItipVi
}
static void
@@ -89,7 +89,7 @@
g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
}
-@@ -1691,40 +1693,42 @@
+@@ -1808,40 +1810,42 @@ itip_view_set_source_list (ItipView *vie
if (priv->source_list)
g_object_unref (priv->source_list);
@@ -149,7 +149,7 @@
}
ESourceList *
-@@ -1750,10 +1754,11 @@
+@@ -1867,10 +1871,11 @@ itip_view_set_source (ItipView *view, ES
priv = view->priv;
@@ -163,7 +163,7 @@
}
ESource *
-@@ -1766,10 +1771,11 @@
+@@ -1883,10 +1888,11 @@ itip_view_get_source (ItipView *view)
priv = view->priv;
@@ -177,8 +177,8 @@
}
void
---- evolution-2.11.2/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-05-13 13:41:06.000000000 -0400
-+++ evolution-2.11.2/plugins/bbdb/gaimbuddies.c 2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400
++++ evolution-2.11.6/plugins/bbdb/gaimbuddies.c 2007-07-31 10:01:40.000000000 -0400
@@ -44,7 +44,7 @@
#include <string.h>
@@ -188,8 +188,8 @@
#include <sys/time.h>
#include <sys/stat.h>
---- evolution-2.11.2/plugins/bbdb/bbdb.c.e-source-combo-box 2007-04-18 06:17:14.000000000 -0400
-+++ evolution-2.11.2/plugins/bbdb/bbdb.c 2007-05-18 15:48:37.000000000 -0400
+--- evolution-2.11.6/plugins/bbdb/bbdb.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400
++++ evolution-2.11.6/plugins/bbdb/bbdb.c 2007-07-31 10:01:40.000000000 -0400
@@ -40,7 +40,7 @@
#include <string.h>
@@ -199,7 +199,7 @@
#include <e-util/e-config.h>
#include <mail/em-config.h>
-@@ -341,7 +341,8 @@
+@@ -353,7 +353,8 @@ enable_toggled_cb (GtkWidget *widget, gp
gtk_widget_set_sensitive (stuff->option_menu, active);
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);
}
}
-@@ -360,7 +361,8 @@
+@@ -372,7 +373,8 @@ enable_gaim_toggled_cb (GtkWidget *widge
gtk_widget_set_sensitive (stuff->gaim_option_menu, active);
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);
}
}
-@@ -389,31 +391,32 @@
+@@ -401,31 +403,32 @@ gaim_source_changed_cb (GtkWidget *widge
static GtkWidget *
create_addressbook_option_menu (struct bbdb_stuff *stuff, int type)
{
@@ -259,8 +259,8 @@
}
GtkWidget *
---- evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-05-14 00:24:02.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-07-31 10:01:40.000000000 -0400
@@ -158,9 +158,9 @@
</child>
@@ -273,8 +273,8 @@
<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.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-04-18 06:15:40.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-07-31 10:01:40.000000000 -0400
@@ -33,7 +33,7 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkdialog.h>
@@ -284,7 +284,7 @@
#include <table/e-table-scrolled.h>
#include <libgnomevfs/gnome-vfs-ops.h>
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ static void select_cb (GtkWidget *w, ECo
static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);
static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor);
static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
@@ -293,7 +293,7 @@
static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor);
static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor);
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ e_contact_list_editor_init (EContactList
editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry");
editor->list_image = glade_xml_get_widget (gui, "list-image");
editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
@@ -302,7 +302,7 @@
editor->ok_button = glade_xml_get_widget (gui, "ok-button");
editor->cancel_button = glade_xml_get_widget (gui, "cancel-button");
-@@ -276,7 +276,7 @@
+@@ -276,7 +276,7 @@ e_contact_list_editor_init (EContactList
"changed", G_CALLBACK(list_image_changed_cb), editor);
g_signal_connect (editor->source_menu,
@@ -311,7 +311,7 @@
command_state_changed (editor);
-@@ -306,8 +306,9 @@
+@@ -306,8 +306,9 @@ new_target_cb (EBook *new_book, EBookSta
if (status != E_BOOK_ERROR_OK || new_book == NULL) {
eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
@@ -323,7 +323,7 @@
if (new_book)
g_object_unref (new_book);
-@@ -332,8 +333,12 @@
+@@ -332,8 +333,12 @@ cancel_load (EContactListEditor *editor)
}
static void
@@ -337,7 +337,7 @@
cancel_load (editor);
if (e_source_equal (e_book_get_source (editor->book), source))
-@@ -795,28 +800,28 @@
+@@ -795,28 +800,28 @@ select_cb (GtkWidget *w, EContactListEdi
}
GtkWidget *
@@ -376,7 +376,7 @@
}
GtkWidget *
-@@ -1262,10 +1267,9 @@
+@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor)
}
if (editor->book) {
@@ -390,8 +390,8 @@
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.2/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/addressbook/gui/contact-editor/contact-editor.glade 2007-07-31 10:01:40.000000000 -0400
@@ -356,9 +356,9 @@
</child>
@@ -404,8 +404,8 @@
<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.2/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-05-09 00:14:39.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/addressbook/gui/contact-editor/e-contact-editor.c 2007-07-31 10:10:58.000000000 -0400
@@ -46,7 +46,7 @@
#include <text/e-entry.h>
@@ -415,7 +415,7 @@
#include <camel/camel.h>
-@@ -589,15 +589,16 @@
+@@ -589,15 +589,16 @@ static void
fill_in_source_field (EContactEditor *editor)
{
GtkWidget *source_menu;
@@ -436,7 +436,7 @@
}
static void
-@@ -2521,13 +2522,15 @@
+@@ -2521,13 +2522,15 @@ new_target_cb (EBook *new_book, EBookSta
editor->load_book = NULL;
if (status != E_BOOK_ERROR_OK || new_book == NULL) {
@@ -456,7 +456,7 @@
if (new_book)
g_object_unref (new_book);
-@@ -2551,8 +2554,12 @@
+@@ -2551,8 +2554,12 @@ cancel_load (EContactEditor *editor)
}
static void
@@ -470,7 +470,7 @@
cancel_load (editor);
if (e_source_equal (e_book_get_source (editor->target_book), source))
-@@ -3323,8 +3330,8 @@
+@@ -3373,8 +3380,8 @@ e_contact_editor_init (EContactEditor *e
g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor);
widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
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");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok");
-@@ -3775,25 +3782,25 @@
+@@ -3825,26 +3832,26 @@ e_contact_editor_create_web(gchar *name,
}
GtkWidget *
@@ -489,16 +489,16 @@
- gchar *string1, gchar *string2,
- gint int1, gint int2);
+e_contact_editor_create_source_combo_box (gchar *name,
-+ gchar *string1, gchar *string2,
-+ gint int1, gint int2);
++ gchar *string1, gchar *string2,
++ gint int1, gint int2);
GtkWidget *
-e_contact_editor_create_source_option_menu (gchar *name,
- gchar *string1, gchar *string2,
- gint int1, gint int2)
+e_contact_editor_create_source_combo_box (gchar *name,
-+ gchar *string1, gchar *string2,
-+ gint int1, gint int2)
++ gchar *string1, gchar *string2,
++ gint int1, gint int2)
{
- GtkWidget *menu;
+ GtkWidget *combo_box;
@@ -511,14 +511,15 @@
- menu = e_source_option_menu_new (source_list);
+ combo_box = e_source_combo_box_new (source_list);
g_object_unref (source_list);
+ g_object_unref (gconf_client);
- gtk_widget_show (menu);
- return menu;
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400
-+++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-07-31 10:12:50.000000000 -0400
@@ -37,7 +37,7 @@
#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
@@ -528,7 +529,7 @@
#include <addressbook/gui/component/addressbook.h>
#include <addressbook/util/eab-book-util.h>
#include "e-contact-editor.h"
-@@ -267,8 +267,12 @@
+@@ -269,8 +269,12 @@ clicked_cb (GtkWidget *w, gint button, g
}
static void
@@ -542,10 +543,10 @@
if (qa->book) {
g_object_unref (qa->book);
qa->book = NULL;
-@@ -316,16 +320,20 @@
-
+@@ -319,16 +323,20 @@ build_quick_add_dialog (QuickAdd *qa)
gconf_client = gconf_client_get_default ();
source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
+ g_object_unref (gconf_client);
- qa->option_menu = e_source_option_menu_new (source_list);
+ qa->option_menu = e_source_combo_box_new (source_list);
book = e_book_new_default_addressbook (NULL);
@@ -567,8 +568,8 @@
g_object_unref (source_list);
---- evolution-2.11.2/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/memo-page.glade 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/calendar/gui/dialogs/memo-page.glade 2007-07-31 10:01:40.000000000 -0400
@@ -141,7 +141,7 @@
<child>
<widget class="Custom" id="source">
@@ -578,9 +579,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.2/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/event-page.glade 2007-05-18 15:48:37.000000000 -0400
-@@ -774,7 +774,7 @@
+--- 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.6/calendar/gui/dialogs/event-page.glade 2007-07-31 10:01:40.000000000 -0400
+@@ -775,7 +775,7 @@
<child>
<widget class="Custom" id="source">
<property name="visible">True</property>
@@ -589,8 +590,8 @@
<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.2/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/task-page.glade 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/calendar/gui/dialogs/task-page.glade 2007-07-31 10:01:40.000000000 -0400
@@ -618,7 +618,7 @@
<widget class="Custom" id="source">
<property name="height_request">24</property>
@@ -600,8 +601,8 @@
<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.2/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/memo-page.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/calendar/gui/dialogs/memo-page.c 2007-07-31 10:14:31.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h>
@@ -611,7 +612,7 @@
#include <libedataserverui/e-name-selector.h>
#include <libedataserverui/e-name-selector-entry.h>
#include <libedataserverui/e-name-selector-list.h>
-@@ -339,7 +339,6 @@
+@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage *
ECalComponentDateTime d;
GSList *l;
const char *categories;
@@ -619,7 +620,7 @@
mpage = MEMO_PAGE (page);
priv = mpage->priv;
-@@ -432,8 +431,9 @@
+@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage *
}
/* Source */
@@ -631,7 +632,7 @@
priv->updating = FALSE;
-@@ -842,13 +842,12 @@
+@@ -840,13 +840,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -649,7 +650,7 @@
if (!priv->updating) {
ECal *client;
-@@ -860,8 +859,9 @@
+@@ -858,8 +857,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -661,7 +662,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -971,7 +971,7 @@
+@@ -969,7 +969,7 @@ init_widgets (MemoPage *mpage)
G_CALLBACK (categories_clicked_cb), mpage);
/* Source selector */
@@ -670,7 +671,7 @@
G_CALLBACK (source_changed_cb), mpage);
/* Connect the default signal handler to use to make sure the "changed"
-@@ -1165,21 +1165,22 @@
+@@ -1163,22 +1163,23 @@ memo_page_create_date_edit (void)
return dedit;
}
@@ -694,14 +695,15 @@
- menu = e_source_option_menu_new (source_list);
+ combo_box = e_source_combo_box_new (source_list);
g_object_unref (source_list);
+ g_object_unref (gconf_client);
- gtk_widget_show (menu);
- return menu;
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- evolution-2.11.2/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/event-page.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/calendar/gui/dialogs/event-page.c 2007-07-31 10:38:26.000000000 -0400
@@ -33,7 +33,7 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
@@ -711,7 +713,7 @@
#include "common/authentication.h"
#include "e-util/e-categories-config.h"
#include "e-util/e-dialog-widgets.h"
-@@ -969,7 +969,6 @@
+@@ -978,7 +978,6 @@ event_page_fill_widgets (CompEditorPage
ECalComponentDateTime start_date, end_date;
const char *location, *uid = NULL;
const char *categories;
@@ -719,7 +721,7 @@
GSList *l;
gboolean validated = TRUE;
-@@ -1165,8 +1164,9 @@
+@@ -1174,8 +1173,9 @@ event_page_fill_widgets (CompEditorPage
e_dialog_editable_set (priv->categories, categories);
/* Source */
@@ -731,7 +733,7 @@
e_cal_component_get_uid (comp, &uid);
if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE)
-@@ -2566,7 +2566,8 @@
+@@ -2577,7 +2577,8 @@ event_page_sendoptions_clicked_cb (Event
if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new ();
@@ -741,7 +743,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
priv->sod->data->initialized = TRUE;
}
-@@ -2595,13 +2596,12 @@
+@@ -2606,13 +2607,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -759,7 +761,7 @@
if (!priv->updating) {
ECal *client;
-@@ -2620,8 +2620,9 @@
+@@ -2631,8 +2631,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -771,7 +773,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2847,7 +2848,7 @@
+@@ -2860,7 +2861,7 @@ init_widgets (EventPage *epage)
G_CALLBACK (categories_clicked_cb), epage);
/* Source selector */
@@ -780,7 +782,7 @@
G_CALLBACK (source_changed_cb), epage);
/* Alarms */
priv->alarm_list_store = e_alarm_list_new ();
-@@ -3148,23 +3149,24 @@
+@@ -3161,24 +3162,25 @@ make_timezone_entry (void)
return w;
}
@@ -804,6 +806,7 @@
- menu = e_source_option_menu_new (source_list);
+ combo_box = e_source_combo_box_new (source_list);
g_object_unref (source_list);
+ g_object_unref (gconf_client);
- gtk_widget_show (menu);
- return menu;
@@ -812,8 +815,8 @@
}
GtkWidget *make_status_icons (void);
---- evolution-2.11.2/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/dialogs/task-page.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/calendar/gui/dialogs/task-page.c 2007-07-31 10:39:29.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h>
@@ -823,7 +826,7 @@
#include <misc/e-dateedit.h>
#include <e-util/e-dialog-utils.h>
#include "common/authentication.h"
-@@ -513,7 +513,6 @@
+@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage *
icalcomponent *icalcomp;
const char *categories, *uid;
icaltimezone *zone, *default_zone;
@@ -831,7 +834,7 @@
tpage = TASK_PAGE (page);
priv = tpage->priv;
-@@ -657,8 +656,9 @@
+@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage *
e_dialog_editable_set (priv->categories, categories);
/* Source */
@@ -843,7 +846,7 @@
if (priv->is_assignment) {
ECalComponentOrganizer organizer;
-@@ -1615,13 +1615,12 @@
+@@ -1613,13 +1613,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -861,7 +864,7 @@
if (!priv->updating) {
ECal *client;
-@@ -1640,8 +1639,9 @@
+@@ -1638,8 +1637,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -873,7 +876,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1653,7 +1653,7 @@
+@@ -1651,7 +1651,7 @@ source_changed_cb (GtkWidget *widget, ES
comp_editor_notify_client_changed (
COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
client);
@@ -882,7 +885,7 @@
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
task_page_show_options (tpage);
else
-@@ -1677,7 +1677,8 @@
+@@ -1675,7 +1675,8 @@ task_page_sendoptions_clicked_cb (TaskPa
if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new ();
priv->sod->data->initialized = TRUE;
@@ -892,7 +895,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "task");
}
-@@ -1732,7 +1733,7 @@
+@@ -1730,7 +1731,7 @@ init_widgets (TaskPage *tpage)
G_CALLBACK (categories_clicked_cb), tpage);
/* Source selector */
@@ -901,7 +904,7 @@
G_CALLBACK (source_changed_cb), tpage);
/* Connect the default signal handler to use to make sure the "changed"
-@@ -1953,21 +1954,22 @@
+@@ -1951,22 +1952,23 @@ task_page_create_date_edit (void)
return dedit;
}
@@ -925,14 +928,15 @@
- menu = e_source_option_menu_new (source_list);
+ combo_box = e_source_combo_box_new (source_list);
g_object_unref (source_list);
+ g_object_unref (gconf_client);
- gtk_widget_show (menu);
- return menu;
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- evolution-2.11.2/calendar/gui/e-itip-control.c.e-source-combo-box 2007-04-20 00:28:27.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/e-itip-control.c 2007-05-18 15:48:37.000000000 -0400
+--- 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.6/calendar/gui/e-itip-control.c 2007-07-31 10:01:40.000000000 -0400
@@ -44,7 +44,7 @@
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-stream.h>
@@ -942,7 +946,7 @@
#include <libical/ical.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-time-util.h>
-@@ -226,13 +226,13 @@
+@@ -226,13 +226,13 @@ typedef struct {
} EItipControlFindData;
static void
@@ -961,7 +965,7 @@
if (priv->ok)
gtk_widget_set_sensitive (priv->ok, FALSE);
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda
cleanup:
if (fd->count == 0) {
if (fd->show_selector && !priv->current_ecal && priv->vbox) {
@@ -970,7 +974,7 @@
char *uid;
switch (priv->type) {
-@@ -297,17 +297,17 @@
+@@ -297,17 +297,17 @@ find_cal_opened_cb (ECal *ecal, ECalenda
if (!source)
source = e_source_list_peek_source_any (priv->source_lists[priv->type]);
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- evolution.spec 27 Jul 2007 14:42:54 -0000 1.273
+++ evolution.spec 1 Aug 2007 18:20:35 -0000 1.274
@@ -44,8 +44,8 @@
### Abstract ###
Name: evolution
-Version: 2.11.5
-Release: 3%{?dist}
+Version: 2.11.6.1
+Release: 1%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -131,12 +131,6 @@
# GNOME bug #417999
Patch34: evolution-2.10.0-e-source-combo-box.patch
-# More implicit function declarations...
-Patch35: evolution-2.11.5-implicit-function-declarations.patch
-
-# GNOME bug #380534
-Patch36: evolution-2.11.5-version-checks.patch
-
## Dependencies ###
Requires(post): GConf2
@@ -275,8 +269,6 @@
%patch32 -p1 -b .view-message-source
%patch33 -p1 -b .e-passwords
%patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .implicit-function-declarations
-%patch36 -p1 -b .version-checks
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -617,6 +609,10 @@
%{evo_plugin_dir}/org-gnome-folder-permissions.xml
%{evo_plugin_dir}/org-gnome-folder-subscription.xml
+%{evo_plugin_dir}/org-gnome-face.eplug
+%{evo_plugin_dir}/liborg-gnome-face.so
+%{evo_plugin_dir}/org-gnome-face-ui.xml
+
%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
%{evo_plugin_dir}/org-gnome-compose-send-options.xml
@@ -716,6 +712,13 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed Aug 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.6.1-1.fc8
+- Update to 2.11.6.1
+
+* Tue Jul 31 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.6-1.fc8
+- Update to 2.11.6
+- Remove patch for GNOME bug #380534 (fixed upstream).
+
* Fri Jul 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.5-3.fc8
- Add patch for GNOME bug #380534 (clarify version requirements).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources 14 Jul 2007 17:14:43 -0000 1.73
+++ sources 1 Aug 2007 18:20:35 -0000 1.74
@@ -1 +1 @@
-132ac3a9847a6588c46bd4db2743d96b evolution-2.11.5.tar.bz2
+b27f011166d16b2484f9f68992c48108 evolution-2.11.6.1.tar.bz2
--- evolution-2.11.3-e-clipped-label.patch DELETED ---
--- evolution-2.11.5-implicit-function-declarations.patch DELETED ---
--- evolution-2.11.5-version-checks.patch DELETED ---
- Previous message (by thread): rpms/kernel/F-7 linux-2.6-net-dst_entry-reorder-crash.patch, NONE, 1.1 kernel-2.6.spec, 1.3302, 1.3303
- Next message (by thread): rpms/evolution-exchange/devel .cvsignore, 1.4, 1.5 evolution-exchange.spec, 1.4, 1.5 sources, 1.4, 1.5 evolution-exchange-2.11.5-fix-warnings.patch, 1.1, NONE evolution-exchange-2.11.5-version-checks.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list