rpms/evolution-data-server/devel .cvsignore, 1.67, 1.68 evolution-data-server-1.10.0-code-cleanup.patch, 1.4, 1.5 evolution-data-server-1.9.92-e-flag.patch, 1.2, 1.3 evolution-data-server.spec, 1.175, 1.176 sources, 1.67, 1.68 evolution-data-server-1.11.6-implicit-function-declaration.patch, 1.1, NONE

Matthew Barnes (mbarnes) fedora-extras-commits at redhat.com
Wed Aug 1 18:30:15 UTC 2007


Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5666

Modified Files:
	.cvsignore evolution-data-server-1.10.0-code-cleanup.patch 
	evolution-data-server-1.9.92-e-flag.patch 
	evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.11.6-implicit-function-declaration.patch 
Log Message:

* Wed Aug 01 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.6.1-1.fc8
- Update to 1.11.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	31 Jul 2007 11:35:30 -0000	1.67
+++ .cvsignore	1 Aug 2007 18:29:43 -0000	1.68
@@ -1 +1 @@
-evolution-data-server-1.11.6.tar.bz2
+evolution-data-server-1.11.6.1.tar.bz2

evolution-data-server-1.10.0-code-cleanup.patch:

Index: evolution-data-server-1.10.0-code-cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-1.10.0-code-cleanup.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-data-server-1.10.0-code-cleanup.patch	9 Apr 2007 16:41:22 -0000	1.4
+++ evolution-data-server-1.10.0-code-cleanup.patch	1 Aug 2007 18:29:43 -0000	1.5
@@ -1,5 +1,5 @@
---- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.glade.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.glade	2007-04-04 12:08:04.000000000 -0400
+--- evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-dialog.glade.code-cleanup	2007-01-03 09:56:26.000000000 -0500
++++ evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-dialog.glade	2007-08-01 13:28:00.000000000 -0400
 @@ -118,7 +118,10 @@
  		  <property name="yalign">0.5</property>
  		  <property name="xpad">0</property>
@@ -61,9 +61,9 @@
  	    </widget>
  	    <packing>
  	      <property name="padding">0</property>
