[evolution-patches] Patches for evolution-2.3.6.1

[Gary Ekker <gekker novell com>]

Hi all,

Here are a few patches that we currently have in the SUSE build system.
They all apply cleanly to evolution-2.6.3.1.

Most of them are to fix compiler warnings for 64-bit cleanliness, gcc4,
use of uninitialized variables, and adding #includes for the
D_FORTIFY_SOURCE=2 feature of gcc4. The fortify source feature of gcc4
lets the compiler check for buffer overflows, but in order to do that it
requires that all the correct #includes be present.

Most of these patches aren't my own work, but I'll take credit for the
good ones.

-Gary

--- evolution-2.0.2/po/de.po
+++ evolution-2.0.2/po/de.po
@@ -588,7 +588,7 @@
 
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
-msgstr "Eindeutiger Name"
+msgstr "\"Distinguished\" Name"
 
 #: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
@@ -670,10 +670,7 @@
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr ""
-"Die Suchbasis ist der eindeutige Name (EN) des Eintrags, bei dem die Suche "
-"beginnt. Wenn Sie dieses Feld leer lassen, beginnt die Suche an der Wurzel "
-"des Verzeichnisbaums."
+msgstr "Die Suchbasis ist der \"distinguished\" Name (DN) des Eintrags, bei dem die Suche beginnt. Wenn Sie dieses Feld leer lassen, beginnt die Suche an der Wurzel des Verzeichnisbaums."
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
@@ -733,7 +730,7 @@
 
 #: addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
-msgstr "Eindeutigen Namen (EN) verwenden"
+msgstr "\"Distinguished\" Namen (DN) verwenden"
 
 #: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"

--- evolution-2.3.6.1/calendar/gui/e-cal-model.c
+++ evolution-2.3.6.1/calendar/gui/e-cal-model.c
@@ -32,6 +32,7 @@
 #include "itip-utils.h"
 #include "misc.h"
 #include "e-calendar-marshal.h"
+#include "calendar-config.h"
 
 typedef struct {
 	ECal *client;
--- evolution-2.3.6.1/calendar/gui/e-calendar-table.c
+++ evolution-2.3.6.1/calendar/gui/e-calendar-table.c
@@ -589,7 +589,7 @@
 	ECalModelComponent *comp_data;
 	icalproperty *prop;
 
-	comp_data = get_selected_comp (cal_table);
+	comp_data = e_calendar_table_get_selected_comp (cal_table);
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
 	if (comp_data != NULL)
 		e_calendar_table_open_task (cal_table, comp_data, prop ? TRUE : FALSE);
--- evolution-2.3.6.1/calendar/gui/e-tasks.c
+++ evolution-2.3.6.1/calendar/gui/e-tasks.c
@@ -39,6 +39,7 @@
 #include "e-util/e-time-utils.h"
 #include "shell/e-user-creatable-items-handler.h"
 #include <libedataserver/e-url.h>
+#include <libedataserver/e-categories.h>
 #include <libecal/e-cal-time-util.h>
 #include "widgets/menus/gal-view-menus.h"
 #include "dialogs/delete-error.h"
--- evolution-2.3.6.1/plugins/groupwise-features/proxy-login.c
+++ evolution-2.3.6.1/plugins/groupwise-features/proxy-login.c
@@ -354,7 +354,7 @@
 		e_account_list_add(accounts, dstAccount);
 		e_account_list_change (accounts, srcAccount);
 		e_account_list_save(accounts);
-		g_object_set_data ((GObject *)dstAccount, "permissions", permissions);
+		g_object_set_data ((GObject *)dstAccount, "permissions", (gpointer)permissions);
 		mail_get_store(e_account_get_string(dstAccount, E_ACCOUNT_SOURCE_URL), NULL, proxy_login_add_new_store, dstAccount);
 
 		g_free (proxy_source_url);

--- evolution-2.3.6.1/configure.in
+++ evolution-2.3.6.1/configure.in
@@ -1677,7 +1677,6 @@
 plugins/mail-to-meeting/Makefile
 plugins/mail-to-task/Makefile
 plugins/mail-remote/Makefile
-plugins/mono/Makefile
 plugins/new-mail-notify/Makefile
 plugins/subject-thread/Makefile
 plugins/save-attachments/Makefile

--- calendar/gui/calendar-component.c
+++ calendar/gui/calendar-component.c
@@ -1209,7 +1209,7 @@
 	} else {
 		ECalComponent *comp;
 		EventEditor *editor;
-		CompEditorFlags flags;
+		CompEditorFlags flags = 0; 
 
 		flags |= COMP_EDITOR_MEETING | COMP_EDITOR_NEW_ITEM;
 		comp = cal_comp_event_new_with_current_time (ecal, is_allday);
--- calendar/gui/dialogs/calendar-setup.c
+++ calendar/gui/dialogs/calendar-setup.c
@@ -55,7 +55,7 @@
 
 	/* Source group we're creating/editing a source in */
 	ESourceGroup *source_group;
-	ECalSourceType *source_type;
+	ECalSourceType source_type;
 };
 
 static gboolean
