rpms/evolution/F-7 evolution-2.10.0-e-source-combo-box.patch, 1.1, 1.2 evolution.spec, 1.268, 1.269
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Thu Aug 30 04:09:24 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9882
Modified Files:
evolution-2.10.0-e-source-combo-box.patch evolution.spec
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.10.0-e-source-combo-box.patch 15 Mar 2007 01:47:03 -0000 1.1
+++ evolution-2.10.0-e-source-combo-box.patch 30 Aug 2007 04:09:21 -0000 1.2
@@ -1,5 +1,6 @@
---- evolution-2.10.0/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-01-03 10:34:47.000000000 -0500
-+++ evolution-2.10.0/widgets/misc/e-pilot-settings.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
@@ -9,7 +10,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 +19,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 +31,7 @@
}
void
-@@ -166,7 +167,8 @@
+@@ -166,7 +167,8 @@ e_pilot_settings_set_source (EPilotSetti
priv = ps->priv;
@@ -40,8 +41,9 @@
}
gboolean
---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-02-26 04:59:58.000000000 -0500
-+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -39,7 +39,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.10.0/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -35,7 +35,7 @@
#include <camel/camel-mime-message.h>
#include <libedataserver/e-time-utils.h>
@@ -62,7 +65,7 @@
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
#include <gtkhtml/gtkhtml-embedded.h>
-@@ -104,8 +104,8 @@
+@@ -104,8 +104,8 @@ struct _ItipViewPrivate {
char *description;
GtkWidget *selector_box;
@@ -73,7 +76,7 @@
ESourceList *source_list;
GtkWidget *rsvp_box;
-@@ -1664,10 +1664,12 @@
+@@ -1664,10 +1664,12 @@ itip_view_clear_lower_info_items (ItipVi
}
static void
@@ -89,7 +92,7 @@
g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
}
-@@ -1684,40 +1686,42 @@
+@@ -1684,40 +1686,42 @@ itip_view_set_source_list (ItipView *vie
if (priv->source_list)
g_object_unref (priv->source_list);
@@ -149,7 +152,7 @@
}
ESourceList *
-@@ -1743,10 +1747,11 @@
+@@ -1743,10 +1747,11 @@ itip_view_set_source (ItipView *view, ES
priv = view->priv;
@@ -163,7 +166,7 @@
}
ESource *
-@@ -1759,10 +1764,11 @@
+@@ -1759,10 +1764,11 @@ itip_view_get_source (ItipView *view)
priv = view->priv;
@@ -177,8 +180,9 @@
}
void
---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -44,7 +44,7 @@
#include <string.h>
@@ -188,8 +192,9 @@
#include <sys/time.h>
#include <sys/stat.h>
---- evolution-2.10.0/plugins/bbdb/bbdb.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -40,7 +40,7 @@
#include <string.h>
@@ -199,17 +204,93 @@
#include <e-util/e-config.h>
#include <mail/em-config.h>
-@@ -341,7 +341,8 @@
+@@ -71,10 +71,49 @@ static gboolean bbdb_timeout (gpointer d
+ static void bbdb_do_it (EBook *book, const char *name, const char *email);
+ static void add_email_to_contact (EContact *contact, const char *email);
+ static void enable_toggled_cb (GtkWidget *widget, gpointer data);
+-static void source_changed_cb (GtkWidget *widget, ESource *source, gpointer data);
++static void source_changed_cb (ESourceComboBox *source_combo_box, struct bbdb_stuff *stuff);
+ static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, int type);
+ static void cleanup_cb (GObject *o, gpointer data);
+
++static ESource *
++find_esource_by_uri (ESourceList *source_list, const gchar *target_uri)
++{
++ GSList *groups;
++
++ /* XXX This would be unnecessary if the plugin had stored
++ * the addressbook's UID instead of the URI in GConf.
++ * Too late to change it now, I suppose. */
++
++ if (source_list == NULL || target_uri == NULL)
++ return NULL;
++
++ groups = e_source_list_peek_groups (source_list);
++
++ while (groups != NULL) {
++ GSList *sources;
++
++ sources = e_source_group_peek_sources (groups->data);
++
++ while (sources != NULL) {
++ gchar *uri;
++ gboolean match;
++
++ uri = e_source_get_uri (sources->data);
++ match = (strcmp (uri, target_uri) == 0);
++ g_free (uri);
++
++ if (match)
++ return sources->data;
++
++ sources = g_slist_next (sources);
++ }
++
++ groups = g_slist_next (groups);
++ }
++
++ return NULL;
++}
++
+ 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
gtk_widget_set_sensitive (stuff->option_menu, active);
if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) {
- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->option_menu));
+- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
++ const gchar *uri = NULL;
++ GError *error = NULL;
++
+ selected_source = e_source_combo_box_get_active (
+ E_SOURCE_COMBO_BOX (stuff->option_menu));
- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL);
++ if (selected_source != NULL)
++ uri = e_source_get_uri (selected_source);
++
++ gconf_client_set_string (
++ stuff->target->gconf,
++ GCONF_KEY_WHICH_ADDRESSBOOK,
++ uri, &error);
++
++ if (error != NULL) {
++ g_warning ("%s", error->message);
++ g_error_free (error);
++ }
}
}
-@@ -360,7 +361,8 @@
+
+@@ -372,7 +424,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,15 +300,67 @@
gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL);
}
}
-@@ -389,31 +391,32 @@
+@@ -384,48 +437,77 @@ synchronize_button_clicked_cb (GtkWidget
+ }
+
+ static void
+-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
++source_changed_cb (ESourceComboBox *source_combo_box,
++ struct bbdb_stuff *stuff)
+ {
+- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data;
+-
+- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (source), NULL);
++ ESource *source;
++ GError *error = NULL;
++
++ source = e_source_combo_box_get_active (source_combo_box);
++ g_return_if_fail (source != NULL);
++
++ gconf_client_set_string (
++ stuff->target->gconf,
++ GCONF_KEY_WHICH_ADDRESSBOOK,
++ e_source_get_uri (source), &error);
++
++ if (error != NULL) {
++ g_warning ("%s", error->message);
++ g_error_free (error);
++ }
+ }
+
+ static void
+-gaim_source_changed_cb (GtkWidget *widget, ESource *source, gpointer data)
++gaim_source_changed_cb (ESourceComboBox *source_combo_box,
++ struct bbdb_stuff *stuff)
+ {
+- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data;
+- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (source), NULL);
++ ESource *source;
++ GError *error = NULL;
++
++ source = e_source_combo_box_get_active (source_combo_box);
++ g_return_if_fail (source != NULL);
++
++ gconf_client_set_string (
++ stuff->target->gconf,
++ GCONF_KEY_WHICH_ADDRESSBOOK_GAIM,
++ e_source_get_uri (source), &error);
++
++ if (error != NULL) {
++ g_warning ("%s", error->message);
++ g_error_free (error);
++ }
+ }
+
static GtkWidget *
create_addressbook_option_menu (struct bbdb_stuff *stuff, int type)
{
- GtkWidget *menu;
+ GtkWidget *combo_box;
ESourceList *source_list;
- char *selected_source_uri;
-- ESource *selected_source;
+- char *selected_source_uri;
+ ESource *selected_source;
++ char *selected_source_uri;
GConfClient *gconf = stuff->target->gconf;
@@ -239,15 +372,18 @@
selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL);
else
selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL);
- if (selected_source_uri != NULL) {
+- if (selected_source_uri != NULL) {
- selected_source = e_source_new_with_absolute_uri ("", selected_source_uri);
- e_source_option_menu_select (E_SOURCE_OPTION_MENU (menu), selected_source);
+- g_free (selected_source_uri);
+- }
++ selected_source = find_esource_by_uri (
++ source_list, selected_source_uri);
++ g_free (selected_source_uri);
++
++ if (selected_source != NULL)
+ e_source_combo_box_set_active (
-+ E_SOURCE_COMBO_BOX (combo_box),
-+ e_source_new_with_absolute_uri (
-+ "", selected_source_uri));
- g_free (selected_source_uri);
- }
++ E_SOURCE_COMBO_BOX (combo_box), selected_source);
- gtk_widget_show (menu);
+ gtk_widget_show (combo_box);
@@ -259,8 +395,27 @@
}
GtkWidget *
---- evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-03-13 16:56:41.000000000 -0400
+@@ -491,7 +573,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH
+
+ /* Source selection option menu */
+ option = create_addressbook_option_menu (stuff, AUTOMATIC_CONTACTS_ADDRESSBOOK);
+- g_signal_connect (option, "source_selected", G_CALLBACK (source_changed_cb), stuff);
++ g_signal_connect (option, "changed", G_CALLBACK (source_changed_cb), stuff);
+ 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
+
+ /* Gaim Source Selection Option Menu */
+ gaim_option = create_addressbook_option_menu (stuff, GAIM_ADDRESSBOOK);
+- g_signal_connect (gaim_option, "source_selected", G_CALLBACK (gaim_source_changed_cb), stuff);
++ g_signal_connect (gaim_option, "changed", G_CALLBACK (gaim_source_changed_cb), stuff);
+ 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;
+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
@@ -158,9 +158,9 @@
</child>
@@ -273,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.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -33,7 +33,7 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkdialog.h>
@@ -284,7 +440,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 +449,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 +458,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 +467,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 +479,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 +493,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 +532,7 @@
}
GtkWidget *
-@@ -1262,10 +1267,9 @@
+@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor)
}
if (editor->book) {
@@ -390,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.10.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade 2007-03-13 16:56:41.000000000 -0400
+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
@@ -356,9 +356,9 @@
</child>
@@ -404,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.10.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -46,7 +46,7 @@
#include <text/e-entry.h>
@@ -415,7 +573,7 @@
#include <camel/camel.h>
-@@ -590,15 +590,16 @@
+@@ -590,15 +590,16 @@ static void
fill_in_source_field (EContactEditor *editor)
{
GtkWidget *source_menu;
@@ -436,7 +594,7 @@
}
static void
-@@ -2525,13 +2526,15 @@
+@@ -2525,13 +2526,15 @@ new_target_cb (EBook *new_book, EBookSta
editor->load_book = NULL;
if (status != E_BOOK_ERROR_OK || new_book == NULL) {
@@ -456,7 +614,7 @@
if (new_book)
g_object_unref (new_book);
-@@ -2555,8 +2558,12 @@
+@@ -2555,8 +2558,12 @@ cancel_load (EContactEditor *editor)
}
static void
@@ -470,7 +628,7 @@
cancel_load (editor);
if (e_source_equal (e_book_get_source (editor->target_book), source))
-@@ -3330,8 +3337,8 @@
+@@ -3329,8 +3336,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 +639,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");
-@@ -3782,25 +3789,25 @@
+@@ -3781,25 +3788,25 @@ e_contact_editor_create_web(gchar *name,
}
GtkWidget *
@@ -489,16 +647,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;
@@ -517,8 +675,9 @@
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-01-03 10:32:45.000000000 -0500
-+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -37,7 +37,7 @@
#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
@@ -528,7 +687,7 @@
#include <addressbook/gui/component/addressbook.h>
#include <addressbook/util/eab-book-util.h>
#include "e-contact-editor.h"
-@@ -267,8 +267,12 @@
+@@ -267,8 +267,12 @@ clicked_cb (GtkWidget *w, gint button, g
}
static void
@@ -542,7 +701,7 @@
if (qa->book) {
g_object_unref (qa->book);
qa->book = NULL;
-@@ -317,16 +321,20 @@
+@@ -317,16 +321,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");
@@ -567,8 +726,9 @@
g_object_unref (source_list);
---- evolution-2.10.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.glade 2007-03-13 16:56:41.000000000 -0400
+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
@@ -141,7 +141,7 @@
<child>
<widget class="Custom" id="source">
@@ -578,9 +738,10 @@
<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.10.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/event-page.glade 2007-03-13 16:56:41.000000000 -0400
-@@ -774,7 +774,7 @@
+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
+@@ -775,7 +775,7 @@
<child>
<widget class="Custom" id="source">
<property name="visible">True</property>
@@ -589,8 +750,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.10.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/task-page.glade 2007-03-13 16:56:41.000000000 -0400
+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
@@ -618,7 +618,7 @@
<widget class="Custom" id="source">
<property name="height_request">24</property>
@@ -600,8 +762,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.10.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
@@ -611,7 +774,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 +782,7 @@
mpage = MEMO_PAGE (page);
priv = mpage->priv;
-@@ -432,8 +431,9 @@
+@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage *
}
/* Source */
@@ -631,7 +794,7 @@
priv->updating = FALSE;
-@@ -844,13 +844,12 @@
+@@ -844,13 +844,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -649,7 +812,7 @@
if (!priv->updating) {
ECal *client;
-@@ -862,8 +861,9 @@
+@@ -862,8 +861,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -661,7 +824,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -973,7 +973,7 @@
+@@ -973,7 +973,7 @@ init_widgets (MemoPage *mpage)
G_CALLBACK (categories_clicked_cb), mpage);
/* Source selector */
@@ -670,7 +833,7 @@
G_CALLBACK (source_changed_cb), mpage);
/* Connect the default signal handler to use to make sure the "changed"
-@@ -1167,21 +1167,22 @@
+@@ -1167,21 +1167,22 @@ memo_page_create_date_edit (void)
return dedit;
}
@@ -700,8 +863,9 @@
+ gtk_widget_show (combo_box);
+ return combo_box;
}
---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-03-12 23:45:00.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -33,7 +33,7 @@
#include <gdk/gdkkeysyms.h>
#include <libgnome/gnome-i18n.h>
@@ -711,7 +875,7 @@
#include "common/authentication.h"
#include "e-util/e-categories-config.h"
#include "e-util/e-dialog-widgets.h"
-@@ -967,7 +967,6 @@
+@@ -967,7 +967,6 @@ event_page_fill_widgets (CompEditorPage
ECalComponentDateTime start_date, end_date;
const char *location, *uid = NULL;
const char *categories;
@@ -719,7 +883,7 @@
GSList *l;
gboolean validated = TRUE;
-@@ -1163,8 +1162,9 @@
+@@ -1163,8 +1162,9 @@ event_page_fill_widgets (CompEditorPage
e_dialog_editable_set (priv->categories, categories);
/* Source */
@@ -731,7 +895,7 @@
e_cal_component_get_uid (comp, &uid);
if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE)
-@@ -2566,7 +2566,8 @@
+@@ -2566,7 +2566,8 @@ event_page_sendoptions_clicked_cb (Event
if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new ();
@@ -741,7 +905,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
priv->sod->data->initialized = TRUE;
}
-@@ -2595,13 +2596,12 @@
+@@ -2595,13 +2596,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -759,7 +923,7 @@
if (!priv->updating) {
ECal *client;
-@@ -2620,8 +2620,9 @@
+@@ -2620,8 +2620,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -771,7 +935,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -2847,7 +2848,7 @@
+@@ -2847,7 +2848,7 @@ init_widgets (EventPage *epage)
G_CALLBACK (categories_clicked_cb), epage);
/* Source selector */
@@ -780,7 +944,7 @@
G_CALLBACK (source_changed_cb), epage);
/* Alarms */
priv->alarm_list_store = e_alarm_list_new ();
-@@ -3148,23 +3149,24 @@
+@@ -3148,23 +3149,24 @@ make_timezone_entry (void)
return w;
}
@@ -812,8 +976,9 @@
}
GtkWidget *make_status_icons (void);
---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -35,7 +35,7 @@
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
@@ -823,7 +988,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 +996,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 +1008,7 @@
if (priv->is_assignment) {
ECalComponentOrganizer organizer;
-@@ -1617,13 +1617,12 @@
+@@ -1617,13 +1617,12 @@ field_changed_cb (GtkWidget *widget, gpo
}
static void
@@ -861,7 +1026,7 @@
if (!priv->updating) {
ECal *client;
-@@ -1642,8 +1641,9 @@
+@@ -1642,8 +1641,9 @@ source_changed_cb (GtkWidget *widget, ES
if (client)
g_object_unref (client);
@@ -873,7 +1038,7 @@
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-@@ -1655,7 +1655,7 @@
+@@ -1655,7 +1655,7 @@ source_changed_cb (GtkWidget *widget, ES
comp_editor_notify_client_changed (
COMP_EDITOR (gtk_widget_get_toplevel (priv->main)),
client);
@@ -882,7 +1047,7 @@
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment)
task_page_show_options (tpage);
else
-@@ -1679,7 +1679,8 @@
+@@ -1679,7 +1679,8 @@ task_page_sendoptions_clicked_cb (TaskPa
if (!priv->sod) {
priv->sod = e_sendoptions_dialog_new ();
priv->sod->data->initialized = TRUE;
@@ -892,7 +1057,7 @@
e_sendoptions_utils_set_default_data (priv->sod, source, "task");
}
-@@ -1734,7 +1735,7 @@
+@@ -1734,7 +1735,7 @@ init_widgets (TaskPage *tpage)
G_CALLBACK (categories_clicked_cb), tpage);
/* Source selector */
@@ -901,7 +1066,7 @@
G_CALLBACK (source_changed_cb), tpage);
/* Connect the default signal handler to use to make sure the "changed"
-@@ -1955,21 +1956,22 @@
+@@ -1955,21 +1956,23 @@ task_page_create_date_edit (void)
return dedit;
}
@@ -925,14 +1090,16 @@
- 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.10.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-03-13 16:56:41.000000000 -0400
+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
@@ -44,7 +44,7 @@
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-stream.h>
@@ -942,7 +1109,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 +1128,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 +1137,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/F-7/evolution.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- evolution.spec 30 Aug 2007 02:13:30 -0000 1.268
+++ evolution.spec 30 Aug 2007 04:09:21 -0000 1.269
@@ -47,7 +47,7 @@
Name: evolution
Version: 2.10.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -751,6 +751,10 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* 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).
+
* Wed Aug 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-4.fc7
- Revise patch for GNOME bug #362638 to fix GNOME bug #357175
(Evolution fails to close after IMAP alert has been displayed).
More information about the fedora-extras-commits
mailing list