---- evolution-data-server-1.10.0/libedataserverui/e-name-selector-list.c.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-list.c	2007-04-04 12:08:04.000000000 -0400
-@@ -447,7 +447,7 @@
+--- evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-list.c.code-cleanup	2007-07-31 16:14:53.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-list.c	2007-08-01 13:28:00.000000000 -0400
+@@ -447,7 +447,7 @@ enl_tree_button_press_event (GtkWidget *
  		
  			if (len > 1) {
  				menu_item = gtk_radio_menu_item_new_with_label (group, email);
@@ -72,9 +72,9 @@
  				g_signal_connect (menu_item, "toggled", G_CALLBACK (destination_set_email), destination);
  			} else {
  				menu_item = gtk_menu_item_new_with_label (email);			
---- evolution-data-server-1.10.0/libedataserverui/e-name-selector-entry.c.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-entry.c	2007-04-04 12:08:04.000000000 -0400
-@@ -2136,7 +2136,7 @@
+--- evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-entry.c.code-cleanup	2007-07-31 16:14:53.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-entry.c	2007-08-01 13:28:00.000000000 -0400
+@@ -2204,7 +2204,7 @@ populate_popup (ENameSelectorEntry *name
  		
  			if (len > 1) {
  				menu_item = gtk_radio_menu_item_new_with_label (group, email);
@@ -83,8 +83,8 @@
  				g_signal_connect (menu_item, "toggled", G_CALLBACK (destination_set_email), destination);
  			} else {
  				menu_item = gtk_menu_item_new_with_label (email);			
---- evolution-data-server-1.10.0/libedataserverui/test-source-option-menu.c.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/test-source-option-menu.c	2007-04-04 12:08:04.000000000 -0400
+--- evolution-data-server-1.11.6.1/libedataserverui/test-source-option-menu.c.code-cleanup	2007-01-03 09:56:25.000000000 -0500
++++ evolution-data-server-1.11.6.1/libedataserverui/test-source-option-menu.c	2007-08-01 13:28:00.000000000 -0400
 @@ -1,5 +1,5 @@
  /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 -/* test-source-option-menu.c - Test for ESourceOptionMenu.
@@ -115,7 +115,7 @@
  	g_print ("source selected: \"%s\"\n", e_source_peek_name (source));
  }
  
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ static int
  on_idle_create_widget (const char *gconf_path)
  {
  	GtkWidget *window;
@@ -124,7 +124,7 @@
  	ESourceList *source_list;
  	GConfClient *gconf_client;
  
-@@ -51,10 +51,12 @@
+@@ -51,10 +51,12 @@ on_idle_create_widget (const char *gconf
  	source_list = e_source_list_new_for_gconf (gconf_client, gconf_path);
  
  	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -140,26 +140,26 @@
  	gtk_widget_show_all (window);
  
  	g_object_unref (gconf_client);
---- evolution-data-server-1.10.0/libedataserverui/e-source-option-menu.h.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-source-option-menu.h	2007-04-04 12:08:04.000000000 -0400
+--- evolution-data-server-1.11.6.1/libedataserverui/e-source-option-menu.h.code-cleanup	2007-07-31 16:14:53.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-source-option-menu.h	2007-08-01 13:28:00.000000000 -0400
 @@ -23,6 +23,8 @@
  #ifndef _E_SOURCE_OPTION_MENU_H_
  #define _E_SOURCE_OPTION_MENU_H_
  
 +#ifndef EDS_DISABLE_DEPRECATED
 +
- #include <libedataserver/e-source-list.h>
+ #include "libedataserver/e-source-list.h"
  
  #include <gtk/gtkoptionmenu.h>
-@@ -60,5 +62,6 @@
+@@ -60,5 +62,6 @@ ESource *e_source_option_menu_peek_selec
  void     e_source_option_menu_select         (ESourceOptionMenu *menu,
  					      ESource           *source);
  
 +#endif /* EDS_DISABLE_DEPRECATED */
  
  #endif /* _E_SOURCE_OPTION_MENU_H_ */
---- /dev/null	2007-03-30 19:30:56.246366825 -0400
-+++ evolution-data-server-1.10.0/libedataserverui/e-source-combo-box.h	2007-04-04 12:08:04.000000000 -0400
+--- /dev/null	2007-07-31 17:57:56.110944649 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-source-combo-box.h	2007-08-01 13:28:00.000000000 -0400
 @@ -0,0 +1,79 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/* e-source-combo-box.h
@@ -240,9 +240,9 @@
 +G_END_DECLS
 +
 +#endif /* _E_SOURCE_COMBO_BOX_H_ */
---- evolution-data-server-1.10.0/libedataserverui/Makefile.in.code-cleanup	2007-03-12 12:04:04.000000000 -0400
-+++ evolution-data-server-1.10.0/libedataserverui/Makefile.in	2007-04-04 12:08:04.000000000 -0400
-@@ -78,8 +78,8 @@
+--- evolution-data-server-1.11.6.1/libedataserverui/Makefile.in.code-cleanup	2007-07-31 18:18:45.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/Makefile.in	2007-08-01 13:28:50.000000000 -0400
+@@ -73,8 +73,8 @@ am_libedataserverui_1_2_la_OBJECTS = $(a
  	e-name-selector-dialog.lo e-name-selector-entry.lo \
  	e-name-selector-model.lo e-name-selector-list.lo \
  	e-passwords.lo e-source-selector.lo \
@@ -252,8 +252,24 @@
 +	e-source-option-menu.lo e-tree-model-generator.lo
  libedataserverui_1_2_la_OBJECTS =  \
  	$(am_libedataserverui_1_2_la_OBJECTS)
- PROGRAMS = $(noinst_PROGRAMS)
-@@ -452,6 +452,7 @@
+ libedataserverui_1_2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -321,6 +321,7 @@ PTHREAD_LIB = @PTHREAD_LIB@
+ PURIFY = @PURIFY@
+ RANLIB = @RANLIB@
+ REGEX_LIBS = @REGEX_LIBS@
++SED = @SED@
+ SENDMAIL = @SENDMAIL@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+@@ -332,7 +333,6 @@ THREADS_CFLAGS = @THREADS_CFLAGS@
+ THREADS_LIBS = @THREADS_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+@@ -424,6 +424,7 @@ libedataserverui_1_2_la_SOURCES = \
  	e-passwords.c			\
  	e-source-selector.c		\
  	e-source-selector-dialog.c	\
@@ -261,7 +277,7 @@
  	e-source-option-menu.c		\
  	e-tree-model-generator.c
  
-@@ -481,6 +482,7 @@
+@@ -449,6 +450,7 @@ libedataserveruiinclude_HEADERS = \
  	e-passwords.h			\
  	e-source-selector.h		\
  	e-source-selector-dialog.h	\
@@ -269,7 +285,7 @@
  	e-source-option-menu.h		\
  	e-tree-model-generator.h
  
-@@ -619,6 +621,7 @@
+@@ -587,6 +589,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-name-selector-model.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-name-selector.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-passwords.Plo at am__quote@
@@ -277,9 +293,9 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-source-option-menu.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-source-selector-dialog.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-source-selector.Plo at am__quote@
---- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.h.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.h	2007-04-04 12:08:04.000000000 -0400
-@@ -58,7 +58,6 @@
+--- evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-dialog.h.code-cleanup	2007-04-17 12:13:05.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-dialog.h	2007-08-01 13:28:00.000000000 -0400
+@@ -58,7 +58,6 @@ struct _ENameSelectorDialog {
  	/* Private */
  
  	EBook              *pending_book;
@@ -287,9 +303,9 @@
  	ENameSelectorModel *name_selector_model;
  	GtkTreeModelSort   *contact_sort;
  
---- evolution-data-server-1.10.0/libedataserverui/Makefile.am.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/Makefile.am	2007-04-04 12:08:04.000000000 -0400
-@@ -31,6 +31,7 @@
+--- evolution-data-server-1.11.6.1/libedataserverui/Makefile.am.code-cleanup	2007-07-30 09:58:51.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/Makefile.am	2007-08-01 13:28:00.000000000 -0400
+@@ -31,6 +31,7 @@ libedataserverui_1_2_la_SOURCES =	\
  	e-passwords.c			\
  	e-source-selector.c		\
  	e-source-selector-dialog.c	\
@@ -297,7 +313,7 @@
  	e-source-option-menu.c		\
  	e-tree-model-generator.c
  
-@@ -63,6 +64,7 @@
+@@ -57,6 +58,7 @@ libedataserveruiinclude_HEADERS =	\
  	e-passwords.h			\
  	e-source-selector.h		\
  	e-source-selector-dialog.h	\
@@ -305,8 +321,8 @@
  	e-source-option-menu.h		\
  	e-tree-model-generator.h
  
---- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.c.code-cleanup	2007-04-04 12:08:04.000000000 -0400
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.c	2007-04-04 12:08:04.000000000 -0400
+--- evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-dialog.c.code-cleanup	2007-07-31 16:14:53.000000000 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-name-selector-dialog.c	2007-08-01 13:28:00.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <gtk/gtkscrolledwindow.h>
  #include <gtk/gtkstock.h>
@@ -316,7 +332,7 @@
  #include <libedataserverui/e-destination-store.h>
  #include <libedataserverui/e-contact-store.h>
  #include <libedataserverui/e-book-auth-util.h>
-@@ -64,9 +64,8 @@
+@@ -64,9 +64,8 @@ struct _ENameSelectorDialogPrivate
  	guint destination_index;
  };
  
@@ -327,7 +343,7 @@
  static void     transfer_button_clicked       (ENameSelectorDialog *name_selector_dialog, GtkButton *transfer_button);
  static void     contact_selection_changed     (ENameSelectorDialog *name_selector_dialog);
  static void     setup_name_selector_model     (ENameSelectorDialog *name_selector_dialog);
-@@ -106,33 +105,28 @@
+@@ -106,33 +105,28 @@ e_name_selector_dialog_set_property (GOb
  {
  }
  
@@ -379,7 +395,7 @@
  }
  
  static void
-@@ -223,34 +217,26 @@
+@@ -223,34 +217,26 @@ e_name_selector_dialog_init (ENameSelect
  
  	name_selector_dialog->name_selector_model = e_name_selector_model_new ();
  	name_selector_dialog->sections            = g_array_new (FALSE, FALSE, sizeof (Section));
@@ -422,7 +438,7 @@
  
  	label = glade_xml_get_widget (name_selector_dialog->gui, "AddressBookLabel");
  	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-@@ -308,9 +294,7 @@
+@@ -308,9 +294,7 @@ e_name_selector_dialog_finalize (GObject
  	ENameSelectorDialog *name_selector_dialog = E_NAME_SELECTOR_DIALOG (object);
  
  	g_array_free (name_selector_dialog->sections, TRUE);
@@ -432,7 +448,7 @@
  
  	if (G_OBJECT_CLASS (e_name_selector_dialog_parent_class)->finalize)
  		G_OBJECT_CLASS (e_name_selector_dialog_parent_class)->finalize (object);
-@@ -384,26 +368,6 @@
+@@ -384,26 +368,6 @@ sort_iter_to_contact_store_iter (ENameSe
  		*email_n = email_n_local;
  }
  
@@ -459,7 +475,7 @@
  static void
  add_destination (EDestinationStore *destination_store, EContact *contact, gint email_n)
  {
-@@ -742,8 +706,13 @@
+@@ -742,8 +706,13 @@ book_opened (EBook *book, EBookStatus st
  }
  
  static void
@@ -474,7 +490,7 @@
  	/* Remove any previous books being shown or loaded */
  	remove_books (name_selector_dialog);
  
-@@ -761,49 +730,54 @@
+@@ -761,49 +730,54 @@ search_changed (ENameSelectorDialog *nam
  {
  	EContactStore *contact_store;
  	EBookQuery    *book_query;
@@ -556,8 +572,8 @@
  }
  
  static void
---- /dev/null	2007-03-30 19:30:56.246366825 -0400
-+++ evolution-data-server-1.10.0/libedataserverui/e-source-combo-box.c	2007-04-04 12:09:51.000000000 -0400
+--- /dev/null	2007-07-31 17:57:56.110944649 -0400
++++ evolution-data-server-1.11.6.1/libedataserverui/e-source-combo-box.c	2007-08-01 13:28:00.000000000 -0400
 @@ -0,0 +1,457 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/* e-source-option-menu.c
@@ -1016,8 +1032,8 @@
 +
 +	gtk_combo_box_set_active_iter (combo_box, &iter);
 +}
---- evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-docs.sgml.code-cleanup	2007-03-12 01:23:42.000000000 -0400
-+++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-docs.sgml	2007-04-04 12:08:04.000000000 -0400
+--- evolution-data-server-1.11.6.1/docs/reference/libedataserverui/libedataserverui-docs.sgml.code-cleanup	2007-07-30 10:25:09.000000000 -0400
++++ evolution-data-server-1.11.6.1/docs/reference/libedataserverui/libedataserverui-docs.sgml	2007-08-01 13:28:00.000000000 -0400
 @@ -19,6 +19,7 @@
      <xi:include href="xml/e-name-selector-list.xml"/>
      <xi:include href="xml/e-name-selector-model.xml"/>
@@ -1026,8 +1042,8 @@
      <xi:include href="xml/e-source-option-menu.xml"/>
      <xi:include href="xml/e-source-selector.xml"/>
      <xi:include href="xml/e-source-selector-dialog.xml"/>
---- evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui.types.code-cleanup	2007-03-12 01:23:42.000000000 -0400
-+++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui.types	2007-04-04 12:08:04.000000000 -0400
+--- evolution-data-server-1.11.6.1/docs/reference/libedataserverui/libedataserverui.types.code-cleanup	2007-07-30 10:25:09.000000000 -0400
++++ evolution-data-server-1.11.6.1/docs/reference/libedataserverui/libedataserverui.types	2007-08-01 13:28:00.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <libedataserverui/e-name-selector-entry.h>
  #include <libedataserverui/e-name-selector-list.h>
@@ -1036,7 +1052,7 @@
  #include <libedataserverui/e-source-option-menu.h>
  #include <libedataserverui/e-source-selector.h>
  #include <libedataserverui/e-source-selector-dialog.h>
-@@ -19,6 +20,7 @@
+@@ -19,6 +20,7 @@ e_name_selector_dialog_get_type
  e_name_selector_entry_get_type
  e_name_selector_list_get_type
  e_name_selector_model_get_type
@@ -1044,9 +1060,9 @@
  e_source_option_menu_get_type
  e_source_selector_get_type
  e_source_selector_dialog_get_type
---- evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-sections.txt.code-cleanup	2007-03-12 01:23:42.000000000 -0400
-+++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-sections.txt	2007-04-04 12:08:04.000000000 -0400
-@@ -25,6 +25,29 @@
+--- evolution-data-server-1.11.6.1/docs/reference/libedataserverui/libedataserverui-sections.txt.code-cleanup	2007-07-30 10:25:09.000000000 -0400
++++ evolution-data-server-1.11.6.1/docs/reference/libedataserverui/libedataserverui-sections.txt	2007-08-01 13:28:00.000000000 -0400
+@@ -25,6 +25,29 @@ e_tree_model_generator_get_type
  </SECTION>
  
  <SECTION>
@@ -1076,9 +1092,19 @@
  <FILE>e-source-option-menu</FILE>
  <TITLE>ESourceOptionMenu</TITLE>
  ESourceOptionMenu
---- evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y.code-cleanup	2007-01-03 10:02:34.000000000 -0500
-+++ evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y	2007-04-04 12:08:04.000000000 -0400
-@@ -47,6 +47,7 @@
+--- evolution-data-server-1.11.6.1/calendar/libical/src/libicalss/icalssyacc.c.code-cleanup	2007-01-22 12:33:48.000000000 -0500
++++ evolution-data-server-1.11.6.1/calendar/libical/src/libicalss/icalssyacc.c	2007-08-01 13:28:00.000000000 -0400
+@@ -160,6 +160,7 @@ static void ssyacc_add_select(struct ica
+ static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
+ static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
+ void sserror(char *s); /* Don't know why I need this.... */
++int sslex(void *YYPARSE_PARAM);
+ 
+ 
+ 
+--- evolution-data-server-1.11.6.1/calendar/libical/src/libicalss/icalssyacc.y.code-cleanup	2007-01-22 12:29:24.000000000 -0500
++++ evolution-data-server-1.11.6.1/calendar/libical/src/libicalss/icalssyacc.y	2007-08-01 13:28:00.000000000 -0400
+@@ -47,6 +47,7 @@ static void ssyacc_add_select(struct ica
  static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
  static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
  void sserror(char *s); /* Don't know why I need this.... */
@@ -1086,9 +1112,19 @@
  
  %}
  
---- evolution-data-server-1.10.0/calendar/libical/src/libicalvcal/vcc.y.code-cleanup	2007-01-03 10:02:34.000000000 -0500
-+++ evolution-data-server-1.10.0/calendar/libical/src/libicalvcal/vcc.y	2007-04-04 12:08:04.000000000 -0400
-@@ -170,6 +170,7 @@
+--- evolution-data-server-1.11.6.1/calendar/libical/src/libicalvcal/vcc.c.code-cleanup	2007-08-01 14:10:25.000000000 -0400
++++ evolution-data-server-1.11.6.1/calendar/libical/src/libicalvcal/vcc.c	2007-08-01 14:11:02.000000000 -0400
+@@ -273,6 +273,7 @@ static void enterProps(const char *s);
+ static void enterAttr(const char *s1, const char *s2);
+ static void enterValues(const char *value);
+ static void mime_error_(char *s);
++static int mime_lex(void);
+ 
+ 
+ 
+--- evolution-data-server-1.11.6.1/calendar/libical/src/libicalvcal/vcc.y.code-cleanup	2007-01-22 12:29:26.000000000 -0500
++++ evolution-data-server-1.11.6.1/calendar/libical/src/libicalvcal/vcc.y	2007-08-01 13:28:00.000000000 -0400
+@@ -170,6 +170,7 @@ static void enterProps(const char *s);
  static void enterAttr(const char *s1, const char *s2);
  static void enterValues(const char *value);
  static void mime_error_(char *s);

evolution-data-server-1.9.92-e-flag.patch:

Index: evolution-data-server-1.9.92-e-flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server-1.9.92-e-flag.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-data-server-1.9.92-e-flag.patch	18 May 2007 17:39:14 -0000	1.2
+++ evolution-data-server-1.9.92-e-flag.patch	1 Aug 2007 18:29:43 -0000	1.3
@@ -1,5 +1,5 @@
---- evolution-data-server-1.11.2/addressbook/backends/file/e-book-backend-file.c.e-flag	2007-05-13 13:39:43.000000000 -0400
-+++ evolution-data-server-1.11.2/addressbook/backends/file/e-book-backend-file.c	2007-05-18 11:13:41.000000000 -0400
+--- evolution-data-server-1.11.6.1/addressbook/backends/file/e-book-backend-file.c.e-flag	2007-07-30 09:58:54.000000000 -0400
++++ evolution-data-server-1.11.6.1/addressbook/backends/file/e-book-backend-file.c	2007-08-01 12:42:08.000000000 -0400
 @@ -43,6 +43,7 @@
  #include "libedataserver/e-dbhash.h"
  #include "libedataserver/e-db3-utils.h"
@@ -8,7 +8,7 @@
  
  #include "libebook/e-contact.h"
  
-@@ -497,18 +498,15 @@
+@@ -485,18 +486,15 @@ e_book_backend_file_get_contact_list (EB
  
  typedef struct {
  	EBookBackendFile *bf;
@@ -29,7 +29,7 @@
  	g_free (closure);
  }
  
-@@ -518,10 +516,8 @@
+@@ -506,10 +504,8 @@ init_closure (EDataBookView *book_view, 
  	FileBackendSearchClosure *closure = g_new (FileBackendSearchClosure, 1);
  
  	closure->bf = bf;
@@ -41,16 +41,16 @@
  
  	g_object_set_data_full (G_OBJECT (book_view), "EBookBackendFile.BookView::closure",
  				closure, (GDestroyNotify)closure_destroy);
-@@ -545,7 +541,7 @@
+@@ -533,7 +529,7 @@ book_view_thread (gpointer data)
  	DB  *db;
  	DBT id_dbt, vcard_dbt;
  	int db_error;
 -	gboolean stopped = FALSE, allcontacts;
 +	gboolean allcontacts;
  
- 	d(printf ("starting initial population of book view\n"));
+ 	g_return_val_if_fail (E_IS_DATA_BOOK_VIEW (data), NULL);
  
-@@ -565,9 +561,7 @@
+@@ -563,9 +559,7 @@ book_view_thread (gpointer data)
  	}
  
  	d(printf ("signalling parent thread\n"));
@@ -61,7 +61,7 @@
  
  	if (e_book_backend_summary_is_summary_query (bf->priv->summary, query)) {
  		/* do a summary query */
-@@ -576,11 +570,8 @@
+@@ -574,11 +568,8 @@ book_view_thread (gpointer data)
  
  		for (i = 0; i < ids->len; i ++) {
  			char *id = g_ptr_array_index (ids, i);
@@ -74,7 +74,7 @@
  				break;
  
  			string_to_dbt (id, &id_dbt);
-@@ -613,11 +604,7 @@
+@@ -612,11 +603,7 @@ book_view_thread (gpointer data)
  			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
  			while (db_error == 0) {
  
@@ -87,7 +87,7 @@
  					break;
  
  				/* don't include the version in the list of cards */
-@@ -647,7 +634,7 @@
+@@ -647,7 +634,7 @@ book_view_thread (gpointer data)
  
  	}
  
@@ -96,7 +96,7 @@
  		e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
  
  	/* unref the */
-@@ -665,15 +652,12 @@
+@@ -665,15 +652,12 @@ e_book_backend_file_start_book_view (EBo
  {
  	FileBackendSearchClosure *closure = init_closure (book_view, E_BOOK_BACKEND_FILE (backend));
  
@@ -113,7 +113,7 @@
  	d(printf ("returning from start_book_view\n"));
  }
  
-@@ -682,14 +666,11 @@
+@@ -682,14 +666,11 @@ e_book_backend_file_stop_book_view (EBoo
  				    EDataBookView *book_view)
  {
  	FileBackendSearchClosure *closure = get_closure (book_view);
@@ -131,8 +131,8 @@
  
  	if (need_join)
  		g_thread_join (closure->thread);
---- evolution-data-server-1.11.2/addressbook/backends/groupwise/e-book-backend-groupwise.c.e-flag	2007-04-18 06:10:20.000000000 -0400
-+++ evolution-data-server-1.11.2/addressbook/backends/groupwise/e-book-backend-groupwise.c	2007-05-18 11:15:53.000000000 -0400
+--- evolution-data-server-1.11.6.1/addressbook/backends/groupwise/e-book-backend-groupwise.c.e-flag	2007-07-30 09:58:55.000000000 -0400
++++ evolution-data-server-1.11.6.1/addressbook/backends/groupwise/e-book-backend-groupwise.c	2007-08-01 12:42:08.000000000 -0400
 @@ -40,6 +40,7 @@
  #include "libedataserver/e-sexp.h"
  #include "libedataserver/e-data-server-util.h"
@@ -141,7 +141,7 @@
  #include "libedataserver/e-url.h" 
  #include "libebook/e-contact.h"
  #include "libedata-book/e-book-backend-sexp.h"
-@@ -2071,17 +2072,14 @@
+@@ -2076,17 +2077,14 @@ e_book_backend_groupwise_get_contact_lis
  	
  typedef struct {
  	EBookBackendGroupwise *bg;
@@ -161,7 +161,7 @@
  	g_free (closure);
  }
  
-@@ -2091,10 +2089,8 @@
+@@ -2096,10 +2094,8 @@ init_closure (EDataBookView *book_view, 
  	GroupwiseBackendSearchClosure *closure = g_new (GroupwiseBackendSearchClosure, 1);
  
  	closure->bg = bg;
@@ -173,7 +173,7 @@
  
  	g_object_set_data_full (G_OBJECT (book_view), "EBookBackendGroupwise.BookView::closure",
  				closure, (GDestroyNotify)closure_destroy);
-@@ -2116,7 +2112,6 @@
+@@ -2121,7 +2117,6 @@ get_contacts_from_cache (EBookBackendGro
  			 GroupwiseBackendSearchClosure *closure)
  {
  	int i;
@@ -181,7 +181,7 @@
  
  	if (enable_debug)
  		printf ("\nread contacts from cache for the ids found in summary\n");
-@@ -2124,12 +2119,8 @@
+@@ -2129,12 +2124,8 @@ get_contacts_from_cache (EBookBackendGro
  		char *uid;
  		EContact *contact; 
  
@@ -196,7 +196,7 @@
  
   		uid = g_ptr_array_index (ids, i);
  		contact = e_book_backend_db_cache_get_contact (ebgw->priv->file_db, uid);
-@@ -2138,7 +2129,7 @@
+@@ -2143,7 +2134,7 @@ get_contacts_from_cache (EBookBackendGro
  			g_object_unref (contact);
  		}
  	}
@@ -205,7 +205,7 @@
  		e_data_book_view_notify_complete (book_view, 
  						  GNOME_Evolution_Addressbook_Success);
  }
-@@ -2153,7 +2144,6 @@
+@@ -2158,7 +2149,6 @@ book_view_thread (gpointer data)
  	const char *query = NULL;
  	EGwFilter *filter = NULL;
  	GPtrArray *ids = NULL;
@@ -213,7 +213,7 @@
  	EDataBookView *book_view = data;
  	GroupwiseBackendSearchClosure *closure = get_closure (book_view);
  	char *view = NULL;
-@@ -2168,9 +2158,7 @@
+@@ -2173,9 +2163,7 @@ book_view_thread (gpointer data)
  	if (enable_debug)
  		printf ("start book view for %s \n", gwb->priv->book_name);
         	bonobo_object_ref (book_view);
@@ -224,7 +224,7 @@
  	
  	query = e_data_book_view_get_card_query (book_view);
  	if (enable_debug)
-@@ -2202,10 +2190,7 @@
+@@ -2207,10 +2195,7 @@ book_view_thread (gpointer data)
  		contacts = e_book_backend_db_cache_get_contacts (gwb->priv->file_db, query);
  		temp_list = contacts;
  		for (; contacts != NULL; contacts = g_list_next(contacts)) {
@@ -236,7 +236,7 @@
  				for (;contacts != NULL; contacts = g_list_next (contacts))
  					g_object_unref (contacts->data);
  				break;
-@@ -2213,7 +2198,7 @@
+@@ -2218,7 +2203,7 @@ book_view_thread (gpointer data)
  			e_data_book_view_notify_update (book_view, E_CONTACT(contacts->data));
  			g_object_unref (contacts->data);
  		}
@@ -245,7 +245,7 @@
  			e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
  		if (temp_list)
  			g_list_free (temp_list);
-@@ -2341,10 +2326,7 @@
+@@ -2346,10 +2331,7 @@ book_view_thread (gpointer data)
  		temp_list = gw_items;
  		for (; gw_items != NULL; gw_items = g_list_next(gw_items)) { 
  
@@ -257,7 +257,7 @@
  				for (;gw_items != NULL; gw_items = g_list_next (gw_items))
  					g_object_unref (gw_items->data);
  				break;
-@@ -2365,7 +2347,7 @@
+@@ -2370,7 +2352,7 @@ book_view_thread (gpointer data)
  		}
  		if (temp_list)
  			g_list_free (temp_list);
@@ -266,7 +266,7 @@
  			e_data_book_view_notify_complete (book_view, GNOME_Evolution_Addressbook_Success);
  		if (filter)
  			g_object_unref (filter);
-@@ -2394,12 +2376,10 @@
+@@ -2399,12 +2381,10 @@ e_book_backend_groupwise_start_book_view
  
  	if (enable_debug)
  		printf ("\ne_book_backend_groupwise_start_book_view...\n");
@@ -280,7 +280,7 @@
  }
    
  static void
-@@ -2410,10 +2390,7 @@
+@@ -2415,10 +2395,7 @@ e_book_backend_groupwise_stop_book_view 
  	
  	if (enable_debug)
  		printf ("\ne_book_backend_groupwise_stop_book_view...\n");
@@ -292,7 +292,7 @@
  }
  
  static void
-@@ -2655,11 +2632,8 @@
+@@ -2660,11 +2637,8 @@ build_cache (EBookBackendGroupwise *ebgw
  	if (book_view) {
  		closure = get_closure (book_view);
  		bonobo_object_ref (book_view);
@@ -306,7 +306,7 @@
  	}
  
  	while (!done) {
-@@ -2804,11 +2778,8 @@
+@@ -2809,11 +2783,8 @@ update_cache (EBookBackendGroupwise *ebg
  	if (book_view) {
  		closure = get_closure (book_view);
  		bonobo_object_ref (book_view);
@@ -320,7 +320,7 @@
  	}
  
  	cache_file_name = e_book_backend_db_cache_get_filename(ebgw->priv->file_db);
-@@ -2974,11 +2945,8 @@
+@@ -2980,11 +2951,8 @@ update_address_book_deltas (EBookBackend
  	if (book_view) {
  		closure = get_closure (book_view);
  		bonobo_object_ref (book_view);
@@ -334,8 +334,8 @@
  	}
  
  	/* update the cache */
---- evolution-data-server-1.11.2/addressbook/backends/vcf/e-book-backend-vcf.c.e-flag	2007-04-18 06:10:21.000000000 -0400
-+++ evolution-data-server-1.11.2/addressbook/backends/vcf/e-book-backend-vcf.c	2007-05-18 11:13:41.000000000 -0400
+--- evolution-data-server-1.11.6.1/addressbook/backends/vcf/e-book-backend-vcf.c.e-flag	2007-07-30 09:58:55.000000000 -0400
++++ evolution-data-server-1.11.6.1/addressbook/backends/vcf/e-book-backend-vcf.c	2007-08-01 12:42:08.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <glib/gi18n-lib.h>
  
@@ -344,7 +344,7 @@
  
  #include "libebook/e-contact.h"
   
-@@ -427,18 +428,15 @@
+@@ -433,18 +434,15 @@ e_book_backend_vcf_get_contact_list (EBo
  typedef struct {
  	EBookBackendVCF *bvcf;
  	EDataBookView *view;
@@ -365,7 +365,7 @@
  	g_free (closure);
  }
  
-@@ -449,10 +447,8 @@
+@@ -455,10 +453,8 @@ init_closure (EDataBookView *book_view, 
  
  	closure->bvcf = bvcf;
  	closure->view = book_view;
@@ -377,7 +377,7 @@
  
  	g_object_set_data_full (G_OBJECT (book_view), "EBookBackendVCF.BookView::closure",
  				closure, (GDestroyNotify)closure_destroy);
-@@ -486,9 +482,7 @@
+@@ -492,9 +488,7 @@ book_view_thread (gpointer data)
  		e_data_book_view_notify_status_message (book_view, _("Searching..."));
  
  	d(printf ("signalling parent thread\n"));
@@ -388,7 +388,7 @@
  
  	for (l = closure->bvcf->priv->contact_list; l; l = l->next) {
  		char *vcard_string = l->data;
-@@ -496,11 +490,11 @@
+@@ -502,11 +496,11 @@ book_view_thread (gpointer data)
  		e_data_book_view_notify_update (closure->view, contact);
  		g_object_unref (contact);
  
@@ -402,7 +402,7 @@
  		e_data_book_view_notify_complete (closure->view, GNOME_Evolution_Addressbook_Success);
  
  	/* unref the book view */
-@@ -518,15 +512,12 @@
+@@ -524,15 +518,12 @@ e_book_backend_vcf_start_book_view (EBoo
  {
  	VCFBackendSearchClosure *closure = init_closure (book_view, E_BOOK_BACKEND_VCF (backend));
  
@@ -419,7 +419,7 @@
  	d(printf ("returning from start_book_view\n"));
  
  }
-@@ -536,14 +527,11 @@
+@@ -542,14 +533,11 @@ e_book_backend_vcf_stop_book_view (EBook
  				   EDataBookView *book_view)
  {
  	VCFBackendSearchClosure *closure = get_closure (book_view);
@@ -437,17 +437,17 @@
  
  	if (need_join)
  		g_thread_join (closure->thread);
---- evolution-data-server-1.11.2/calendar/libecal/e-cal.c.e-flag	2007-05-14 00:24:28.000000000 -0400
-+++ evolution-data-server-1.11.2/calendar/libecal/e-cal.c	2007-05-18 11:16:58.000000000 -0400
+--- evolution-data-server-1.11.6.1/calendar/libecal/e-cal.c.e-flag	2007-07-31 16:14:54.000000000 -0400
++++ evolution-data-server-1.11.6.1/calendar/libecal/e-cal.c	2007-08-01 12:42:53.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <bonobo/bonobo-main.h>
  
- #include <libedataserver/e-component-listener.h>
-+#include <libedataserver/e-flag.h>
- #include <libedataserver/e-url.h>
+ #include "libedataserver/e-component-listener.h"
++#include "libedataserver/e-flag.h"
+ #include "libedataserver/e-url.h"
  #include "e-cal-marshal.h"
  #include "e-cal-time-util.h"
-@@ -49,8 +50,7 @@
+@@ -50,8 +51,7 @@ get_read_only (ECal *ecal, gboolean *rea
  
  
  typedef struct {
@@ -457,7 +457,7 @@
  	ECalendarStatus status;
  
  	char *uid;
-@@ -303,8 +303,7 @@
+@@ -304,8 +304,7 @@ e_calendar_new_op (ECal *ecal)
  {
  	ECalendarOp *op = g_new0 (ECalendarOp, 1);
  
@@ -467,7 +467,7 @@
  
  	ecal->priv->current_op = op;
  
-@@ -326,8 +325,7 @@
+@@ -327,8 +326,7 @@ static void
  e_calendar_free_op (ECalendarOp *op)
  {
  	/* XXX more stuff here */
@@ -477,7 +477,7 @@
  	g_free (op);
  }
  
-@@ -445,14 +443,10 @@
+@@ -446,14 +444,10 @@ cal_read_only_cb (ECalListener *listener
  		return;
  	}
  
@@ -493,7 +493,7 @@
  }
  
  static void
-@@ -474,14 +468,10 @@
+@@ -475,14 +469,10 @@ cal_cal_address_cb (ECalListener *listen
  		return;
  	}
  
@@ -509,7 +509,7 @@
  }
  
  static void
-@@ -497,14 +487,10 @@
+@@ -498,14 +488,10 @@ cal_alarm_address_cb (ECalListener *list
  		return;
  	}
  
@@ -525,7 +525,7 @@
  }
  
  static void
-@@ -520,14 +506,10 @@
+@@ -521,14 +507,10 @@ cal_ldap_attribute_cb (ECalListener *lis
  		return;
  	}
  
@@ -541,7 +541,7 @@
  }
  
  static void
-@@ -543,14 +525,10 @@
+@@ -544,14 +526,10 @@ cal_static_capabilities_cb (ECalListener
  		return;
  	}
  
@@ -557,7 +557,7 @@
  }
  
  static void
-@@ -566,13 +544,9 @@
+@@ -567,13 +545,9 @@ cal_opened_cb (ECalListener *listener, E
  		return;
  	}
  
@@ -572,7 +572,7 @@
  }
  
  static void
-@@ -588,13 +562,9 @@
+@@ -589,13 +563,9 @@ cal_removed_cb (ECalListener *listener, 
  		return;
  	}
  
@@ -587,7 +587,7 @@
  }
  
  static void
-@@ -610,14 +580,10 @@
+@@ -611,14 +581,10 @@ cal_object_created_cb (ECalListener *lis
  		return;
  	}
  
@@ -603,7 +603,7 @@
  }
  
  static void
-@@ -633,13 +599,9 @@
+@@ -634,13 +600,9 @@ cal_object_modified_cb (ECalListener *li
  		return;
  	}
  
@@ -618,7 +618,7 @@
  }
  
  static void
-@@ -655,13 +617,9 @@
+@@ -656,13 +618,9 @@ cal_object_removed_cb (ECalListener *lis
  		return;
  	}
  
@@ -633,7 +633,7 @@
  }
  
  static void
-@@ -677,13 +635,9 @@
+@@ -678,13 +636,9 @@ cal_alarm_discarded_cb (ECalListener *li
  		return;
  	}
  
@@ -648,7 +648,7 @@
  }
  
  static void
-@@ -699,13 +653,9 @@
+@@ -700,13 +654,9 @@ cal_objects_received_cb (ECalListener *l
  		return;
  	}
  
@@ -663,7 +663,7 @@
  }
  
  static void
-@@ -722,8 +672,6 @@
+@@ -723,8 +673,6 @@ cal_objects_sent_cb (ECalListener *liste
  		return;
  	}
  
@@ -672,7 +672,7 @@
  	op->status = status;
  	op->list = g_list_copy (users);
  	op->string = g_strdup (object);
-@@ -731,9 +679,7 @@
+@@ -732,9 +680,7 @@ cal_objects_sent_cb (ECalListener *liste
  	for (l = op->list; l; l = l->next)
  		l->data = g_strdup (l->data);
  
@@ -683,7 +683,7 @@
  }
  
  static void
-@@ -749,14 +695,10 @@
+@@ -750,14 +696,10 @@ cal_default_object_requested_cb (ECalLis
  		return;
  	}
  
@@ -699,7 +699,7 @@
  }
  
  static void
-@@ -772,14 +714,10 @@
+@@ -773,14 +715,10 @@ cal_object_requested_cb (ECalListener *l
  		return;
  	}
  
@@ -715,7 +715,7 @@
  }
  
  static void
-@@ -796,17 +734,13 @@
+@@ -797,17 +735,13 @@ cal_object_list_cb (ECalListener *listen
  		return;
  	}
  
@@ -734,7 +734,7 @@
  }
  
  static void
-@@ -822,14 +756,10 @@
+@@ -823,14 +757,10 @@ cal_attachment_list_cb (ECalListener *li
  		return;
  	}
  
@@ -750,7 +750,7 @@
  }
  
  static void
-@@ -845,15 +775,10 @@
+@@ -846,15 +776,10 @@ cal_get_timezone_cb (ECalListener *liste
  		return;
  	}
  
@@ -767,7 +767,7 @@
  }
  
  static void
-@@ -869,15 +794,10 @@
+@@ -870,15 +795,10 @@ cal_add_timezone_cb (ECalListener *liste
  		return;
  	}
  
@@ -784,7 +784,7 @@
  }
  
  static void
-@@ -893,13 +813,9 @@
+@@ -894,13 +814,9 @@ cal_set_default_timezone_cb (ECalListene
  		return;
  	}
  
@@ -799,7 +799,7 @@
  }
  
  static void
-@@ -916,8 +832,6 @@
+@@ -917,8 +833,6 @@ cal_get_changes_cb (ECalListener *listen
  		return;
  	}
  
@@ -808,7 +808,7 @@
  	op->status = status;
  	op->list = g_list_copy (changes);
  
-@@ -931,9 +845,7 @@
+@@ -932,9 +846,7 @@ cal_get_changes_cb (ECalListener *listen
  		l->data = new_ccc;
  	}
  	
@@ -819,7 +819,7 @@
  }
  
  static void
-@@ -950,17 +862,13 @@
+@@ -951,17 +863,13 @@ cal_get_free_busy_cb (ECalListener *list
  		return;
  	}
  
@@ -838,7 +838,7 @@
  }
  
  static void
-@@ -976,14 +884,10 @@
+@@ -977,14 +885,10 @@ cal_query_cb (ECalListener *listener, EC
  		return;
  	}
  
@@ -854,7 +854,7 @@
  }
  
  static gboolean  
-@@ -1724,7 +1628,6 @@
+@@ -1724,7 +1628,6 @@ open_calendar (ECal *ecal, gboolean only
  	}
  	/* start the open operation */
  	our_op = e_calendar_new_op (ecal);
@@ -862,7 +862,7 @@
  
  	g_mutex_unlock (priv->mutex);
  
-@@ -1737,7 +1640,6 @@
+@@ -1737,7 +1640,6 @@ open_calendar (ECal *ecal, gboolean only
  
  		if (priv->auth_func == NULL) {
  			e_calendar_remove_op (ecal, our_op);
@@ -870,15 +870,15 @@
  			e_calendar_free_op (our_op);
  			priv->load_state = E_CAL_LOAD_NOT_LOADED;
  			*status = E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED;
-@@ -1747,7 +1649,6 @@
- 		username = e_source_get_property (priv->source, "username");
+@@ -1747,7 +1649,6 @@ open_calendar (ECal *ecal, gboolean only
+ 		username = e_source_get_duped_property (priv->source, "username");
  		if (!username) {
  			e_calendar_remove_op (ecal, our_op);
 -			g_mutex_unlock (our_op->mutex);
  			e_calendar_free_op (our_op);
  			priv->load_state = E_CAL_LOAD_NOT_LOADED;
  			*status = E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED;
-@@ -1775,7 +1676,6 @@
+@@ -1777,7 +1678,6 @@ open_calendar (ECal *ecal, gboolean only
  
  		if (!key) {
  			e_calendar_remove_op (ecal, our_op);
@@ -886,7 +886,7 @@
  			e_calendar_free_op (our_op);
  			priv->load_state = E_CAL_LOAD_NOT_LOADED;
  			*status = E_CALENDAR_STATUS_URI_NOT_LOADED;
-@@ -1786,7 +1686,6 @@
+@@ -1788,7 +1688,6 @@ open_calendar (ECal *ecal, gboolean only
  
  		if (!password) {
  			e_calendar_remove_op (ecal, our_op);
@@ -894,7 +894,7 @@
  			e_calendar_free_op (our_op);
  			priv->load_state = E_CAL_LOAD_NOT_LOADED;
  			*status = E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED; 
-@@ -1811,7 +1710,6 @@
+@@ -1813,7 +1712,6 @@ open_calendar (ECal *ecal, gboolean only
  
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -902,7 +902,7 @@
  		e_calendar_free_op (our_op);
  		
  		CORBA_exception_free (&ev);
-@@ -1825,14 +1723,11 @@
+@@ -1827,14 +1725,11 @@ open_calendar (ECal *ecal, gboolean only
  
  	CORBA_exception_free (&ev);
  
@@ -918,7 +918,7 @@
  	e_calendar_free_op (our_op);
  	if (*status == E_CALENDAR_STATUS_OK) {
  		priv->load_state = E_CAL_LOAD_LOADED;
-@@ -1988,8 +1883,6 @@
+@@ -1990,8 +1885,6 @@ e_cal_remove (ECal *ecal, GError **error
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -927,7 +927,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  
-@@ -1998,7 +1891,6 @@
+@@ -2000,7 +1893,6 @@ e_cal_remove (ECal *ecal, GError **error
  	GNOME_Evolution_Calendar_Cal_remove (priv->cal, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -935,7 +935,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2010,14 +1902,11 @@
+@@ -2012,14 +1904,11 @@ e_cal_remove (ECal *ecal, GError **error
  
  	CORBA_exception_free (&ev);
  
@@ -951,7 +951,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2249,8 +2138,6 @@
+@@ -2251,8 +2140,6 @@ get_read_only (ECal *ecal, gboolean *rea
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -960,7 +960,7 @@
  	/* set it to true so that op does not emit cond signals for all notifications
  	   from the backend */
  	our_op->bool = TRUE;
-@@ -2263,7 +2150,6 @@
+@@ -2265,7 +2152,6 @@ get_read_only (ECal *ecal, gboolean *rea
  	GNOME_Evolution_Calendar_Cal_isReadOnly (priv->cal, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -968,7 +968,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2275,9 +2161,7 @@
+@@ -2277,9 +2163,7 @@ get_read_only (ECal *ecal, gboolean *rea
  
  	CORBA_exception_free (&ev);
  
@@ -979,7 +979,7 @@
  
  	status = our_op->status;
  	
-@@ -2285,7 +2169,6 @@
+@@ -2287,7 +2171,6 @@ get_read_only (ECal *ecal, gboolean *rea
  		*read_only = our_op->bool;
  
  	e_calendar_remove_op (ecal, our_op);
@@ -987,7 +987,7 @@
  	e_calendar_free_op (our_op);
  	E_CALENDAR_CHECK_STATUS (status, error);
  }
-@@ -2328,8 +2211,6 @@
+@@ -2330,8 +2213,6 @@ e_cal_get_cal_address (ECal *ecal, char 
  
  		our_op = e_calendar_new_op (ecal);
  
@@ -996,7 +996,7 @@
  		g_mutex_unlock (ecal->priv->mutex);
  
  
-@@ -2338,7 +2219,6 @@
+@@ -2340,7 +2221,6 @@ e_cal_get_cal_address (ECal *ecal, char 
  		GNOME_Evolution_Calendar_Cal_getCalAddress (priv->cal, &ev);
  		if (BONOBO_EX (&ev)) {
  			e_calendar_remove_op (ecal, our_op);
@@ -1004,7 +1004,7 @@
  			e_calendar_free_op (our_op);
  
  			CORBA_exception_free (&ev);
-@@ -2350,14 +2230,11 @@
+@@ -2352,14 +2232,11 @@ e_cal_get_cal_address (ECal *ecal, char 
  
  		CORBA_exception_free (&ev);
  
@@ -1020,7 +1020,7 @@
  		e_calendar_free_op (our_op);
  
  		E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2405,8 +2282,6 @@
+@@ -2407,8 +2284,6 @@ e_cal_get_alarm_email_address (ECal *eca
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1029,7 +1029,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  
-@@ -2415,7 +2290,6 @@
+@@ -2417,7 +2292,6 @@ e_cal_get_alarm_email_address (ECal *eca
  	GNOME_Evolution_Calendar_Cal_getAlarmEmailAddress (priv->cal, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1037,7 +1037,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2427,15 +2301,12 @@
+@@ -2429,15 +2303,12 @@ e_cal_get_alarm_email_address (ECal *eca
  
  	CORBA_exception_free (&ev);
  
@@ -1054,7 +1054,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2478,8 +2349,6 @@
+@@ -2480,8 +2351,6 @@ e_cal_get_ldap_attribute (ECal *ecal, ch
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1063,7 +1063,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  
-@@ -2488,7 +2357,6 @@
+@@ -2490,7 +2359,6 @@ e_cal_get_ldap_attribute (ECal *ecal, ch
  	GNOME_Evolution_Calendar_Cal_getLdapAttribute (priv->cal, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1071,7 +1071,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2500,15 +2368,12 @@
+@@ -2502,15 +2370,12 @@ e_cal_get_ldap_attribute (ECal *ecal, ch
  
  	CORBA_exception_free (&ev);
  
@@ -1088,7 +1088,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2541,8 +2406,6 @@
+@@ -2543,8 +2408,6 @@ load_static_capabilities (ECal *ecal, GE
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1097,7 +1097,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  
-@@ -2551,7 +2414,6 @@
+@@ -2553,7 +2416,6 @@ load_static_capabilities (ECal *ecal, GE
  	GNOME_Evolution_Calendar_Cal_getStaticCapabilities (priv->cal, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1105,7 +1105,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2563,15 +2425,12 @@
+@@ -2565,15 +2427,12 @@ load_static_capabilities (ECal *ecal, GE
  
  	CORBA_exception_free (&ev);
  
@@ -1122,7 +1122,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2780,8 +2639,6 @@
+@@ -2782,8 +2641,6 @@ e_cal_get_default_object (ECal *ecal, ic
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1131,7 +1131,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -2789,7 +2646,6 @@
+@@ -2791,7 +2648,6 @@ e_cal_get_default_object (ECal *ecal, ic
  	GNOME_Evolution_Calendar_Cal_getDefaultObject (priv->cal, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1139,7 +1139,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2801,9 +2657,7 @@
+@@ -2803,9 +2659,7 @@ e_cal_get_default_object (ECal *ecal, ic
  
  	CORBA_exception_free (&ev);
  
@@ -1150,7 +1150,7 @@
  
  	status = our_op->status;
          if (status != E_CALENDAR_STATUS_OK) {
-@@ -2816,7 +2670,6 @@
+@@ -2818,7 +2672,6 @@ e_cal_get_default_object (ECal *ecal, ic
  	g_free (our_op->string);
  
  	e_calendar_remove_op (ecal, our_op);
@@ -1158,7 +1158,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2861,15 +2714,12 @@
+@@ -2863,15 +2716,12 @@ e_cal_get_attachments_for_comp (ECal *ec
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1174,7 +1174,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2881,9 +2731,7 @@
+@@ -2883,9 +2733,7 @@ e_cal_get_attachments_for_comp (ECal *ec
  
  	CORBA_exception_free (&ev);
  
@@ -1185,7 +1185,7 @@
  
  	status = our_op->status;
          if (status != E_CALENDAR_STATUS_OK){ 
-@@ -2893,7 +2741,6 @@
+@@ -2895,7 +2743,6 @@ e_cal_get_attachments_for_comp (ECal *ec
  	}
  
  	e_calendar_remove_op (ecal, our_op);
@@ -1193,7 +1193,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -2938,8 +2785,6 @@
+@@ -2940,8 +2787,6 @@ e_cal_get_object (ECal *ecal, const char
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1202,7 +1202,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -2947,7 +2792,6 @@
+@@ -2949,7 +2794,6 @@ e_cal_get_object (ECal *ecal, const char
  	GNOME_Evolution_Calendar_Cal_getObject (priv->cal, uid, rid ? rid : "", &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1210,7 +1210,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -2959,9 +2803,7 @@
+@@ -2961,9 +2805,7 @@ e_cal_get_object (ECal *ecal, const char
  
  	CORBA_exception_free (&ev);
  
@@ -1221,7 +1221,7 @@
  
  	status = our_op->status;
          if (status != E_CALENDAR_STATUS_OK){ 
-@@ -3009,7 +2851,6 @@
+@@ -3011,7 +2853,6 @@ e_cal_get_object (ECal *ecal, const char
  	g_free (our_op->string);
  
  	e_calendar_remove_op (ecal, our_op);
@@ -1229,7 +1229,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -3055,8 +2896,6 @@
+@@ -3057,8 +2898,6 @@ e_cal_get_objects_for_uid (ECal *ecal, c
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1238,7 +1238,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -3064,7 +2903,6 @@
+@@ -3066,7 +2905,6 @@ e_cal_get_objects_for_uid (ECal *ecal, c
  	GNOME_Evolution_Calendar_Cal_getObject (priv->cal, uid, "", &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1246,7 +1246,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -3076,9 +2914,7 @@
+@@ -3078,9 +2916,7 @@ e_cal_get_objects_for_uid (ECal *ecal, c
  
  	CORBA_exception_free (&ev);
  
@@ -1257,7 +1257,7 @@
  
  	status = our_op->status;
          if (status != E_CALENDAR_STATUS_OK){ 
-@@ -3136,7 +2972,6 @@
+@@ -3138,7 +2974,6 @@ e_cal_get_objects_for_uid (ECal *ecal, c
  	g_free (our_op->string);
  
  	e_calendar_remove_op (ecal, our_op);
@@ -1265,7 +1265,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -3206,8 +3041,6 @@
+@@ -3208,8 +3043,6 @@ e_cal_get_changes (ECal *ecal, const cha
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1274,7 +1274,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -3216,7 +3049,6 @@
+@@ -3218,7 +3051,6 @@ e_cal_get_changes (ECal *ecal, const cha
  
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1282,7 +1282,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -3228,15 +3060,12 @@
+@@ -3230,15 +3062,12 @@ e_cal_get_changes (ECal *ecal, const cha
  	
  	CORBA_exception_free (&ev);
  
@@ -1299,7 +1299,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -3306,8 +3135,6 @@
+@@ -3308,8 +3137,6 @@ e_cal_get_object_list (ECal *ecal, const
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1308,7 +1308,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -3316,7 +3143,6 @@
+@@ -3318,7 +3145,6 @@ e_cal_get_object_list (ECal *ecal, const
  
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1316,7 +1316,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -3328,15 +3154,12 @@
+@@ -3330,15 +3156,12 @@ e_cal_get_object_list (ECal *ecal, const
  	
  	CORBA_exception_free (&ev);
  
@@ -1333,7 +1333,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -3439,8 +3262,6 @@
+@@ -3441,8 +3264,6 @@ e_cal_get_free_busy (ECal *ecal, GList *
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1342,7 +1342,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	/* create the CORBA user list to be passed to the backend */
-@@ -3460,7 +3281,6 @@
+@@ -3462,7 +3283,6 @@ e_cal_get_free_busy (ECal *ecal, GList *
  	
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1350,7 +1350,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -3472,15 +3292,12 @@
+@@ -3474,15 +3294,12 @@ e_cal_get_free_busy (ECal *ecal, GList *
  	
  	CORBA_exception_free (&ev);
  
@@ -1367,7 +1367,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4174,8 +3991,6 @@
+@@ -4176,8 +3993,6 @@ e_cal_discard_alarm (ECal *ecal, ECalCom
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1376,7 +1376,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	e_cal_component_get_uid (comp, &uid);
-@@ -4185,7 +4000,6 @@
+@@ -4187,7 +4002,6 @@ e_cal_discard_alarm (ECal *ecal, ECalCom
  	GNOME_Evolution_Calendar_Cal_discardAlarm (priv->cal, uid, auid, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1384,7 +1384,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4197,14 +4011,11 @@
+@@ -4199,14 +4013,11 @@ e_cal_discard_alarm (ECal *ecal, ECalCom
  
  	CORBA_exception_free (&ev);
  
@@ -1400,7 +1400,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4420,8 +4231,6 @@
+@@ -4422,8 +4233,6 @@ e_cal_create_object (ECal *ecal, icalcom
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1409,7 +1409,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -4429,7 +4238,6 @@
+@@ -4431,7 +4240,6 @@ e_cal_create_object (ECal *ecal, icalcom
  	GNOME_Evolution_Calendar_Cal_createObject (priv->cal, icalcomponent_as_ical_string (icalcomp), &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1417,7 +1417,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4441,9 +4249,7 @@
+@@ -4443,9 +4251,7 @@ e_cal_create_object (ECal *ecal, icalcom
  
  	CORBA_exception_free (&ev);
  
@@ -1428,7 +1428,7 @@
  
  	status = our_op->status;
  	if (uid)
-@@ -4453,7 +4259,6 @@
+@@ -4455,7 +4261,6 @@ e_cal_create_object (ECal *ecal, icalcom
  	}
  	
  	e_calendar_remove_op (ecal, our_op);
@@ -1436,7 +1436,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4503,8 +4308,6 @@
+@@ -4505,8 +4310,6 @@ e_cal_modify_object (ECal *ecal, icalcom
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1445,7 +1445,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -4512,7 +4315,6 @@
+@@ -4514,7 +4317,6 @@ e_cal_modify_object (ECal *ecal, icalcom
  	GNOME_Evolution_Calendar_Cal_modifyObject (priv->cal, icalcomponent_as_ical_string (icalcomp), mod, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1453,7 +1453,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4524,14 +4326,11 @@
+@@ -4526,14 +4328,11 @@ e_cal_modify_object (ECal *ecal, icalcom
  
  	CORBA_exception_free (&ev);
  
@@ -1469,7 +1469,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4584,8 +4383,6 @@
+@@ -4586,8 +4385,6 @@ e_cal_remove_object_with_mod (ECal *ecal
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1478,7 +1478,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  
-@@ -4594,7 +4391,6 @@
+@@ -4596,7 +4393,6 @@ e_cal_remove_object_with_mod (ECal *ecal
  	GNOME_Evolution_Calendar_Cal_removeObject (priv->cal, uid, rid ? rid : "", mod, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1486,7 +1486,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4606,14 +4402,11 @@
+@@ -4608,14 +4404,11 @@ e_cal_remove_object_with_mod (ECal *ecal
  
  	CORBA_exception_free (&ev);
  
@@ -1502,7 +1502,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4678,8 +4471,6 @@
+@@ -4680,8 +4473,6 @@ e_cal_receive_objects (ECal *ecal, icalc
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1511,7 +1511,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -4687,7 +4478,6 @@
+@@ -4689,7 +4480,6 @@ e_cal_receive_objects (ECal *ecal, icalc
  	GNOME_Evolution_Calendar_Cal_receiveObjects (priv->cal, icalcomponent_as_ical_string (icalcomp), &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1519,7 +1519,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4699,14 +4489,11 @@
+@@ -4701,14 +4491,11 @@ e_cal_receive_objects (ECal *ecal, icalc
  
  	CORBA_exception_free (&ev);
  
@@ -1535,7 +1535,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4752,8 +4539,6 @@
+@@ -4754,8 +4541,6 @@ e_cal_send_objects (ECal *ecal, icalcomp
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1544,7 +1544,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -4761,7 +4546,6 @@
+@@ -4763,7 +4548,6 @@ e_cal_send_objects (ECal *ecal, icalcomp
  	GNOME_Evolution_Calendar_Cal_sendObjects (priv->cal, icalcomponent_as_ical_string (icalcomp), &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1552,7 +1552,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4773,9 +4557,7 @@
+@@ -4775,9 +4559,7 @@ e_cal_send_objects (ECal *ecal, icalcomp
  
  	CORBA_exception_free (&ev);
  
@@ -1563,7 +1563,7 @@
  
  	status = our_op->status;
  	*users = our_op->list;
-@@ -4796,7 +4578,6 @@
+@@ -4798,7 +4580,6 @@ e_cal_send_objects (ECal *ecal, icalcomp
  	g_free (our_op->string);
  	
  	e_calendar_remove_op (ecal, our_op);
@@ -1571,7 +1571,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4841,8 +4622,6 @@
+@@ -4843,8 +4624,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1580,7 +1580,7 @@
  	g_mutex_unlock (priv->mutex);
  
  	/* Check for well known zones and in the cache */
-@@ -4851,7 +4630,6 @@
+@@ -4853,7 +4632,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  	/* If tzid is NULL or "" we return NULL, since it is a 'local time'. */
  	if (!tzid || !tzid[0]) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1588,7 +1588,7 @@
  		e_calendar_free_op (our_op);
  
  		*zone = NULL;
-@@ -4869,7 +4647,6 @@
+@@ -4871,7 +4649,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  	
  	if (*zone) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1596,7 +1596,7 @@
  		e_calendar_free_op (our_op);
  
  		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OK, error);	
-@@ -4881,7 +4658,6 @@
+@@ -4883,7 +4660,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  	GNOME_Evolution_Calendar_Cal_getTimezone (priv->cal, tzid, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1604,7 +1604,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -4893,9 +4669,7 @@
+@@ -4895,9 +4671,7 @@ e_cal_get_timezone (ECal *ecal, const ch
  
  	CORBA_exception_free (&ev);
  
@@ -1615,7 +1615,7 @@
  
  	status = our_op->status;
          if (status != E_CALENDAR_STATUS_OK){ 
-@@ -4909,7 +4683,6 @@
+@@ -4911,7 +4685,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  	
  	if (!icalcomp) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1623,7 +1623,7 @@
  		e_calendar_free_op (our_op);
  
  		E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4920,7 +4693,6 @@
+@@ -4922,7 +4695,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  		icaltimezone_free (*zone, 1);
  
  		e_calendar_remove_op (ecal, our_op);
@@ -1631,7 +1631,7 @@
  		e_calendar_free_op (our_op);
  
  		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OBJECT_NOT_FOUND, error);
-@@ -4930,7 +4702,6 @@
+@@ -4932,7 +4704,6 @@ e_cal_get_timezone (ECal *ecal, const ch
  	g_hash_table_insert (priv->timezones, icaltimezone_get_tzid (*zone), *zone);
  
  	e_calendar_remove_op (ecal, our_op);
@@ -1639,7 +1639,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -4975,15 +4746,12 @@
+@@ -4977,15 +4748,12 @@ e_cal_add_timezone (ECal *ecal, icaltime
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1655,7 +1655,7 @@
  		e_calendar_free_op (our_op);
  		
  		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OK, error);
-@@ -4992,7 +4760,6 @@
+@@ -4994,7 +4762,6 @@ e_cal_add_timezone (ECal *ecal, icaltime
  	icalcomp = icaltimezone_get_component (izone);
  	if (!icalcomp) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1663,7 +1663,7 @@
  		e_calendar_free_op (our_op);
  
  		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_INVALID_ARG, error);
-@@ -5007,7 +4774,6 @@
+@@ -5009,7 +4776,6 @@ e_cal_add_timezone (ECal *ecal, icaltime
  	GNOME_Evolution_Calendar_Cal_addTimezone (priv->cal, tzobj, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1671,7 +1671,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -5019,14 +4785,11 @@
+@@ -5021,14 +4787,11 @@ e_cal_add_timezone (ECal *ecal, icaltime
  
  	CORBA_exception_free (&ev);
  
@@ -1687,7 +1687,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -5068,8 +4831,6 @@
+@@ -5070,8 +4833,6 @@ e_cal_get_query (ECal *ecal, const char 
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1696,7 +1696,7 @@
  	g_mutex_unlock (ecal->priv->mutex);
  
  	CORBA_exception_init (&ev);
-@@ -5079,7 +4840,6 @@
+@@ -5081,7 +4842,6 @@ e_cal_get_query (ECal *ecal, const char 
  
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1704,7 +1704,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -5091,9 +4851,7 @@
+@@ -5093,9 +4853,7 @@ e_cal_get_query (ECal *ecal, const char 
  	
  	CORBA_exception_free (&ev);
  
@@ -1715,7 +1715,7 @@
  
  	status = our_op->status;
  	*query = our_op->query;
-@@ -5101,7 +4859,6 @@
+@@ -5103,7 +4861,6 @@ e_cal_get_query (ECal *ecal, const char 
  	bonobo_object_unref (BONOBO_OBJECT (our_op->listener));
  	
  	e_calendar_remove_op (ecal, our_op);
@@ -1723,7 +1723,7 @@
  	e_calendar_free_op (our_op);
  
  	E_CALENDAR_CHECK_STATUS (status, error);
-@@ -5146,15 +4903,12 @@
+@@ -5148,15 +4905,12 @@ e_cal_set_default_timezone (ECal *ecal, 
  
  	our_op = e_calendar_new_op (ecal);
  
@@ -1739,7 +1739,7 @@
  		e_calendar_free_op (our_op);
  
  		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_INVALID_ARG, error);
-@@ -5169,7 +4923,6 @@
+@@ -5171,7 +4925,6 @@ e_cal_set_default_timezone (ECal *ecal, 
  	GNOME_Evolution_Calendar_Cal_setDefaultTimezone (priv->cal, tzobj, &ev);
  	if (BONOBO_EX (&ev)) {
  		e_calendar_remove_op (ecal, our_op);
@@ -1747,7 +1747,7 @@
  		e_calendar_free_op (our_op);
  
  		CORBA_exception_free (&ev);
-@@ -5181,9 +4934,7 @@
+@@ -5183,9 +4936,7 @@ e_cal_set_default_timezone (ECal *ecal, 
  
  	CORBA_exception_free (&ev);
  
@@ -1758,7 +1758,7 @@
  
  	status = our_op->status;
  
-@@ -5195,7 +4946,6 @@
+@@ -5197,7 +4948,6 @@ e_cal_set_default_timezone (ECal *ecal, 
  	}
  
  	e_calendar_remove_op (ecal, our_op);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- evolution-data-server.spec	31 Jul 2007 11:35:30 -0000	1.175
+++ evolution-data-server.spec	1 Aug 2007 18:29:43 -0000	1.176
@@ -25,7 +25,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.11.6
+Version: 1.11.6.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -66,9 +66,6 @@
 # RH bug #243296
 Patch21: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# Implicit Function Declarations
-Patch22: evolution-data-server-1.11.6-implicit-function-declaration.patch
-
 ### Dependencies ###
 
 Requires: GConf2
@@ -158,7 +155,6 @@
 %patch19 -p1 -b .camel-folder-symmary-crash
 %patch20 -p1 -b .camel-certdb-nss-cert-get
 %patch21 -p1 -b .fix-64bit-acinclude
-%patch22 -p1 -b .implicit-function-declaration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -391,6 +387,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Aug 01 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.6.1-1.fc8
+- Update to 1.11.6.1
+
 * Tue Jul 31 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.6-1.fc8
 - Update to 1.11.6
 - Remove patch for GNOME bug #380534 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	31 Jul 2007 11:35:30 -0000	1.67
+++ sources	1 Aug 2007 18:29:43 -0000	1.68
@@ -1 +1 @@
-d8449061c942acecb7facd049d248c37  evolution-data-server-1.11.6.tar.bz2
+543744d3853f887d826aafa78849c5db  evolution-data-server-1.11.6.1.tar.bz2


--- evolution-data-server-1.11.6-implicit-function-declaration.patch DELETED ---




More information about the fedora-extras-commits mailing list