--- calendar/gui/dialogs/comp-editor.c
+++ calendar/gui/dialogs/comp-editor.c
@@ -47,6 +47,8 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-stream-mem.h>
 #include <camel/camel-mime-message.h>
+#include <camel/camel-file-utils.h>
+#include <camel/camel-stream-fs.h>
 
 #include "mail/mail-tools.h"
 
@@ -59,6 +61,7 @@
 #include "cancel-comp.h"
 #include "recur-comp.h"
 #include "comp-editor.h"
+#include "cal-attachment-select-file.h"
 #include "../e-cal-popup.h"
 
 #include "e-attachment-bar.h"
--- calendar/gui/dialogs/e-send-options-utils.c
+++ calendar/gui/dialogs/e-send-options-utils.c
@@ -21,6 +21,7 @@
 #include "e-send-options-utils.h"
 #include "../calendar-config.h"
 #include <glib.h>
+#include <string.h>
 
 ESendOptionsDialog *sod = NULL;
 
--- calendar/gui/e-cal-config.h
+++ calendar/gui/e-cal-config.h
@@ -53,7 +53,7 @@
 	EConfigTarget target;
 
 	struct _ESource *source;
-        ECalSourceType *source_type;
+        ECalSourceType source_type;
 };
 
 typedef struct _EConfigItem ECalConfigItem;
--- calendar/gui/e-calendar-view.c
+++ calendar/gui/e-calendar-view.c
@@ -1332,7 +1332,7 @@
 {
 	ECalendarView *cal_view = data;
 	GList *selected;
-	guint32 flags;
+	guint32 flags = 0;
 	icalcomponent *clone;
 
 	selected = e_calendar_view_get_selected_events (cal_view);
--- composer/e-msg-composer-hdrs.c
+++ composer/e-msg-composer-hdrs.c
@@ -595,7 +595,8 @@
 			      NULL);
 	
 	ret.entry = create_addressbook_entry (hdrs, name);
-	
+	ret.visible = 0;
+
 	return ret;
 }
 
--- mail/em-composer-prefs.c
+++ mail/em-composer-prefs.c
@@ -53,6 +53,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkimage.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkentry.h>
 
 #include <libgnomeui/gnome-file-entry.h>
 #include <libgnomeui/gnome-color-picker.h>
--- mail/em-composer-utils.c
+++ mail/em-composer-utils.c
@@ -54,6 +54,7 @@
 #include <camel/camel-stream-mem.h>
 #include <camel/camel-nntp-address.h>
 #include <camel/camel-vee-folder.h>
+#include <camel/camel-multipart.h>
 
 static EAccount * guess_account (CamelMimeMessage *message, CamelFolder *folder);
 
--- mail/mail-ops.c
+++ mail/mail-ops.c
@@ -50,6 +50,7 @@
 #include <camel/camel-vtrash-folder.h>
 #include <camel/camel-vee-store.h>
 #include <camel/camel-transport.h>
+#include <camel/camel-multipart.h>
 
 #include "mail-component.h"
 #include "mail-config.h"
--- plugins/itip-formatter/itip-formatter.c
+++ plugins/itip-formatter/itip-formatter.c
@@ -955,7 +955,7 @@
 					gint response;
 					
 					if (a->delfrom && *a->delfrom) {
-						if ((response == e_error_run (NULL, "org.gnome.itip-formatter:add-delegate", itip_strip_mailto (a->delfrom)), itip_strip_mailto (a->value)) == GTK_RESPONSE_YES) {
+						if ((response = e_error_run (NULL, "org.gnome.itip-formatter:add-delegate", itip_strip_mailto (a->delfrom)), itip_strip_mailto (a->value)) == GTK_RESPONSE_YES) {
 						icalproperty *prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
 						icalcomponent_add_property (icalcomp,icalproperty_new_clone (prop));
 						e_cal_component_rescan (comp);
--- plugins/save-calendar/ical-format.c
+++ plugins/save-calendar/ical-format.c
@@ -70,7 +70,7 @@
 		return;
 
 	/* open source client */
-	source_client = auth_new_cal_from_source (primary_source, type);
+	source_client = (ECal*)auth_new_cal_from_source (primary_source, type);
 	if (!e_cal_open (source_client, TRUE, &error)) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
 		g_object_unref (source_client);
--- widgets/menus/gal-view-new-dialog.c
+++ widgets/menus/gal-view-new-dialog.c
@@ -255,7 +255,7 @@
 	
 	switch (prop_id){
 	case PROP_NAME:
-		
+		entry = glade_xml_get_widget(dialog->gui, "entry-name");
 		if (entry && GTK_IS_ENTRY(entry)) {
 			gtk_entry_set_text(GTK_ENTRY(entry), g_value_get_string (value));
 		}