rpms/evolution/F-7 evolution-2.10.0-e-source-combo-box.patch, 1.2, 1.3
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Thu Aug 30 14:06:48 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24381
Modified Files:
evolution-2.10.0-e-source-combo-box.patch
Log Message:
* Thu Aug 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-5.fc7
- Revise patch for GNOME bug #417999 to fix GNOME bug #447591
(Automatic Contacts combo boxes don't work).
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/F-7/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 30 Aug 2007 04:09:21 -0000 1.2
+++ evolution-2.10.0-e-source-combo-box.patch 30 Aug 2007 14:06:14 -0000 1.3
@@ -1,6 +1,6 @@
diff -up evolution-2.10.3/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.10.3/widgets/misc/e-pilot-settings.c
--- evolution-2.10.3/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-09 09:10:24.000000000 -0400
-+++ evolution-2.10.3/widgets/misc/e-pilot-settings.c 2007-08-29 23:57:36.000000000 -0400
++++ evolution-2.10.3/widgets/misc/e-pilot-settings.c 2007-08-30 09:59:24.000000000 -0400
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
@@ -43,7 +43,7 @@
gboolean
diff -up evolution-2.10.3/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.10.3/plugins/itip-formatter/itip-formatter.c
--- evolution-2.10.3/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-04-09 09:09:15.000000000 -0400
-+++ evolution-2.10.3/plugins/itip-formatter/itip-formatter.c 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/plugins/itip-formatter/itip-formatter.c 2007-08-30 09:59:24.000000000 -0400
@@ -39,7 +39,7 @@
#include <camel/camel-store.h>
#include <libecal/e-cal.h>
@@ -55,7 +55,7 @@
#include <mail/em-format-hook.h>
diff -up evolution-2.10.3/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.10.3/plugins/itip-formatter/itip-view.c
--- evolution-2.10.3/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-04-09 09:09:15.000000000 -0400
-+++ evolution-2.10.3/plugins/itip-formatter/itip-view.c 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/plugins/itip-formatter/itip-view.c 2007-08-30 09:59:24.000000000 -0400
@@ -35,7 +35,7 @@
#include <camel/camel-mime-message.h>
#include <libedataserver/e-time-utils.h>
@@ -182,7 +182,7 @@
void
diff -up evolution-2.10.3/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.10.3/plugins/bbdb/gaimbuddies.c
--- evolution-2.10.3/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-05-25 02:43:33.000000000 -0400
-+++ evolution-2.10.3/plugins/bbdb/gaimbuddies.c 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/plugins/bbdb/gaimbuddies.c 2007-08-30 09:59:24.000000000 -0400
@@ -44,7 +44,7 @@
#include <string.h>
@@ -194,7 +194,7 @@
#include <sys/stat.h>
diff -up evolution-2.10.3/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.10.3/plugins/bbdb/bbdb.c
--- evolution-2.10.3/plugins/bbdb/bbdb.c.e-source-combo-box 2007-06-30 15:29:42.000000000 -0400
-+++ evolution-2.10.3/plugins/bbdb/bbdb.c 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/plugins/bbdb/bbdb.c 2007-08-30 10:03:58.000000000 -0400
@@ -40,7 +40,7 @@
#include <string.h>
@@ -255,16 +255,7 @@
int
e_plugin_lib_enable (EPluginLib *ep, int enable)
{
-@@ -265,8 +304,6 @@ bbdb_open_addressbook (int type)
- char *uri;
- EBook *book = NULL;
-
-- gboolean enable;
--
- gboolean status;
- GError *error = NULL;
-
-@@ -353,8 +390,23 @@ enable_toggled_cb (GtkWidget *widget, gp
+@@ -353,8 +392,23 @@ 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)) {
@@ -290,7 +281,7 @@
}
}
-@@ -372,7 +424,8 @@ enable_gaim_toggled_cb (GtkWidget *widge
+@@ -372,7 +426,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)) {
@@ -300,7 +291,7 @@
gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL);
}
}
-@@ -384,48 +437,77 @@ synchronize_button_clicked_cb (GtkWidget
+@@ -384,48 +439,77 @@ synchronize_button_clicked_cb (GtkWidget
}
static void
@@ -395,7 +386,7 @@
}
GtkWidget *
-@@ -491,7 +573,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
+@@ -491,7 +575,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
/* Source selection option menu */
option = create_addressbook_option_menu (stuff, AUTOMATIC_CONTACTS_ADDRESSBOOK);
@@ -404,7 +395,7 @@
gtk_widget_set_sensitive (option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
gtk_box_pack_start (GTK_BOX (inner_vbox), option, FALSE, FALSE, 0);
stuff->option_menu = option;
-@@ -527,7 +609,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
+@@ -527,7 +611,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
/* Gaim Source Selection Option Menu */
gaim_option = create_addressbook_option_menu (stuff, GAIM_ADDRESSBOOK);
@@ -415,7 +406,7 @@
stuff->gaim_option_menu = gaim_option;
diff -up evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade
--- evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-05-27 14:11:02.000000000 -0400
-+++ evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-30 09:59:24.000000000 -0400
@@ -158,9 +158,9 @@
</child>
@@ -430,7 +421,7 @@
<property name="last_modification_time">Tue, 01 Jun 2004 18:22:38 GMT</property>
diff -up evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c
--- evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-04-09 09:07:42.000000000 -0400
-+++ evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-30 09:59:24.000000000 -0400
@@ -33,7 +33,7 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkdialog.h>
@@ -548,7 +539,7 @@
}
diff -up evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade
--- evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-04-09 09:07:40.000000000 -0400
-+++ evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-editor/contact-editor.glade 2007-08-30 09:59:24.000000000 -0400
@@ -356,9 +356,9 @@
</child>
@@ -563,7 +554,7 @@
<property name="last_modification_time">Tue, 13 Apr 2004 20:47:50 GMT</property>
diff -up evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c
--- evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-05-27 12:54:09.000000000 -0400
-+++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-30 00:01:23.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-30 09:59:24.000000000 -0400
@@ -46,7 +46,7 @@
#include <text/e-entry.h>
@@ -677,7 +668,7 @@
}
diff -up evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c
--- evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-04-09 09:07:40.000000000 -0400
-+++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-29 23:59:27.000000000 -0400
++++ evolution-2.10.3/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-30 09:59:24.000000000 -0400
@@ -37,7 +37,7 @@
#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
@@ -728,7 +719,7 @@
diff -up evolution-2.10.3/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/memo-page.glade
--- evolution-2.10.3/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/dialogs/memo-page.glade 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/memo-page.glade 2007-08-30 09:59:24.000000000 -0400
@@ -141,7 +141,7 @@
<child>
<widget class="Custom" id="source">
@@ -740,7 +731,7 @@
<property name="last_modification_time">Tue, 13 Jan 2004 22:00:00 GMT</property>
diff -up evolution-2.10.3/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/event-page.glade
--- evolution-2.10.3/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-05-27 13:58:15.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/dialogs/event-page.glade 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/event-page.glade 2007-08-30 09:59:24.000000000 -0400
@@ -775,7 +775,7 @@
<child>
<widget class="Custom" id="source">
@@ -752,7 +743,7 @@
<property name="last_modification_time">Wed, 17 Dec 2003 18:20:26 GMT</property>
diff -up evolution-2.10.3/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/task-page.glade
--- evolution-2.10.3/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/dialogs/task-page.glade 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/task-page.glade 2007-08-30 09:59:24.000000000 -0400
@@ -618,7 +618,7 @@
<widget class="Custom" id="source">
<property name="height_request">24</property>
@@ -764,7 +755,7 @@
<property name="last_modification_time">Thu, 18 Dec 2003 01:58:48 GMT</property>
diff -up evolution-2.10.3/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/memo-page.c
--- evolution-2.10.3/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/dialogs/memo-page.c 2007-08-30 00:04:19.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/memo-page.c 2007-08-30 09:59:24.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
@@ -864,8 +855,8 @@
+ return combo_box;
}
diff -up evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/event-page.c
---- evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-29 23:56:32.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/dialogs/event-page.c 2007-08-30 00:06:35.000000000 -0400
+--- evolution-2.10.3/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-30 09:59:22.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/event-page.c 2007-08-30 09:59:24.000000000 -0400
@@ -33,7 +33,7 @@
#include <gdk/gdkkeysyms.h>
#include <libgnome/gnome-i18n.h>
@@ -978,7 +969,7 @@
GtkWidget *make_status_icons (void);
diff -up evolution-2.10.3/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.10.3/calendar/gui/dialogs/task-page.c
--- evolution-2.10.3/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-04-09 09:10:28.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/dialogs/task-page.c 2007-08-30 00:03:08.000000000 -0400
++++ evolution-2.10.3/calendar/gui/dialogs/task-page.c 2007-08-30 09:59:24.000000000 -0400
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
@@ -1099,7 +1090,7 @@
}
diff -up evolution-2.10.3/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.10.3/calendar/gui/e-itip-control.c
--- evolution-2.10.3/calendar/gui/e-itip-control.c.e-source-combo-box 2007-04-09 09:10:33.000000000 -0400
-+++ evolution-2.10.3/calendar/gui/e-itip-control.c 2007-08-29 23:56:32.000000000 -0400
++++ evolution-2.10.3/calendar/gui/e-itip-control.c 2007-08-30 09:59:24.000000000 -0400
@@ -44,7 +44,7 @@
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-stream.h>
More information about the fedora-extras-commits
mailing list