This commit is contained in:
parent
a05871ce4e
commit
a360643754
76
abuild.patch
76
abuild.patch
@ -1,76 +0,0 @@
|
|||||||
=== modified file 'addressbook/gui/merging/eab-contact-merging.c'
|
|
||||||
--- addressbook/gui/merging/eab-contact-merging.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ addressbook/gui/merging/eab-contact-merging.c 2007-12-18 20:44:13 +0000
|
|
||||||
@@ -343,6 +343,7 @@
|
|
||||||
value = 1;
|
|
||||||
break;
|
|
||||||
case GTK_RESPONSE_CANCEL:
|
|
||||||
+ default:
|
|
||||||
value = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
=== modified file 'calendar/conduits/calendar/calendar-conduit.c'
|
|
||||||
--- calendar/conduits/calendar/calendar-conduit.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/conduits/calendar/calendar-conduit.c 2007-12-18 20:44:13 +0000
|
|
||||||
@@ -840,6 +840,8 @@
|
|
||||||
static char record[0xffff];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ memset(&p, 0, sizeof (p));
|
|
||||||
+
|
|
||||||
g_assert (local->comp != NULL);
|
|
||||||
g_assert (local->appt != NULL );
|
|
||||||
|
|
||||||
|
|
||||||
=== modified file 'calendar/conduits/memo/memo-conduit.c'
|
|
||||||
--- calendar/conduits/memo/memo-conduit.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/conduits/memo/memo-conduit.c 2007-12-18 20:44:13 +0000
|
|
||||||
@@ -473,6 +473,8 @@
|
|
||||||
static char record[0xffff];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ memset(&p, 0, sizeof (p));
|
|
||||||
+
|
|
||||||
g_assert (local->comp != NULL);
|
|
||||||
g_assert (local->memo != NULL );
|
|
||||||
|
|
||||||
|
|
||||||
=== modified file 'calendar/conduits/todo/todo-conduit.c'
|
|
||||||
--- calendar/conduits/todo/todo-conduit.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/conduits/todo/todo-conduit.c 2007-12-18 20:44:13 +0000
|
|
||||||
@@ -621,6 +621,8 @@
|
|
||||||
|
|
||||||
memset (&p, 0, sizeof (GnomePilotRecord));
|
|
||||||
|
|
||||||
+ memset(&p, 0, sizeof (p));
|
|
||||||
+
|
|
||||||
p.ID = local->local.ID;
|
|
||||||
p.category = local->local.category;
|
|
||||||
p.attr = local->local.attr;
|
|
||||||
|
|
||||||
=== modified file 'plugins/exchange-operations/exchange-delegates-user.c'
|
|
||||||
--- plugins/exchange-operations/exchange-delegates-user.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ plugins/exchange-operations/exchange-delegates-user.c 2007-12-18 20:44:13 +0000
|
|
||||||
@@ -30,8 +30,11 @@
|
|
||||||
#include <mail/mail-component.h>
|
|
||||||
#include <mail/mail-send-recv.h>
|
|
||||||
#include <camel/camel-multipart.h>
|
|
||||||
+#include <camel/camel-mime-utils.h>
|
|
||||||
#include <camel/camel-stream-mem.h>
|
|
||||||
#include <exchange-account.h>
|
|
||||||
+#include "exchange-delegates.h"
|
|
||||||
+#include <exchange/exchange-account.h>
|
|
||||||
#include <e2k-global-catalog.h>
|
|
||||||
#include <e2k-marshal.h>
|
|
||||||
#include <e2k-sid.h>
|
|
||||||
@@ -51,6 +54,8 @@
|
|
||||||
#undef GTK_DISABLE_DEPRECATED
|
|
||||||
#include <gtk/gtkoptionmenu.h>
|
|
||||||
|
|
||||||
+#include <glib.h>
|
|
||||||
+
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
|||||||
=== modified file 'plugins/exchange-operations/exchange-folder-subscription.c'
|
|
||||||
--- plugins/exchange-operations/exchange-folder-subscription.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ plugins/exchange-operations/exchange-folder-subscription.c 2007-12-18 20:35:58 +0000
|
|
||||||
@@ -240,6 +240,7 @@
|
|
||||||
g_free (folder_name);
|
|
||||||
switch (result) {
|
|
||||||
case EXCHANGE_ACCOUNT_FOLDER_OK:
|
|
||||||
+ exchange_account_rescan_tree (subscription_info->account);
|
|
||||||
break;
|
|
||||||
case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
|
|
||||||
e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
|
|
||||||
@@ -296,6 +297,11 @@
|
|
||||||
GladeXML *glade_xml;
|
|
||||||
GtkWidget *dialog, *ok_button;
|
|
||||||
SubscriptionInfo *subscription_info;
|
|
||||||
+ int mode;
|
|
||||||
+
|
|
||||||
+ exchange_account_is_offline (account, &mode);
|
|
||||||
+ if (mode == OFFLINE_MODE)
|
|
||||||
+ return FALSE;
|
|
||||||
|
|
||||||
subscription_info = g_new0 (SubscriptionInfo, 1);
|
|
||||||
subscription_info->account = account;
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
|||||||
=== modified file 'shell/e-shell-nm.c'
|
|
||||||
--- shell/e-shell-nm.c 2007-12-18 20:28:43 +0000
|
|
||||||
+++ shell/e-shell-nm.c 2007-12-18 20:30:19 +0000
|
|
||||||
@@ -68,11 +68,17 @@
|
|
||||||
DBusError error;
|
|
||||||
const char *object;
|
|
||||||
ShellLineStatus status;
|
|
||||||
- EShellWindow *window = E_SHELL_WINDOW (user_data);
|
|
||||||
- EShell *shell = e_shell_window_peek_shell ((EShellWindow *) user_data);
|
|
||||||
+ EShellWindow *window = NULL;
|
|
||||||
+ EShell *shell = NULL;
|
|
||||||
GNOME_Evolution_ShellState shell_state;
|
|
||||||
EShellLineStatus line_status;
|
|
||||||
|
|
||||||
+ if (!user_data || !E_IS_SHELL_WINDOW (user_data))
|
|
||||||
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
|
||||||
+
|
|
||||||
+ window = E_SHELL_WINDOW (user_data);
|
|
||||||
+ shell = e_shell_window_peek_shell (window);
|
|
||||||
+
|
|
||||||
dbus_error_init (&error);
|
|
||||||
object = dbus_message_get_path (message);
|
|
||||||
|
|
||||||
|
|
@ -1,107 +0,0 @@
|
|||||||
=== modified file 'calendar/common/authentication.c'
|
|
||||||
--- calendar/common/authentication.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/common/authentication.c 2007-12-18 20:35:33 +0000
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
#include <libedataserver/e-source.h>
|
|
||||||
#include <libedataserverui/e-passwords.h>
|
|
||||||
#include "authentication.h"
|
|
||||||
+#include <libedataserver/e-url.h>
|
|
||||||
|
|
||||||
static GHashTable *source_lists_hash = NULL;
|
|
||||||
|
|
||||||
@@ -55,6 +56,44 @@
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static char *
|
|
||||||
+build_pass_key (ECal *ecal)
|
|
||||||
+{
|
|
||||||
+ char *euri_str;
|
|
||||||
+ const char *uri;
|
|
||||||
+ EUri *euri;
|
|
||||||
+
|
|
||||||
+ uri = e_cal_get_uri (ecal);
|
|
||||||
+
|
|
||||||
+ euri = e_uri_new (uri);
|
|
||||||
+ euri_str = e_uri_to_string (euri, FALSE);
|
|
||||||
+
|
|
||||||
+ e_uri_free (euri);
|
|
||||||
+ return euri_str;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+auth_cal_forget_password (ECal *ecal)
|
|
||||||
+{
|
|
||||||
+ ESource *source = NULL;
|
|
||||||
+ const char *auth_domain = NULL, *component_name = NULL, *auth_type = NULL;
|
|
||||||
+ char *key = NULL;
|
|
||||||
+
|
|
||||||
+ source = e_cal_get_source (ecal);
|
|
||||||
+ auth_domain = e_source_get_property (source, "auth-domain");
|
|
||||||
+ component_name = auth_domain ? auth_domain : "Calendar";
|
|
||||||
+
|
|
||||||
+ auth_type = e_source_get_property (source, "auth-type");
|
|
||||||
+ if (auth_type)
|
|
||||||
+ key = build_pass_key (ecal);
|
|
||||||
+ else
|
|
||||||
+ key = e_source_get_uri (source);
|
|
||||||
+
|
|
||||||
+ e_passwords_forget_password (component_name, key);
|
|
||||||
+
|
|
||||||
+ g_free (key);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
ECal *
|
|
||||||
auth_new_cal_from_default (ECalSourceType type)
|
|
||||||
{
|
|
||||||
|
|
||||||
=== modified file 'calendar/common/authentication.h'
|
|
||||||
--- calendar/common/authentication.h 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/common/authentication.h 2007-12-18 20:35:33 +0000
|
|
||||||
@@ -30,5 +30,6 @@
|
|
||||||
ECal *auth_new_cal_from_default (ECalSourceType type);
|
|
||||||
ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type);
|
|
||||||
ECal *auth_new_cal_from_uri (const char *uri, ECalSourceType type);
|
|
||||||
+void auth_cal_forget_password (ECal *ecal);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
=== modified file 'calendar/gui/e-tasks.c'
|
|
||||||
--- calendar/gui/e-tasks.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/gui/e-tasks.c 2007-12-18 20:35:33 +0000
|
|
||||||
@@ -962,6 +962,9 @@
|
|
||||||
priv = tasks->priv;
|
|
||||||
|
|
||||||
source = e_cal_get_source (ecal);
|
|
||||||
+
|
|
||||||
+ if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
|
|
||||||
+ auth_cal_forget_password (ecal);
|
|
||||||
|
|
||||||
switch (status) {
|
|
||||||
case E_CALENDAR_STATUS_OK :
|
|
||||||
@@ -1008,6 +1011,9 @@
|
|
||||||
|
|
||||||
source = e_cal_get_source (ecal);
|
|
||||||
|
|
||||||
+ if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
|
|
||||||
+ auth_cal_forget_password (ecal);
|
|
||||||
+
|
|
||||||
switch (status) {
|
|
||||||
case E_CALENDAR_STATUS_OK :
|
|
||||||
g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
|
|
||||||
|
|
||||||
=== modified file 'calendar/gui/gnome-cal.c'
|
|
||||||
--- calendar/gui/gnome-cal.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/gui/gnome-cal.c 2007-12-18 20:35:33 +0000
|
|
||||||
@@ -2642,6 +2642,10 @@
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED && source_type == E_CAL_SOURCE_TYPE_EVENT)
|
|
||||||
+ auth_cal_forget_password (ecal);
|
|
||||||
+
|
|
||||||
switch (status) {
|
|
||||||
case E_CALENDAR_STATUS_OK:
|
|
||||||
break;
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
|||||||
=== modified file 'mail/mail-component.c'
|
|
||||||
--- mail/mail-component.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ mail/mail-component.c 2007-12-18 20:42:30 +0000
|
|
||||||
@@ -826,11 +826,14 @@
|
|
||||||
mail_config_prune_proxies ();
|
|
||||||
switch (mc->priv->quit_state) {
|
|
||||||
case MC_QUIT_START: {
|
|
||||||
+ extern int camel_application_is_exiting;
|
|
||||||
int now = time(NULL)/60/60/24, days;
|
|
||||||
gboolean empty_junk;
|
|
||||||
|
|
||||||
GConfClient *gconf = mail_config_get_gconf_client();
|
|
||||||
|
|
||||||
+ camel_application_is_exiting = TRUE;
|
|
||||||
+
|
|
||||||
mail_vfolder_shutdown();
|
|
||||||
|
|
||||||
mc->priv->quit_expunge = gconf_client_get_bool(gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL)
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
=== modified file 'shell/e-shell-nm.c'
|
|
||||||
--- shell/e-shell-nm.c 2007-12-18 20:30:19 +0000
|
|
||||||
+++ shell/e-shell-nm.c 2007-12-18 20:42:48 +0000
|
|
||||||
@@ -83,7 +83,7 @@
|
|
||||||
object = dbus_message_get_path (message);
|
|
||||||
|
|
||||||
if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
|
|
||||||
- strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
|
|
||||||
+ object && !strcmp (object, DBUS_PATH_LOCAL)) {
|
|
||||||
dbus_connection_unref (dbus_connection);
|
|
||||||
dbus_connection = NULL;
|
|
||||||
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
|||||||
=== modified file 'calendar/gui/dialogs/recurrence-page.c'
|
|
||||||
--- calendar/gui/dialogs/recurrence-page.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ calendar/gui/dialogs/recurrence-page.c 2007-12-18 20:43:23 +0000
|
|
||||||
@@ -850,7 +850,7 @@
|
|
||||||
/* If our component has not been set yet through ::fill_widgets(), we
|
|
||||||
* cannot preview the recurrence.
|
|
||||||
*/
|
|
||||||
- if (!priv->comp || e_cal_component_is_instance (priv->comp))
|
|
||||||
+ if (!priv || !priv->comp || e_cal_component_is_instance (priv->comp))
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* Create a scratch component with the start/end and
|
|
||||||
|
|
||||||
=== modified file 'widgets/misc/e-calendar-item.c'
|
|
||||||
--- widgets/misc/e-calendar-item.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ widgets/misc/e-calendar-item.c 2007-12-18 20:43:23 +0000
|
|
||||||
@@ -430,9 +430,9 @@
|
|
||||||
calitem->styles = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (calitem->signal_emission_idle_id != 0) {
|
|
||||||
+ if (calitem->signal_emission_idle_id > 0) {
|
|
||||||
g_source_remove (calitem->signal_emission_idle_id);
|
|
||||||
- calitem->signal_emission_idle_id = 0;
|
|
||||||
+ calitem->signal_emission_idle_id = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (calitem->font_desc) {
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
--- configure.in 2006-10-28 12:30:24.000000000 +0200
|
|
||||||
+++ configure.in.harish 2006-10-28 13:30:12.000000000 +0200
|
|
||||||
@@ -1467,11 +1467,11 @@ plugins_base_always="calendar-file calen
|
|
||||||
plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN"
|
|
||||||
all_plugins_base="$plugins_base_always sa-junk-plugin exchange-operations mono"
|
|
||||||
|
|
||||||
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments"
|
|
||||||
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain"
|
|
||||||
plugins_standard="$plugins_standard_always"
|
|
||||||
all_plugins_standard="$plugins_standard"
|
|
||||||
|
|
||||||
-plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments"
|
|
||||||
+plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote save-attachments"
|
|
||||||
plugins_experimental="$plugins_experimental_always $IPOD_SYNC"
|
|
||||||
all_plugins_experimental="$plugins_experimental_always ipod-sync"
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
Index: plugins/exchange-operations/exchange-folder-subscription.c
|
|
||||||
===================================================================
|
|
||||||
--- plugins/exchange-operations/exchange-folder-subscription.c (revision 34144)
|
|
||||||
+++ plugins/exchange-operations/exchange-folder-subscription.c (working copy)
|
|
||||||
@@ -281,7 +281,7 @@
|
|
||||||
|
|
||||||
g_object_unref (folder);
|
|
||||||
path = g_strdup_printf ("/%s", user_email_address);
|
|
||||||
- exchange_account_open_folder (subscription_info->account, g_strdup_printf ("/%s", path));
|
|
||||||
+ exchange_account_open_folder (subscription_info->account, path);
|
|
||||||
g_free (path);
|
|
||||||
g_free (user_email_address);
|
|
||||||
gtk_widget_destroy (dialog);
|
|
@ -1,29 +0,0 @@
|
|||||||
=== modified file 'plugins/exchange-operations/exchange-account-setup.c'
|
|
||||||
--- plugins/exchange-operations/exchange-account-setup.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ plugins/exchange-operations/exchange-account-setup.c 2007-12-18 20:41:16 +0000
|
|
||||||
@@ -939,6 +939,7 @@
|
|
||||||
GtkVBox *vbx;
|
|
||||||
GtkHBox *hbx_size;
|
|
||||||
char *folder_name, *folder_size;
|
|
||||||
+ int mode;
|
|
||||||
|
|
||||||
service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder));
|
|
||||||
if (!service)
|
|
||||||
@@ -951,10 +952,15 @@
|
|
||||||
if (g_ascii_strcasecmp (provider->protocol, "exchange"))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
+ account = exchange_operations_get_exchange_account ();
|
|
||||||
+ exchange_account_is_offline (account, &mode);
|
|
||||||
+ if (mode == OFFLINE_MODE)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
folder_name = (char*) camel_folder_get_name (cml_folder);
|
|
||||||
if (!folder_name)
|
|
||||||
folder_name = g_strdup ("name");
|
|
||||||
- account = exchange_operations_get_exchange_account ();
|
|
||||||
+
|
|
||||||
model = exchange_account_folder_size_get_model (account);
|
|
||||||
if (model)
|
|
||||||
folder_size = g_strdup_printf (_("%s KB"), exchange_folder_size_get_val (model, folder_name));
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:76cc8ec400ddbf2b94ebbc05c73618a23f65a3ea0efa4256d4a3126f0195da02
|
|
||||||
size 26800605
|
|
3
evolution-2.21.92.tar.bz2
Normal file
3
evolution-2.21.92.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4594cfe870e94b73f61b8bfb2b9d5604ea7a760ee7bb9c99fe26be760ca32350
|
||||||
|
size 26892799
|
@ -1,7 +1,9 @@
|
|||||||
=== modified file 'calendar/gui/calendar-component.c'
|
=== modified file 'calendar/gui/calendar-component.c'
|
||||||
--- calendar/gui/calendar-component.c 2007-12-18 20:23:31 +0000
|
Index: calendar/gui/calendar-component.c
|
||||||
+++ calendar/gui/calendar-component.c 2007-12-18 20:27:05 +0000
|
===================================================================
|
||||||
@@ -1284,7 +1284,7 @@
|
--- calendar/gui/calendar-component.c.orig
|
||||||
|
+++ calendar/gui/calendar-component.c
|
||||||
|
@@ -1284,7 +1284,7 @@ create_new_event (CalendarComponent *cal
|
||||||
} else {
|
} else {
|
||||||
ECalComponent *comp;
|
ECalComponent *comp;
|
||||||
EventEditor *editor;
|
EventEditor *editor;
|
||||||
@ -10,10 +12,10 @@
|
|||||||
|
|
||||||
flags = COMP_EDITOR_USER_ORG | COMP_EDITOR_NEW_ITEM;
|
flags = COMP_EDITOR_USER_ORG | COMP_EDITOR_NEW_ITEM;
|
||||||
if (is_meeting)
|
if (is_meeting)
|
||||||
|
Index: mail/em-composer-prefs.c
|
||||||
=== modified file 'mail/em-composer-prefs.c'
|
===================================================================
|
||||||
--- mail/em-composer-prefs.c 2007-12-18 20:23:31 +0000
|
--- mail/em-composer-prefs.c.orig
|
||||||
+++ mail/em-composer-prefs.c 2007-12-18 20:27:05 +0000
|
+++ mail/em-composer-prefs.c
|
||||||
@@ -56,6 +56,7 @@
|
@@ -56,6 +56,7 @@
|
||||||
#include <gtk/gtkcellrenderertext.h>
|
#include <gtk/gtkcellrenderertext.h>
|
||||||
#include <gtk/gtkimage.h>
|
#include <gtk/gtkimage.h>
|
||||||
@ -22,10 +24,10 @@
|
|||||||
#include <gtk/gtkcolorbutton.h>
|
#include <gtk/gtkcolorbutton.h>
|
||||||
#include <gtk/gtkfilechooserbutton.h>
|
#include <gtk/gtkfilechooserbutton.h>
|
||||||
|
|
||||||
|
Index: mail/em-composer-utils.c
|
||||||
=== modified file 'mail/em-composer-utils.c'
|
===================================================================
|
||||||
--- mail/em-composer-utils.c 2007-12-18 20:23:31 +0000
|
--- mail/em-composer-utils.c.orig
|
||||||
+++ mail/em-composer-utils.c 2007-12-18 20:27:05 +0000
|
+++ mail/em-composer-utils.c
|
||||||
@@ -55,6 +55,7 @@
|
@@ -55,6 +55,7 @@
|
||||||
#include <camel/camel-stream-mem.h>
|
#include <camel/camel-stream-mem.h>
|
||||||
#include <camel/camel-nntp-address.h>
|
#include <camel/camel-nntp-address.h>
|
||||||
@ -34,17 +36,3 @@
|
|||||||
|
|
||||||
#ifdef G_OS_WIN32
|
#ifdef G_OS_WIN32
|
||||||
/* Undef the similar macro from pthread.h, it doesn't check if
|
/* Undef the similar macro from pthread.h, it doesn't check if
|
||||||
|
|
||||||
=== modified file 'plugins/save-calendar/ical-format.c'
|
|
||||||
--- plugins/save-calendar/ical-format.c 2007-12-18 20:23:31 +0000
|
|
||||||
+++ plugins/save-calendar/ical-format.c 2007-12-18 20:27:05 +0000
|
|
||||||
@@ -105,7 +105,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);
|
|
||||||
|
|
||||||
|
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 4 21:42:07 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.21.92:
|
||||||
|
+ Bugs fixed: bnc#153807, bnc#159736, bgo#167638, bnc#173186,
|
||||||
|
bnc#178778, bgo#209353, bgo#209353, bnc#294999, bgo#339266,
|
||||||
|
bnc#358697, bgo#383438, bgo#440426, bgo#469292, bgo#471779,
|
||||||
|
bgo#512776, bgo#516408, bgo#514836, bgo#514987, bgo#515659,
|
||||||
|
bgo#515744, bgo#516234, bgo#516279, bgo#516349, bgo#516453,
|
||||||
|
bgo#516648, bgo#516648, bgo#517072, bgo#517082, bgo#517129,
|
||||||
|
and bgo#517458
|
||||||
|
+ Updated translations
|
||||||
|
- Drop bnc-156353-evo-crash-adding-apt.patch,
|
||||||
|
bnc-160049-change-gw-passwd-no-auth-prompt.patch,
|
||||||
|
bgo-325960-evo-foldersubscription.diff,
|
||||||
|
bnc-339266-evo-folder-size-offline.diff, bnc-173186.patch,
|
||||||
|
bnc-178778-evo-open-appt-crash.diff, abuild.patch,
|
||||||
|
bnc-294999-subs-other-user-folder.patch, and
|
||||||
|
bnc-214647-add-prefer-plain-plugin.patch, all of which have been
|
||||||
|
upstreamed.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 19 20:45:47 CET 2008 - maw@suse.de
|
Tue Feb 19 20:45:47 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package evolution (Version 2.21.91)
|
# spec file for package evolution (Version 2.21.92)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -21,7 +21,7 @@ AutoReqProv: on
|
|||||||
# This should be updated upon major version changes, and used in place of
|
# This should be updated upon major version changes, and used in place of
|
||||||
# BASE_VERSION (as defined in configure.in).
|
# BASE_VERSION (as defined in configure.in).
|
||||||
%define evolution_base_version 2.22
|
%define evolution_base_version 2.22
|
||||||
Version: 2.21.91
|
Version: 2.21.92
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
||||||
#Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2
|
#Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2
|
||||||
@ -48,36 +48,16 @@ Patch20: evolution-desktop.patch
|
|||||||
# PATCH-FIX-UPSTREAM evolution-morewarnings.patch - Fixed in upstrream for 2.21.91
|
# PATCH-FIX-UPSTREAM evolution-morewarnings.patch - Fixed in upstrream for 2.21.91
|
||||||
Patch24: evolution-morewarnings.patch
|
Patch24: evolution-morewarnings.patch
|
||||||
Patch25: remove-nm-dep.patch
|
Patch25: remove-nm-dep.patch
|
||||||
# PATCH-FIX-UPSTREAM bnc-156353-evo-crash-adding-apt.patch - Committed for 2.21.91
|
|
||||||
Patch30: bnc-156353-evo-crash-adding-apt.patch
|
|
||||||
Patch31: calendar-sendbutton.patch
|
Patch31: calendar-sendbutton.patch
|
||||||
# PATCH-FIX-UPSTREAM bnc-153807-msg-composer-dont-raise.patch - Committed for 2.21.91
|
# PATCH-FIX-UPSTREAM bnc-153807-msg-composer-dont-raise.patch - Committed for 2.21.91
|
||||||
Patch45: bnc-153807-msg-composer-dont-raise.patch
|
Patch45: bnc-153807-msg-composer-dont-raise.patch
|
||||||
# PATCH-FIX-UPSTREAM bnc-160049-change-gw-passwd-no-auth-prompt.patch - Committed for 2.21.91
|
|
||||||
Patch48: bnc-160049-change-gw-passwd-no-auth-prompt.patch
|
|
||||||
# PATCH-FIX-UPSTREAM bgo-325960-evo-foldersubscription.diff -- Committed for 2.21.91
|
|
||||||
Patch62: bgo-325960-evo-foldersubscription.diff
|
|
||||||
Patch65: fix-exchange-menuitem.diff
|
Patch65: fix-exchange-menuitem.diff
|
||||||
Patch66: fix-sendrecv.diff
|
Patch66: fix-sendrecv.diff
|
||||||
# PATCH-FIX-UPSTREAM bnc-339266-evo-folder-size-offline.diff - Committed for 2.21.91
|
|
||||||
Patch69: bnc-339266-evo-folder-size-offline.diff
|
|
||||||
# PATCH-FIX-UPSTREAM bnc-167638.patch - committed for 2.21.91
|
|
||||||
Patch71: bnc-167638.patch
|
|
||||||
# PATCH-FIX-UPSTREAM bnc-173186.patch - committed for 2.21.91
|
|
||||||
Patch78: bnc-173186.patch
|
|
||||||
# PATCH-FIX-UPSTREAM bnc-178778-evo-open-appt-crash.diff - committed for 2.21.91
|
|
||||||
Patch88: bnc-178778-evo-open-appt-crash.diff
|
|
||||||
# PATCH-FIX-UPSTREAM bnc-214647-add-prefer-plain-plugin.patch - Fix already in upstream.
|
|
||||||
Patch89: bnc-214647-add-prefer-plain-plugin.patch
|
|
||||||
# PATCH-FIX-UPSTREAM fix-security-gtkhtml-moreui.diff - Fix already in upstream
|
# PATCH-FIX-UPSTREAM fix-security-gtkhtml-moreui.diff - Fix already in upstream
|
||||||
Patch90: fix-security-gtkhtml-moreui.diff
|
Patch90: fix-security-gtkhtml-moreui.diff
|
||||||
### Patch91: evo-2.8.2-build-break.fix
|
### Patch91: evo-2.8.2-build-break.fix
|
||||||
# PATCH-FIX-UPSTREAM evo-2.8.2-regression-fix.patch -- Fix in 2.21.91
|
# PATCH-FIX-UPSTREAM evo-2.8.2-regression-fix.patch -- Fix in 2.21.91
|
||||||
Patch92: evo-2.8.2-regression-fix.patch
|
Patch92: evo-2.8.2-regression-fix.patch
|
||||||
# PATCH-FIX-UPSTREAM abuild.patch - Fixed for 2.21.91
|
|
||||||
Patch100: abuild.patch
|
|
||||||
# PATCH-FIX-UPSTREAM bnc-294999-subs-other-user-folder.patch - Fixed for 2.21.91
|
|
||||||
Patch104: bnc-294999-subs-other-user-folder.patch
|
|
||||||
# #PATCH-FIX-UPSTREAM build-fixes.diff - Fixed for 2.21.91
|
# #PATCH-FIX-UPSTREAM build-fixes.diff - Fixed for 2.21.91
|
||||||
Patch999: build-fixes.diff
|
Patch999: build-fixes.diff
|
||||||
Url: http://gnome.org/projects/evolution/
|
Url: http://gnome.org/projects/evolution/
|
||||||
@ -307,21 +287,10 @@ Authors:
|
|||||||
%patch20
|
%patch20
|
||||||
%patch24
|
%patch24
|
||||||
%patch25
|
%patch25
|
||||||
%patch30
|
|
||||||
%patch31
|
%patch31
|
||||||
%patch45
|
%patch45
|
||||||
%patch48
|
|
||||||
%patch62
|
|
||||||
%patch65
|
%patch65
|
||||||
%patch66
|
%patch66
|
||||||
%patch69
|
|
||||||
%patch71
|
|
||||||
%patch78
|
|
||||||
%patch88
|
|
||||||
# %patch89
|
|
||||||
# FIXME: 90 breaks the build. need to re-do.
|
|
||||||
%patch100
|
|
||||||
%patch104
|
|
||||||
%patch999
|
%patch999
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -434,6 +403,24 @@ fi
|
|||||||
%{_libdir}/evolution/*/conduits/*.so
|
%{_libdir}/evolution/*/conduits/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 04 2008 maw@suse.de
|
||||||
|
- Update to version 2.21.92:
|
||||||
|
+ Bugs fixed: bnc#153807, bnc#159736, bgo#167638, bnc#173186,
|
||||||
|
bnc#178778, bgo#209353, bgo#209353, bnc#294999, bgo#339266,
|
||||||
|
bnc#358697, bgo#383438, bgo#440426, bgo#469292, bgo#471779,
|
||||||
|
bgo#512776, bgo#516408, bgo#514836, bgo#514987, bgo#515659,
|
||||||
|
bgo#515744, bgo#516234, bgo#516279, bgo#516349, bgo#516453,
|
||||||
|
bgo#516648, bgo#516648, bgo#517072, bgo#517082, bgo#517129,
|
||||||
|
and bgo#517458
|
||||||
|
+ Updated translations
|
||||||
|
- Drop bnc-156353-evo-crash-adding-apt.patch,
|
||||||
|
bnc-160049-change-gw-passwd-no-auth-prompt.patch,
|
||||||
|
bgo-325960-evo-foldersubscription.diff,
|
||||||
|
bnc-339266-evo-folder-size-offline.diff, bnc-173186.patch,
|
||||||
|
bnc-178778-evo-open-appt-crash.diff, abuild.patch,
|
||||||
|
bnc-294999-subs-other-user-folder.patch, and
|
||||||
|
bnc-214647-add-prefer-plain-plugin.patch, all of which have been
|
||||||
|
upstreamed.
|
||||||
* Tue Feb 19 2008 maw@suse.de
|
* Tue Feb 19 2008 maw@suse.de
|
||||||
- Update to version 2.21.91:
|
- Update to version 2.21.91:
|
||||||
+ Documentation updates
|
+ Documentation updates
|
||||||
|
Loading…
Reference in New Issue
Block a user