forked from pool/evolution
This commit is contained in:
OBS User unknown
Git OBS Bridge
commit
2603359974
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
||||||
27
bgo-325960-evo-foldersubscription.diff
Normal file
27
bgo-325960-evo-foldersubscription.diff
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
Index: plugins/exchange-operations/exchange-folder-subscription.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-subscription.c,v
|
||||||
|
retrieving revision 1.8
|
||||||
|
diff -u -p -r1.8 exchange-folder-subscription.c
|
||||||
|
--- plugins/exchange-operations/exchange-folder-subscription.c 3 Feb 2006 10:27:26 -0000 1.8
|
||||||
|
+++ plugins/exchange-operations/exchange-folder-subscription.c 21 Apr 2006 04:09:05 -0000
|
||||||
|
@@ -215,6 +215,7 @@ subscribe_to_folder (GtkWidget *dialog,
|
||||||
|
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);
|
||||||
|
@@ -265,6 +266,11 @@ create_folder_subscription_dialog (Excha
|
||||||
|
GladeXML *glade_xml;
|
||||||
|
GtkWidget *dialog;
|
||||||
|
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;
|
||||||
10
bnc-153807-msg-composer-dont-raise.patch
Normal file
10
bnc-153807-msg-composer-dont-raise.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- mail/em-composer-utils.c.orig 2006-03-24 00:16:39.179722801 +0100
|
||||||
|
+++ mail/em-composer-utils.c 2006-03-24 00:21:34.066550119 +0100
|
||||||
|
@@ -710,6 +710,7 @@ em_utils_post_to_folder (CamelFolder *fo
|
||||||
|
e_msg_composer_drop_editor_undo (composer);
|
||||||
|
|
||||||
|
gtk_widget_show ((GtkWidget *) composer);
|
||||||
|
+ gdk_window_raise (((GtkWidget *) composer)->window);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
23
bnc-156353-evo-crash-adding-apt.patch
Normal file
23
bnc-156353-evo-crash-adding-apt.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
--- shell/e-shell-nm.c.orig 2006-03-13 01:06:30.533701917 +0100
|
||||||
|
+++ shell/e-shell-nm.c 2006-03-13 01:09:37.587986006 +0100
|
||||||
|
@@ -54,11 +54,17 @@ static DBusHandlerResult e_shell_network
|
||||||
|
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);
|
||||||
|
|
||||||
129
bnc-160049-change-gw-passwd-no-auth-prompt.patch
Normal file
129
bnc-160049-change-gw-passwd-no-auth-prompt.patch
Normal file
@ -0,0 +1,129 @@
|
|||||||
|
Index: calendar/common/authentication.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/common/authentication.c,v
|
||||||
|
retrieving revision 1.10
|
||||||
|
diff -u -p -r1.10 authentication.c
|
||||||
|
--- calendar/common/authentication.c 23 Feb 2005 18:56:56 -0000 1.10
|
||||||
|
+++ calendar/common/authentication.c 24 Mar 2006 15:33:25 -0000
|
||||||
|
@@ -29,6 +29,7 @@
|
||||||
|
#include <bonobo/bonobo-i18n.h>
|
||||||
|
#include <libedataserverui/e-passwords.h>
|
||||||
|
#include "authentication.h"
|
||||||
|
+#include <libedataserver/e-url.h>
|
||||||
|
|
||||||
|
static GHashTable *source_lists_hash = NULL;
|
||||||
|
|
||||||
|
@@ -52,6 +53,44 @@ auth_func_cb (ECal *ecal, const char *pr
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
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 *
|
||||||
|
Index: calendar/common/authentication.h
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/common/authentication.h,v
|
||||||
|
retrieving revision 1.2
|
||||||
|
diff -u -p -r1.2 authentication.h
|
||||||
|
--- calendar/common/authentication.h 4 Feb 2004 21:31:57 -0000 1.2
|
||||||
|
+++ calendar/common/authentication.h 24 Mar 2006 15:33:25 -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
|
||||||
|
Index: calendar/gui/gnome-cal.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
|
||||||
|
retrieving revision 1.398
|
||||||
|
diff -u -p -r1.398 gnome-cal.c
|
||||||
|
--- calendar/gui/gnome-cal.c 6 Mar 2006 07:20:00 -0000 1.398
|
||||||
|
+++ calendar/gui/gnome-cal.c 24 Mar 2006 15:33:26 -0000
|
||||||
|
@@ -2366,6 +2366,10 @@ client_cal_opened_cb (ECal *ecal, ECalen
|
||||||
|
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;
|
||||||
|
@@ -2459,6 +2463,9 @@ default_client_cal_opened_cb (ECal *ecal
|
||||||
|
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;
|
||||||
|
Index: calendar/gui/e-tasks.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
|
||||||
|
retrieving revision 1.130
|
||||||
|
diff -u -p -r1.130 e-tasks.c
|
||||||
|
--- calendar/gui/e-tasks.c 3 Mar 2006 13:24:39 -0000 1.130
|
||||||
|
+++ calendar/gui/e-tasks.c 24 Mar 2006 15:33:26 -0000
|
||||||
|
@@ -876,6 +876,9 @@ client_cal_opened_cb (ECal *ecal, ECalen
|
||||||
|
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 :
|
||||||
|
@@ -921,6 +924,9 @@ default_client_cal_opened_cb (ECal *ecal
|
||||||
|
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 :
|
||||||
21
bnc-167638.patch
Normal file
21
bnc-167638.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
Index: mail/mail-component.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
|
||||||
|
retrieving revision 1.132
|
||||||
|
diff -u -r1.132 mail/mail-component.c
|
||||||
|
--- mail/mail-component.c 8 Feb 2006 11:51:32 -0000 1.132
|
||||||
|
+++ mail/mail-component.c 20 Apr 2006 21:13:55 -0000
|
||||||
|
@@ -731,9 +731,12 @@
|
||||||
|
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;
|
||||||
|
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)
|
||||||
16
bnc-173186.patch
Normal file
16
bnc-173186.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
Index: shell/e-shell-nm.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/shell/e-shell-nm.c,v
|
||||||
|
retrieving revision 1.1.2.2
|
||||||
|
diff -u -r1.1.2.2 e-shell-nm.c
|
||||||
|
--- shell/e-shell-nm.c 19 Apr 2006 21:14:44 -0000 1.1.2.2
|
||||||
|
+++ shell/e-shell-nm.c 17 May 2006 18:55:43 -0000
|
||||||
|
@@ -73,7 +73,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;
|
||||||
|
|
||||||
26
bnc-178778-evo-open-appt-crash.diff
Normal file
26
bnc-178778-evo-open-appt-crash.diff
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
--- widgets/misc/e-calendar-item.c
|
||||||
|
+++ widgets/misc/e-calendar-item.c
|
||||||
|
@@ -434,10 +434,10 @@
|
||||||
|
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) {
|
||||||
|
|
||||||
|
--- calendar/gui/dialogs/recurrence-page.c
|
||||||
|
+++ calendar/gui/dialogs/recurrence-page.c
|
||||||
|
@@ -846,7 +849,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
|
||||||
16
bnc-214647-add-prefer-plain-plugin.patch
Normal file
16
bnc-214647-add-prefer-plain-plugin.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
--- 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"
|
||||||
|
|
||||||
33
bnc-339266-evo-folder-size-offline.diff
Normal file
33
bnc-339266-evo-folder-size-offline.diff
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
Index: plugins/exchange-operations/exchange-account-setup.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
|
||||||
|
retrieving revision 1.32
|
||||||
|
diff -u -p -r1.32 exchange-account-setup.c
|
||||||
|
--- plugins/exchange-operations/exchange-account-setup.c 22 Apr 2006 07:49:03 -0000 1.32
|
||||||
|
+++ plugins/exchange-operations/exchange-account-setup.c 22 Apr 2006 07:50:25 -0000
|
||||||
|
@@ -927,6 +927,7 @@ org_gnome_exchange_show_folder_size_fact
|
||||||
|
GtkVBox *vbx;
|
||||||
|
GtkHBox *hbx_size;
|
||||||
|
char *folder_name, *folder_size;
|
||||||
|
+ int mode;
|
||||||
|
|
||||||
|
service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder));
|
||||||
|
if (!service)
|
||||||
|
@@ -938,11 +939,16 @@ org_gnome_exchange_show_folder_size_fact
|
||||||
|
|
||||||
|
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));
|
||||||
16
bnc146823-grammer-fix.patch
Normal file
16
bnc146823-grammer-fix.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
Index: mail/mail-config.glade
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
|
||||||
|
retrieving revision 1.169
|
||||||
|
diff -u -p -r1.169 mail-config.glade
|
||||||
|
--- mail/mail-config.glade 11 Feb 2006 22:30:36 -0000 1.169
|
||||||
|
+++ mail/mail-config.glade 24 Feb 2006 08:33:44 -0000
|
||||||
|
@@ -6707,7 +6707,7 @@ For example: "Work" or "P
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label574">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="yes"><small>This will make the the filter more reliable, but slower</small></property>
|
||||||
|
+ <property name="label" translatable="yes"><small>This will make the filter more reliable, but slower</small></property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">True</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
55
build-fixes.diff
Normal file
55
build-fixes.diff
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
--- addressbook/gui/widgets/e-minicard.c
|
||||||
|
+++ addressbook/gui/widgets/e-minicard.c
|
||||||
|
@@ -30,6 +30,7 @@
|
||||||
|
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
|
||||||
|
#include <text/e-text.h>
|
||||||
|
#include <e-util/e-util.h>
|
||||||
|
+#include <e-util/e-html-utils.h>
|
||||||
|
#include <misc/e-canvas-utils.h>
|
||||||
|
#include <misc/e-canvas.h>
|
||||||
|
#include <libebook/e-book.h>
|
||||||
|
--- calendar/gui/calendar-component.c
|
||||||
|
+++ calendar/gui/calendar-component.c
|
||||||
|
@@ -1302,6 +1302,8 @@
|
||||||
|
calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
|
||||||
|
}
|
||||||
|
|
||||||
|
+extern GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
|
||||||
|
+
|
||||||
|
static CalendarComponentView *
|
||||||
|
create_component_view (CalendarComponent *calendar_component)
|
||||||
|
{
|
||||||
|
--- calendar/gui/e-week-view-event-item.c
|
||||||
|
+++ calendar/gui/e-week-view-event-item.c
|
||||||
|
@@ -1097,6 +1097,9 @@
|
||||||
|
cairo_save (cr);
|
||||||
|
gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
|
||||||
|
cairo_set_line_width (cr, 0.7);
|
||||||
|
+ /* XXX: rect_x2 needs to be initialized, this code is stolen and might
|
||||||
|
+ not work at all. */
|
||||||
|
+ rect_x2 = rect_x + rect_w - 1;
|
||||||
|
cairo_move_to (cr, rect_x2, y2);
|
||||||
|
cairo_line_to (cr, rect_x2, y2);
|
||||||
|
cairo_stroke (cr);
|
||||||
|
--- mail/mail-send-recv.c
|
||||||
|
+++ mail/mail-send-recv.c
|
||||||
|
@@ -325,6 +325,8 @@
|
||||||
|
if (h > 400)
|
||||||
|
h = 400;
|
||||||
|
gtk_widget_set_usize (window, w, h);
|
||||||
|
+
|
||||||
|
+ return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct _send_data *
|
||||||
|
--- plugins/publish-calendar/url-editor-dialog.c
|
||||||
|
+++ plugins/publish-calendar/url-editor-dialog.c
|
||||||
|
@@ -285,7 +285,7 @@
|
||||||
|
gtk_entry_set_text (GTK_ENTRY (dialog->server_entry), euri->host);
|
||||||
|
|
||||||
|
if (euri->port)
|
||||||
|
- gtk_entry_set_text (GTK_ENTRY (dialog->port_entry), euri->port);
|
||||||
|
+ gtk_entry_set_text (GTK_ENTRY (dialog->port_entry), (void *)euri->port);
|
||||||
|
|
||||||
|
if (euri->path)
|
||||||
|
gtk_entry_set_text (GTK_ENTRY (dialog->file_entry), euri->path);
|
||||||
152
calendar-sendbutton.patch
Normal file
152
calendar-sendbutton.patch
Normal file
@ -0,0 +1,152 @@
|
|||||||
|
Index: ui/evolution-editor.xml
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/ui/evolution-editor.xml,v
|
||||||
|
retrieving revision 1.5
|
||||||
|
diff -u -p -r1.5 evolution-editor.xml
|
||||||
|
--- ui/evolution-editor.xml 14 Jan 2006 10:30:20 -0000 1.5
|
||||||
|
+++ ui/evolution-editor.xml 9 Mar 2006 11:28:18 -0000
|
||||||
|
@@ -1,6 +1,8 @@
|
||||||
|
<Root>
|
||||||
|
<commands>
|
||||||
|
<cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="stock" pixname="gtk-save"/>
|
||||||
|
+ <cmd name="FileSend" _tip="Click here to send" accel="*Control*s" pixtype="pixbuf" />
|
||||||
|
+
|
||||||
|
<cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="stock" pixname="gtk-close"/>
|
||||||
|
|
||||||
|
<cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
|
||||||
|
@@ -18,6 +20,8 @@
|
||||||
|
<submenu name="File" _label="_File">
|
||||||
|
<placeholder name="FileOps">
|
||||||
|
<menuitem name="FileSave" verb="" _label="_Save"/>
|
||||||
|
+ <menuitem name="FileSend" verb="" _label="_Send"/>
|
||||||
|
+
|
||||||
|
</placeholder>
|
||||||
|
<placeholder name="FileWindow">
|
||||||
|
<menuitem name="FileClose" verb="" _label="_Close"/>
|
||||||
|
@@ -53,7 +57,9 @@
|
||||||
|
|
||||||
|
<dockitem name="Toolbar">
|
||||||
|
|
||||||
|
- <toolitem name="FileSave" verb="" _label="Save"/>
|
||||||
|
+ <toolitem name="FileSave" verb="" _label="Save"/>
|
||||||
|
+ <toolitem name="FileSend" verb="" _label="Send" pixtype="pixbuf"/>
|
||||||
|
+
|
||||||
|
<toolitem name="FileClose" verb="" _label="Close"/>
|
||||||
|
<separator f="" name="editor1"/>
|
||||||
|
|
||||||
|
Index: calendar/gui/dialogs/comp-editor.h
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.h,v
|
||||||
|
retrieving revision 1.32
|
||||||
|
diff -u -p -r1.32 comp-editor.h
|
||||||
|
--- calendar/gui/dialogs/comp-editor.h 13 Jan 2006 09:29:17 -0000 1.32
|
||||||
|
+++ calendar/gui/dialogs/comp-editor.h 9 Mar 2006 10:52:45 -0000
|
||||||
|
@@ -53,9 +53,9 @@ typedef struct {
|
||||||
|
BonoboWindowClass parent_class;
|
||||||
|
|
||||||
|
/* Virtual functions */
|
||||||
|
+ void (* object_created) (CompEditor *page);
|
||||||
|
void (* set_e_cal) (CompEditor *page, ECal *client);
|
||||||
|
void (* edit_comp) (CompEditor *page, ECalComponent *comp);
|
||||||
|
- void (* object_created) (CompEditor *page);
|
||||||
|
gboolean (* send_comp) (CompEditor *page, ECalComponentItipMethod method);
|
||||||
|
} CompEditorClass;
|
||||||
|
|
||||||
|
Index: calendar/gui/dialogs/event-editor.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-editor.c,v
|
||||||
|
retrieving revision 1.78
|
||||||
|
diff -u -p -r1.78 event-editor.c
|
||||||
|
--- calendar/gui/dialogs/event-editor.c 8 Feb 2006 13:06:24 -0000 1.78
|
||||||
|
+++ calendar/gui/dialogs/event-editor.c 9 Mar 2006 10:52:46 -0000
|
||||||
|
@@ -566,7 +566,8 @@ event_editor_construct (EventEditor *ee,
|
||||||
|
|
||||||
|
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
|
||||||
|
event_page_show_options (priv->event_page);
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ comp_editor_set_needs_send (COMP_EDITOR (ee), TRUE);
|
||||||
|
comp_editor_set_group_item (COMP_EDITOR (ee), TRUE);
|
||||||
|
if ((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM)) {
|
||||||
|
priv->sched_window = gtk_dialog_new_with_buttons (_("Free/Busy"),
|
||||||
|
Index: calendar/gui/dialogs/task-editor.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-editor.c,v
|
||||||
|
retrieving revision 1.94
|
||||||
|
diff -u -p -r1.94 task-editor.c
|
||||||
|
--- calendar/gui/dialogs/task-editor.c 9 Feb 2006 04:02:49 -0000 1.94
|
||||||
|
+++ calendar/gui/dialogs/task-editor.c 9 Mar 2006 10:52:46 -0000
|
||||||
|
@@ -447,6 +447,9 @@ task_editor_construct (TaskEditor *te, E
|
||||||
|
read_only = TRUE;
|
||||||
|
|
||||||
|
if (priv->is_assigned) {
|
||||||
|
+
|
||||||
|
+ comp_editor_set_needs_send (COMP_EDITOR (te), TRUE);
|
||||||
|
+
|
||||||
|
if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
|
||||||
|
task_page_show_options (priv->task_page);
|
||||||
|
|
||||||
|
--- calendar/gui/dialogs/comp-editor.c.orig 2006-09-04 17:59:13.174145096 +0200
|
||||||
|
+++ calendar/gui/dialogs/comp-editor.c 2006-09-04 18:02:10.589153326 +0200
|
||||||
|
@@ -860,8 +860,8 @@ save_comp_with_send (CompEditor *editor)
|
||||||
|
if (!save_comp (editor))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
- if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org))) {
|
||||||
|
- if (itip_organizer_is_user (priv->comp, priv->client)) {
|
||||||
|
+ if ((delegate && !e_cal_get_save_schedules (priv->client)) || send) {
|
||||||
|
+ if (itip_organizer_is_user (priv->comp, priv->client)) {
|
||||||
|
if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
|
||||||
|
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH);
|
||||||
|
else
|
||||||
|
@@ -1398,6 +1398,7 @@ menu_help_cb (BonoboUIComponent *uic,
|
||||||
|
static BonoboUIVerb verbs [] = {
|
||||||
|
|
||||||
|
BONOBO_UI_VERB ("FileSave", menu_file_save_cb),
|
||||||
|
+ BONOBO_UI_VERB ("FileSend", menu_file_save_cb),
|
||||||
|
BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
|
||||||
|
|
||||||
|
BONOBO_UI_VERB ("EditCopy", menu_edit_copy_cb),
|
||||||
|
@@ -1414,6 +1415,7 @@ static BonoboUIVerb verbs [] = {
|
||||||
|
static EPixmap pixmaps[] = {
|
||||||
|
E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
|
||||||
|
E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
|
||||||
|
+ E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
|
||||||
|
|
||||||
|
E_PIXMAP_END
|
||||||
|
};
|
||||||
|
@@ -1545,6 +1547,9 @@ comp_editor_init (CompEditor *editor)
|
||||||
|
bonobo_ui_component_thaw (editor->uic, NULL);
|
||||||
|
|
||||||
|
bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", "0", NULL);
|
||||||
|
+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "sensitive", "0", NULL);
|
||||||
|
+
|
||||||
|
+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "hidden", "1", NULL);
|
||||||
|
|
||||||
|
/* DND support */
|
||||||
|
gtk_drag_dest_set (GTK_WIDGET (editor), GTK_DEST_DEFAULT_ALL, drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE);
|
||||||
|
@@ -1771,9 +1776,10 @@ comp_editor_set_changed (CompEditor *edi
|
||||||
|
priv = editor->priv;
|
||||||
|
|
||||||
|
priv->changed = changed;
|
||||||
|
-
|
||||||
|
+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "sensitive", changed ? "1" : "0"
|
||||||
|
+ , NULL);
|
||||||
|
bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", changed ? "1" : "0"
|
||||||
|
- , NULL);
|
||||||
|
+ , NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -1839,6 +1845,11 @@ comp_editor_set_needs_send (CompEditor *
|
||||||
|
priv = editor->priv;
|
||||||
|
|
||||||
|
priv->needs_send = needs_send;
|
||||||
|
+ if (needs_send) {
|
||||||
|
+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "hidden", "1", NULL);
|
||||||
|
+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "hidden", "0", NULL);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
38
evo-2.8.2-build-break.fix
Normal file
38
evo-2.8.2-build-break.fix
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
--- data/Makefile.am.orig 2006-11-21 11:18:28.552759057 +0100
|
||||||
|
+++ data/Makefile.am 2006-11-21 11:22:08.661273800 +0100
|
||||||
|
@@ -25,10 +25,10 @@ kdedesktop_file = $(desktop_in_in_file:.
|
||||||
|
install-kde-applnk:
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \
|
||||||
|
$(INSTALL_DATA) $(kdedesktop_file) \
|
||||||
|
- $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
|
||||||
|
+ $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
|
||||||
|
|
||||||
|
uninstall-kde-applnk:
|
||||||
|
- rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
|
||||||
|
+ rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
@@ -45,16 +45,16 @@ SUBDIRS = cde_app_root
|
||||||
|
install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$(desktopdir); \
|
||||||
|
$(INSTALL_DATA) $(desktop_file) \
|
||||||
|
- $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop ; \
|
||||||
|
+ $(DESTDIR)$(desktopdir)/$(desktop_file) ; \
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$(keysdir); \
|
||||||
|
- $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ; \
|
||||||
|
+ $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ; \
|
||||||
|
$(mkinstalldirs) $(DESTDIR)$(mimedir); \
|
||||||
|
- $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ;
|
||||||
|
+ $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
|
||||||
|
|
||||||
|
uninstall-local: uninstall-kde-applnk
|
||||||
|
- rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \
|
||||||
|
- rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \
|
||||||
|
- rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
|
||||||
|
+ rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file); \
|
||||||
|
+ rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ; \
|
||||||
|
+ rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
|
||||||
|
|
||||||
|
# CDE Stuff
|
||||||
|
|
||||||
10
evo-2.8.2-regression-fix.patch
Normal file
10
evo-2.8.2-regression-fix.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- shell/main.c.orig 2006-11-21 11:23:34.976220765 +0100
|
||||||
|
+++ shell/main.c 2006-11-21 11:23:49.354711681 +0100
|
||||||
|
@@ -522,7 +522,6 @@ main (int argc, char **argv)
|
||||||
|
GNOME_PARAM_GOPTION_CONTEXT, context,
|
||||||
|
GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),
|
||||||
|
NULL);
|
||||||
|
- g_option_context_free (context);
|
||||||
|
if (start_online && start_offline) {
|
||||||
|
fprintf (stderr, _("%s: --online and --offline cannot be used together.\n Use %s --help for more information.\n"),
|
||||||
|
argv[0], argv[0]);
|
||||||
20
evolution-2.0.1-de-po.patch
Normal file
20
evolution-2.0.1-de-po.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- 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"
|
||||||
|
@@ -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"
|
||||||
277
evolution-2.2.0-port-to-pilot-link-0.12.patch
Normal file
277
evolution-2.2.0-port-to-pilot-link-0.12.patch
Normal file
@ -0,0 +1,277 @@
|
|||||||
|
--- evolution-2.2.2/addressbook/conduit/address-conduit.c.port-to-pilot-link-0.12 2004-09-23 14:50:17.000000000 -0400
|
||||||
|
+++ evolution-2.2.2/addressbook/conduit/address-conduit.c 2005-04-30 02:22:44.000000000 -0400
|
||||||
|
@@ -789,7 +789,7 @@
|
||||||
|
EAddrConduitContext *ctxt)
|
||||||
|
{
|
||||||
|
GnomePilotRecord p;
|
||||||
|
- static char record[0xffff];
|
||||||
|
+ static unsigned char record[0xffff];
|
||||||
|
|
||||||
|
g_assert (local->addr != NULL );
|
||||||
|
|
||||||
|
@@ -832,16 +832,16 @@
|
||||||
|
*/
|
||||||
|
if (local->local.ID != 0) {
|
||||||
|
struct Address addr;
|
||||||
|
- char record[0xffff];
|
||||||
|
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
|
||||||
|
int cat = 0;
|
||||||
|
|
||||||
|
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||||
|
ctxt->dbi->db_handle,
|
||||||
|
- local->local.ID, &record,
|
||||||
|
- NULL, NULL, NULL, &cat) > 0) {
|
||||||
|
+ local->local.ID, buffer,
|
||||||
|
+ NULL, NULL, &cat) > 0) {
|
||||||
|
local->local.category = cat;
|
||||||
|
memset (&addr, 0, sizeof (struct Address));
|
||||||
|
- unpack_Address (&addr, record, 0xffff);
|
||||||
|
+ unpack_Address (&addr, buffer->data, 0xffff);
|
||||||
|
for (i = 0; i < 5; i++) {
|
||||||
|
if (addr.entry[entryPhone1 + i])
|
||||||
|
local->addr->entry[entryPhone1 + i] =
|
||||||
|
@@ -856,6 +856,8 @@
|
||||||
|
}
|
||||||
|
free_Address (&addr);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
|
||||||
|
@@ -1161,7 +1163,7 @@
|
||||||
|
EBookQuery *query;
|
||||||
|
GList *l;
|
||||||
|
int len;
|
||||||
|
- unsigned char *buf;
|
||||||
|
+ pi_buffer_t *buffer;
|
||||||
|
char *filename;
|
||||||
|
char *change_id;
|
||||||
|
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||||
|
@@ -1244,9 +1246,9 @@
|
||||||
|
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
|
||||||
|
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
|
||||||
|
|
||||||
|
- buf = (unsigned char*)g_malloc (0xffff);
|
||||||
|
+ buffer = pi_buffer_new (0xffff);
|
||||||
|
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||||
|
- (unsigned char *)buf, 0xffff);
|
||||||
|
+ 0xffff, buffer);
|
||||||
|
|
||||||
|
if (len < 0) {
|
||||||
|
WARN (_("Could not read pilot's Address application block"));
|
||||||
|
@@ -1255,8 +1257,8 @@
|
||||||
|
_("Could not read pilot's Address application block"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
- unpack_AddressAppInfo (&(ctxt->ai), buf, len);
|
||||||
|
- g_free (buf);
|
||||||
|
+ unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
|
||||||
|
check_for_slow_setting (conduit, ctxt);
|
||||||
|
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|
||||||
|
--- evolution-2.2.2/calendar/conduits/calendar/calendar-conduit.c.port-to-pilot-link-0.12 2005-04-30 01:51:32.000000000 -0400
|
||||||
|
+++ evolution-2.2.2/calendar/conduits/calendar/calendar-conduit.c 2005-04-30 02:15:02.000000000 -0400
|
||||||
|
@@ -751,7 +751,7 @@
|
||||||
|
ECalConduitContext *ctxt)
|
||||||
|
{
|
||||||
|
GnomePilotRecord p;
|
||||||
|
- static char record[0xffff];
|
||||||
|
+ static unsigned char record[0xffff];
|
||||||
|
|
||||||
|
g_assert (local->comp != NULL);
|
||||||
|
g_assert (local->appt != NULL );
|
||||||
|
@@ -800,22 +800,24 @@
|
||||||
|
* we don't overwrite them
|
||||||
|
*/
|
||||||
|
if (local->local.ID != 0) {
|
||||||
|
- struct Appointment appt;
|
||||||
|
- char record[0xffff];
|
||||||
|
+ struct Appointment appt;
|
||||||
|
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
|
||||||
|
int cat = 0;
|
||||||
|
|
||||||
|
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||||
|
ctxt->dbi->db_handle,
|
||||||
|
- local->local.ID, &record,
|
||||||
|
- NULL, NULL, NULL, &cat) > 0) {
|
||||||
|
+ local->local.ID, buffer,
|
||||||
|
+ NULL, NULL, &cat) > 0) {
|
||||||
|
local->local.category = cat;
|
||||||
|
memset (&appt, 0, sizeof (struct Appointment));
|
||||||
|
- unpack_Appointment (&appt, record, 0xffff);
|
||||||
|
+ unpack_Appointment (&appt, buffer->data, 0xffff);
|
||||||
|
local->appt->alarm = appt.alarm;
|
||||||
|
local->appt->advance = appt.advance;
|
||||||
|
local->appt->advanceUnits = appt.advanceUnits;
|
||||||
|
free_Appointment (&appt);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* STOP: don't replace these with g_strdup, since free_Appointment
|
||||||
|
@@ -1342,7 +1344,7 @@
|
||||||
|
GnomePilotConduitSyncAbs *abs_conduit;
|
||||||
|
GList *removed = NULL, *added = NULL, *l;
|
||||||
|
int len;
|
||||||
|
- unsigned char *buf;
|
||||||
|
+ pi_buffer_t *buffer;
|
||||||
|
char *filename, *change_id;
|
||||||
|
icalcomponent *icalcomp;
|
||||||
|
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||||
|
@@ -1460,9 +1462,9 @@
|
||||||
|
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
|
||||||
|
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
|
||||||
|
|
||||||
|
- buf = (unsigned char*)g_malloc (0xffff);
|
||||||
|
+ buffer = pi_buffer_new (0xffff);
|
||||||
|
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||||
|
- (unsigned char *)buf, 0xffff);
|
||||||
|
+ 0xffff, buffer);
|
||||||
|
|
||||||
|
if (len < 0) {
|
||||||
|
WARN (_("Could not read pilot's Calendar application block"));
|
||||||
|
@@ -1471,8 +1473,8 @@
|
||||||
|
_("Could not read pilot's Calendar application block"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
|
||||||
|
- g_free (buf);
|
||||||
|
+ unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len);
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
|
||||||
|
check_for_slow_setting (conduit, ctxt);
|
||||||
|
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|
||||||
|
--- evolution-2.2.2/calendar/conduits/todo/todo-conduit.c.port-to-pilot-link-0.12 2005-04-30 02:13:27.000000000 -0400
|
||||||
|
+++ evolution-2.2.2/calendar/conduits/todo/todo-conduit.c 2005-04-30 02:18:11.000000000 -0400
|
||||||
|
@@ -594,7 +594,7 @@ local_record_to_pilot_record (EToDoLocal
|
||||||
|
EToDoConduitContext *ctxt)
|
||||||
|
{
|
||||||
|
GnomePilotRecord p;
|
||||||
|
- static char record[0xffff];
|
||||||
|
+ static unsigned char record[0xffff];
|
||||||
|
|
||||||
|
g_assert (local->comp != NULL);
|
||||||
|
g_assert (local->todo != NULL );
|
||||||
|
@@ -696,15 +696,17 @@ local_record_from_comp (EToDoLocalRecord
|
||||||
|
|
||||||
|
/* Don't overwrite the category */
|
||||||
|
if (local->local.ID != 0) {
|
||||||
|
- char record[0xffff];
|
||||||
|
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
|
||||||
|
int cat = 0;
|
||||||
|
|
||||||
|
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||||
|
ctxt->dbi->db_handle,
|
||||||
|
- local->local.ID, &record,
|
||||||
|
- NULL, NULL, NULL, &cat) > 0) {
|
||||||
|
+ local->local.ID, buffer,
|
||||||
|
+ NULL, NULL, &cat) > 0) {
|
||||||
|
local->local.category = cat;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -1014,7 +1016,7 @@ pre_sync (GnomePilotConduit *conduit,
|
||||||
|
GnomePilotConduitSyncAbs *abs_conduit;
|
||||||
|
GList *l;
|
||||||
|
int len;
|
||||||
|
- unsigned char *buf;
|
||||||
|
+ pi_buffer_t *buffer;
|
||||||
|
char *filename, *change_id;
|
||||||
|
icalcomponent *icalcomp;
|
||||||
|
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||||
|
@@ -1104,9 +1106,9 @@ pre_sync (GnomePilotConduit *conduit,
|
||||||
|
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
|
||||||
|
num_records, add_records, mod_records, del_records);
|
||||||
|
|
||||||
|
- buf = (unsigned char*)g_malloc (0xffff);
|
||||||
|
+ buffer = pi_buffer_new (0xffff);
|
||||||
|
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||||
|
- (unsigned char *)buf, 0xffff);
|
||||||
|
+ 0xffff, buffer);
|
||||||
|
|
||||||
|
if (len < 0) {
|
||||||
|
WARN (_("Could not read pilot's ToDo application block"));
|
||||||
|
@@ -1115,9 +1117,9 @@ pre_sync (GnomePilotConduit *conduit,
|
||||||
|
_("Could not read pilot's ToDo application block"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
- unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
|
||||||
|
- g_free (buf);
|
||||||
|
-
|
||||||
|
+ unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len);
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
+
|
||||||
|
lastDesktopUniqueID = 128;
|
||||||
|
|
||||||
|
check_for_slow_setting (conduit, ctxt);
|
||||||
|
--- evolution/calendar/conduits/memo/memo-conduit.c 2005-10-19 17:09:35.000000000 +0530
|
||||||
|
+++ evolution-2.5.5.1/calendar/conduits/memo/memo-conduit.c 2006-01-20 02:31:15.000000000 +0530
|
||||||
|
@@ -451,7 +451,7 @@ local_record_to_pilot_record (EMemoLocal
|
||||||
|
EMemoConduitContext *ctxt)
|
||||||
|
{
|
||||||
|
GnomePilotRecord p;
|
||||||
|
- static char record[0xffff];
|
||||||
|
+ static unsigned char record[0xffff];
|
||||||
|
|
||||||
|
g_assert (local->comp != NULL);
|
||||||
|
g_assert (local->memo != NULL );
|
||||||
|
@@ -568,17 +568,18 @@ local_record_from_comp (EMemoLocalRecord
|
||||||
|
|
||||||
|
/* Don't overwrite the category */
|
||||||
|
if (local->local.ID != 0) {
|
||||||
|
- char record[0xffff];
|
||||||
|
+ pi_buffer_t *buffer = pi_buffer_new (0xffff);
|
||||||
|
int cat = 0;
|
||||||
|
|
||||||
|
LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
|
||||||
|
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||||
|
ctxt->dbi->db_handle,
|
||||||
|
- local->local.ID, &record,
|
||||||
|
- NULL, NULL, NULL, &cat) > 0) {
|
||||||
|
+ local->local.ID, buffer,
|
||||||
|
+ NULL, NULL, &cat) > 0) {
|
||||||
|
local->local.category = cat;
|
||||||
|
}
|
||||||
|
LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -836,7 +837,7 @@ pre_sync (GnomePilotConduit *conduit,
|
||||||
|
GnomePilotConduitSyncAbs *abs_conduit;
|
||||||
|
GList *l;
|
||||||
|
int len;
|
||||||
|
- unsigned char *buf;
|
||||||
|
+ pi_buffer_t *buffer;
|
||||||
|
char *filename, *change_id;
|
||||||
|
icalcomponent *icalcomp;
|
||||||
|
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||||
|
@@ -929,9 +930,9 @@ pre_sync (GnomePilotConduit *conduit,
|
||||||
|
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
|
||||||
|
num_records, add_records, mod_records, del_records);
|
||||||
|
|
||||||
|
- buf = (unsigned char*)g_malloc (0xffff);
|
||||||
|
+ buffer = pi_buffer_new (0xffff);
|
||||||
|
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||||
|
- (unsigned char *)buf, 0xffff);
|
||||||
|
+ 0xffff, buffer);
|
||||||
|
|
||||||
|
if (len < 0) {
|
||||||
|
WARN (_("Could not read pilot's Memo application block"));
|
||||||
|
@@ -940,8 +941,8 @@ pre_sync (GnomePilotConduit *conduit,
|
||||||
|
_("Could not read pilot's Memo application block"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
|
||||||
|
- g_free (buf);
|
||||||
|
+ unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len);
|
||||||
|
+ pi_buffer_free (buffer);
|
||||||
|
|
||||||
|
lastDesktopUniqueID = 128;
|
||||||
|
|
||||||
3
evolution-2.8.2.tar.bz2
Normal file
3
evolution-2.8.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:cbe0a650ecef50a0c26b0e55e9037feb6988f7a0d997e3c60573fe5a593826e8
|
||||||
|
size 12923830
|
||||||
9
evolution-addressbook.desktop
Normal file
9
evolution-addressbook.desktop
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=Evolution Address Book
|
||||||
|
Comment=Manage your contacts
|
||||||
|
TryExec=evolution
|
||||||
|
Exec=evolution -c contacts
|
||||||
|
Icon=ximian-evolution-addressbook
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Categories=GNOME;Application;Office;ContactManagement;
|
||||||
9
evolution-calendar.desktop
Normal file
9
evolution-calendar.desktop
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=Evolution Calendar
|
||||||
|
Comment=Manage your schedule
|
||||||
|
TryExec=evolution
|
||||||
|
Exec=evolution -c calendar
|
||||||
|
Icon=ximian-evolution-calendar
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Categories=GNOME;Application;Calendar;
|
||||||
10
evolution-configure.patch
Normal file
10
evolution-configure.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- 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
|
||||||
20
evolution-desktop.patch
Normal file
20
evolution-desktop.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- data/evolution.desktop.in.in.orig 2006-09-04 17:33:08.017117414 +0200
|
||||||
|
+++ data/evolution.desktop.in.in 2006-09-04 17:37:59.554994024 +0200
|
||||||
|
@@ -1,14 +1,15 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
Encoding=UTF-8
|
||||||
|
_Name=Evolution
|
||||||
|
-_GenericName=Groupware Suite
|
||||||
|
+_GenericName=The Evolution Groupware Suite
|
||||||
|
_Comment=The Evolution PIM and Email Client
|
||||||
|
Exec=evolution-@BASE_VERSION@
|
||||||
|
Icon=evolution
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
-Categories=GNOME;GTK;Office;Email;Calendar;ContactManagement;X-Red-Hat-Base;
|
||||||
|
+Categories=GNOME;GTK;Application;Office;X-Red-Hat-Base;
|
||||||
|
StartupNotify=true
|
||||||
|
+DocPath=evolution-@BASE_VERSION@
|
||||||
|
X-GNOME-Bugzilla-Bugzilla=GNOME
|
||||||
|
X-GNOME-Bugzilla-Product=Evolution
|
||||||
|
X-GNOME-Bugzilla-Component=Miscellaneous
|
||||||
9
evolution-email.desktop
Normal file
9
evolution-email.desktop
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=Evolution Email
|
||||||
|
Comment=Manage your electronic mail
|
||||||
|
TryExec=evolution
|
||||||
|
Exec=evolution -c mail
|
||||||
|
Icon=ximian-evolution-email.png
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Categories=GNOME;Application;Network;Email;
|
||||||
31
evolution-morewarnings.patch
Normal file
31
evolution-morewarnings.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
--- calendar/gui/e-calendar-view.c
|
||||||
|
+++ calendar/gui/e-calendar-view.c
|
||||||
|
@@ -41,6 +41,7 @@
|
||||||
|
#include <libedataserver/e-time-utils.h>
|
||||||
|
#include <e-util/e-dialog-utils.h>
|
||||||
|
#include <e-util/e-icon-factory.h>
|
||||||
|
+#include <e-util/e-error.h>
|
||||||
|
#include "e-calendar-marshal.h"
|
||||||
|
#include <libecal/e-cal-time-util.h>
|
||||||
|
#include <libecal/e-cal-component.h>
|
||||||
|
--- calendar/gui/e-meeting-list-view.c
|
||||||
|
+++ calendar/gui/e-meeting-list-view.c
|
||||||
|
@@ -45,6 +45,7 @@
|
||||||
|
#include <misc/e-cell-renderer-combo.h>
|
||||||
|
#include <libebook/e-destination.h>
|
||||||
|
#include "e-select-names-renderer.h"
|
||||||
|
+#include "itip-utils.h"
|
||||||
|
|
||||||
|
struct _EMeetingListViewPrivate {
|
||||||
|
EMeetingStore *store;
|
||||||
|
--- mail/message-list.c.orig 2006-09-02 08:43:04.000000000 +0200
|
||||||
|
+++ mail/message-list.c 2006-09-04 17:45:19.121891044 +0200
|
||||||
|
@@ -1718,7 +1718,7 @@ message_list_setup_etree (MessageList *m
|
||||||
|
d(printf ("folder name is '%s'\n", name));
|
||||||
|
|
||||||
|
path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
|
||||||
|
- g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
|
||||||
|
+ g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", GINT_TO_POINTER(1));
|
||||||
|
|
||||||
|
if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
|
||||||
|
/* build based on saved file */
|
||||||
9
evolution-tasklist.desktop
Normal file
9
evolution-tasklist.desktop
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=Evolution Task List
|
||||||
|
Comment=Manage your current tasks
|
||||||
|
TryExec=evolution
|
||||||
|
Exec=evolution -c tasks
|
||||||
|
Icon=ximian-evolution-tasks
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Categories=GNOME;Application;Calendar;
|
||||||
50
evolution-warnings.patch
Normal file
50
evolution-warnings.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
Index: calendar/gui/calendar-component.c
|
||||||
|
===================================================================
|
||||||
|
--- calendar/gui/calendar-component.c.orig
|
||||||
|
+++ calendar/gui/calendar-component.c
|
||||||
|
@@ -1209,7 +1209,7 @@ create_new_event (CalendarComponent *cal
|
||||||
|
} else {
|
||||||
|
ECalComponent *comp;
|
||||||
|
EventEditor *editor;
|
||||||
|
- CompEditorFlags flags;
|
||||||
|
+ CompEditorFlags flags = 0;
|
||||||
|
|
||||||
|
flags = COMP_EDITOR_USER_ORG | COMP_EDITOR_NEW_ITEM;
|
||||||
|
if (is_meeting)
|
||||||
|
Index: mail/em-composer-prefs.c
|
||||||
|
===================================================================
|
||||||
|
--- mail/em-composer-prefs.c.orig
|
||||||
|
+++ mail/em-composer-prefs.c
|
||||||
|
@@ -54,6 +54,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>
|
||||||
|
Index: mail/em-composer-utils.c
|
||||||
|
===================================================================
|
||||||
|
--- mail/em-composer-utils.c.orig
|
||||||
|
+++ 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);
|
||||||
|
|
||||||
|
Index: plugins/save-calendar/ical-format.c
|
||||||
|
===================================================================
|
||||||
|
--- plugins/save-calendar/ical-format.c.orig
|
||||||
|
+++ plugins/save-calendar/ical-format.c
|
||||||
|
@@ -71,7 +71,7 @@ do_save_calendar_ical (FormatHandler *ha
|
||||||
|
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);
|
||||||
1418
evolution.changes
Normal file
1418
evolution.changes
Normal file
File diff suppressed because it is too large
Load Diff
1193
evolution.spec
Normal file
1193
evolution.spec
Normal file
File diff suppressed because it is too large
Load Diff
60
fix-exchange-menuitem.diff
Normal file
60
fix-exchange-menuitem.diff
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
Index: plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml,v
|
||||||
|
retrieving revision 1.2
|
||||||
|
diff -u -p -r1.2 org-gnome-exchange-ab-subscription.xml
|
||||||
|
--- plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml 10 Jan 2006 18:38:04 -0000 1.2
|
||||||
|
+++ plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml 20 Apr 2006 10:18:10 -0000
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
<Root>
|
||||||
|
<commands>
|
||||||
|
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Contacts"
|
||||||
|
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Contacts"
|
||||||
|
_tip="Subscribe to Other User's Contacts"/>
|
||||||
|
</commands>
|
||||||
|
|
||||||
|
Index: plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml,v
|
||||||
|
retrieving revision 1.1
|
||||||
|
diff -u -p -r1.1 org-gnome-exchange-cal-subscription.xml
|
||||||
|
--- plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml 22 Jul 2005 10:25:22 -0000 1.1
|
||||||
|
+++ plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml 20 Apr 2006 10:18:10 -0000
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
<Root>
|
||||||
|
<commands>
|
||||||
|
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Calendar"
|
||||||
|
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Calendar"
|
||||||
|
_tip="Subscribe to Other User's Calendar"/>
|
||||||
|
</commands>
|
||||||
|
|
||||||
|
Index: plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml,v
|
||||||
|
retrieving revision 1.2
|
||||||
|
diff -u -p -r1.2 org-gnome-exchange-tasks-subscription.xml
|
||||||
|
--- plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml 10 Jan 2006 18:38:04 -0000 1.2
|
||||||
|
+++ plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml 20 Apr 2006 10:18:10 -0000
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
<Root>
|
||||||
|
<commands>
|
||||||
|
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Tasks"
|
||||||
|
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Tasks"
|
||||||
|
_tip="Subscribe to Other User's Tasks"/>
|
||||||
|
</commands>
|
||||||
|
|
||||||
|
Index: plugins/exchange-operations/org-gnome-folder-subscription.xml
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-folder-subscription.xml,v
|
||||||
|
retrieving revision 1.3
|
||||||
|
diff -u -p -r1.3 org-gnome-folder-subscription.xml
|
||||||
|
--- plugins/exchange-operations/org-gnome-folder-subscription.xml 10 Jan 2006 18:38:04 -0000 1.3
|
||||||
|
+++ plugins/exchange-operations/org-gnome-folder-subscription.xml 20 Apr 2006 10:18:10 -0000
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
<Root>
|
||||||
|
<commands>
|
||||||
|
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Folder"
|
||||||
|
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Folder"
|
||||||
|
_tip="Subscribe to Other User's Folder"/>
|
||||||
|
</commands>
|
||||||
|
|
||||||
794
fix-security-gtkhtml-moreui.diff
Normal file
794
fix-security-gtkhtml-moreui.diff
Normal file
@ -0,0 +1,794 @@
|
|||||||
|
? mail.error
|
||||||
|
Index: em-format-html-display.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
|
||||||
|
retrieving revision 1.107
|
||||||
|
diff -u -p -r1.107 em-format-html-display.c
|
||||||
|
--- em-format-html-display.c 16 Oct 2006 12:37:02 -0000 1.107
|
||||||
|
+++ mail/em-format-html-display.c 17 Nov 2006 18:46:20 -0000
|
||||||
|
@@ -74,6 +74,7 @@
|
||||||
|
#include <bonobo/bonobo-widget.h>
|
||||||
|
|
||||||
|
#include <camel/camel-stream.h>
|
||||||
|
+#include <camel/camel-stream-filter.h>
|
||||||
|
#include <camel/camel-stream-mem.h>
|
||||||
|
#include <camel/camel-mime-filter-tohtml.h>
|
||||||
|
#include <camel/camel-mime-part.h>
|
||||||
|
@@ -182,6 +183,9 @@ struct _attach_puri {
|
||||||
|
int fit_height;
|
||||||
|
GtkImage *image;
|
||||||
|
|
||||||
|
+ /* Optional Text Mem Stream */
|
||||||
|
+ CamelStreamMem *mstream;
|
||||||
|
+
|
||||||
|
/* Signed / Encrypted */
|
||||||
|
camel_cipher_validity_sign_t sign;
|
||||||
|
camel_cipher_validity_encrypt_t encrypt;
|
||||||
|
@@ -199,6 +203,7 @@ static void efhd_format_clone(EMFormat *
|
||||||
|
static void efhd_format_error(EMFormat *emf, CamelStream *stream, const char *txt);
|
||||||
|
static void efhd_format_source(EMFormat *, CamelStream *, CamelMimePart *);
|
||||||
|
static void efhd_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const char *, const EMFormatHandler *);
|
||||||
|
+static void efhd_format_optional(EMFormat *, CamelStream *, CamelMimePart *, CamelStream *);
|
||||||
|
static void efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid);
|
||||||
|
static void efhd_complete(EMFormat *);
|
||||||
|
gboolean efhd_mnemonic_show_bar (GtkWidget *widget, gboolean focus, GtkWidget *efhd);
|
||||||
|
@@ -353,6 +358,7 @@ efhd_class_init(GObjectClass *klass)
|
||||||
|
((EMFormatClass *)klass)->format_error = efhd_format_error;
|
||||||
|
((EMFormatClass *)klass)->format_source = efhd_format_source;
|
||||||
|
((EMFormatClass *)klass)->format_attachment = efhd_format_attachment;
|
||||||
|
+ ((EMFormatClass *)klass)->format_optional = efhd_format_optional;
|
||||||
|
((EMFormatClass *)klass)->format_secure = efhd_format_secure;
|
||||||
|
((EMFormatClass *)klass)->complete = efhd_complete;
|
||||||
|
|
||||||
|
@@ -1509,7 +1515,7 @@ efhd_attachment_popup(GtkWidget *w, GdkE
|
||||||
|
}
|
||||||
|
|
||||||
|
e_popup_add_items((EPopup *)emp, menus, NULL, efhd_menu_items_free, info);
|
||||||
|
-
|
||||||
|
+
|
||||||
|
menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, 0);
|
||||||
|
if (event)
|
||||||
|
gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
|
||||||
|
@@ -2398,7 +2404,6 @@ efhd_format_attachment(EMFormat *emf, Ca
|
||||||
|
if (handle) {
|
||||||
|
if (info->shown)
|
||||||
|
handle->handler(emf, stream, part, handle);
|
||||||
|
- /*camel_stream_printf(stream, "<iframe src=\"%s\" marginheight=0 marginwidth=0>%s</iframe>\n", classid, _("Attachment content could not be loaded"));*/
|
||||||
|
} else if (efhd_use_component(mime_type)) {
|
||||||
|
g_free(classid); /* messy */
|
||||||
|
|
||||||
|
@@ -2406,6 +2411,164 @@ efhd_format_attachment(EMFormat *emf, Ca
|
||||||
|
em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object);
|
||||||
|
camel_stream_printf(stream, "<object classid=\"%s\" type=\"%s\"></object><br>>\n", classid, mime_type);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ g_free(classid);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+efhd_optional_button_show (GtkWidget *widget, GtkWidget *w)
|
||||||
|
+{
|
||||||
|
+ GtkWidget *label = g_object_get_data (widget, "text-label");
|
||||||
|
+
|
||||||
|
+ if (GTK_WIDGET_VISIBLE (w)) {
|
||||||
|
+ gtk_widget_hide (w);
|
||||||
|
+ gtk_label_set_text_with_mnemonic (label, _("View _Unformatted"));
|
||||||
|
+ } else {
|
||||||
|
+ gtk_label_set_text_with_mnemonic (label, _("Hide _Unformatted"));
|
||||||
|
+ gtk_widget_show (w);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+efhd_resize (GtkWidget *w, GtkAllocation *event, EMFormatHTML *efh)
|
||||||
|
+{
|
||||||
|
+ gtk_widget_set_size_request (w, ((GtkWidget *)efh->html)->allocation.width-48, 250);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* optional render attachment button callback */
|
||||||
|
+static gboolean
|
||||||
|
+efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject)
|
||||||
|
+{
|
||||||
|
+ EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *)efh;
|
||||||
|
+ EAttachment *new;
|
||||||
|
+ struct _attach_puri *info;
|
||||||
|
+ GtkWidget *hbox, *vbox, *w, *button, *mainbox, *scroll, *label, *img;
|
||||||
|
+ char *simple_type, *tmp, *new_file = NULL;
|
||||||
|
+ const char *file;
|
||||||
|
+ GdkPixbuf *pixbuf, *mini;
|
||||||
|
+ AtkObject *a11y;
|
||||||
|
+ GtkTextView *view;
|
||||||
|
+ GtkTextBuffer *buffer;
|
||||||
|
+ GtkTargetEntry drag_types[] = {
|
||||||
|
+ { NULL, 0, 0 },
|
||||||
|
+ { "text/uri-list", 0, 1 },
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ /* FIXME: handle default shown case */
|
||||||
|
+ d(printf("adding attachment button/content for optional rendering\n"));
|
||||||
|
+
|
||||||
|
+ info = (struct _attach_puri *)em_format_find_puri((EMFormat *)efh, pobject->classid);
|
||||||
|
+ g_assert(info != NULL);
|
||||||
|
+ g_assert(info->forward == NULL);
|
||||||
|
+
|
||||||
|
+ scroll = gtk_scrolled_window_new (NULL, NULL);
|
||||||
|
+ mainbox = gtk_hbox_new(FALSE, 0);
|
||||||
|
+
|
||||||
|
+ button = gtk_button_new();
|
||||||
|
+ hbox = gtk_hbox_new (FALSE, 0);
|
||||||
|
+ img = e_icon_factory_get_image ("stock_show-all", E_ICON_SIZE_BUTTON);
|
||||||
|
+ label = gtk_label_new_with_mnemonic(_("View _Unformatted"));
|
||||||
|
+ g_object_set_data (button, "text-label", (gpointer)label);
|
||||||
|
+ gtk_box_pack_start ((GtkBox *)hbox, img, TRUE, TRUE, 2);
|
||||||
|
+ gtk_box_pack_start ((GtkBox *)hbox, label, TRUE, TRUE, 2);
|
||||||
|
+ gtk_widget_show_all (hbox);
|
||||||
|
+ gtk_container_add (button, hbox);
|
||||||
|
+ if (info->handle)
|
||||||
|
+ g_signal_connect(button, "clicked", G_CALLBACK(efhd_optional_button_show), scroll);
|
||||||
|
+ else {
|
||||||
|
+ gtk_widget_set_sensitive(button, FALSE);
|
||||||
|
+ GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ vbox = gtk_vbox_new (FALSE, 0);
|
||||||
|
+ gtk_box_pack_start((GtkBox *)mainbox, button, FALSE, FALSE, 6);
|
||||||
|
+
|
||||||
|
+ button = gtk_button_new();
|
||||||
|
+ hbox = gtk_hbox_new (FALSE, 0);
|
||||||
|
+ img = e_icon_factory_get_image ("stock_open", E_ICON_SIZE_BUTTON);
|
||||||
|
+ label = gtk_label_new_with_mnemonic(_("O_pen With"));
|
||||||
|
+ gtk_box_pack_start ((GtkBox *)hbox, img, TRUE, TRUE, 2);
|
||||||
|
+ gtk_box_pack_start ((GtkBox *)hbox, label, TRUE, TRUE, 2);
|
||||||
|
+ gtk_box_pack_start ((GtkBox *)hbox, gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE), TRUE, TRUE, 2);
|
||||||
|
+ gtk_widget_show_all (hbox);
|
||||||
|
+ gtk_container_add (button, hbox);
|
||||||
|
+
|
||||||
|
+ a11y = gtk_widget_get_accessible (button);
|
||||||
|
+ atk_object_set_name (a11y, _("Attachment"));
|
||||||
|
+
|
||||||
|
+ g_signal_connect(button, "button_press_event", G_CALLBACK(efhd_attachment_popup), info);
|
||||||
|
+ g_signal_connect(button, "popup_menu", G_CALLBACK(efhd_attachment_popup_menu), info);
|
||||||
|
+ g_signal_connect(button, "clicked", G_CALLBACK(efhd_attachment_popup_menu), info);
|
||||||
|
+ gtk_box_pack_start((GtkBox *)mainbox, button, FALSE, FALSE, 6);
|
||||||
|
+
|
||||||
|
+ gtk_widget_show_all(mainbox);
|
||||||
|
+
|
||||||
|
+ gtk_box_pack_start((GtkBox *)vbox, mainbox, FALSE, FALSE, 6);
|
||||||
|
+
|
||||||
|
+ view = gtk_text_view_new ();
|
||||||
|
+ gtk_text_view_set_editable (view, FALSE);
|
||||||
|
+ gtk_text_view_set_cursor_visible (view, FALSE);
|
||||||
|
+ buffer = gtk_text_view_get_buffer(view);
|
||||||
|
+ gtk_text_buffer_set_text (buffer, info->mstream->buffer->data, info->mstream->buffer->len);
|
||||||
|
+ camel_object_unref(info->mstream);
|
||||||
|
+ info->mstream = NULL;
|
||||||
|
+ gtk_scrolled_window_set_policy (scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
||||||
|
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
|
||||||
|
+ gtk_container_add (scroll, view);
|
||||||
|
+ gtk_box_pack_start((GtkBox *)vbox, scroll, TRUE, TRUE, 6);
|
||||||
|
+ gtk_widget_show (view);
|
||||||
|
+ gtk_widget_set_size_request (scroll, ((GtkWidget *)efh->html)->allocation.width-48, 250);
|
||||||
|
+ g_signal_connect (scroll, "size_allocate", G_CALLBACK(efhd_resize), efh);
|
||||||
|
+ gtk_widget_show (scroll);
|
||||||
|
+
|
||||||
|
+ if (!info->shown)
|
||||||
|
+ gtk_widget_hide (scroll);
|
||||||
|
+
|
||||||
|
+ gtk_widget_show (vbox);
|
||||||
|
+ gtk_container_add((GtkContainer *)eb, vbox);
|
||||||
|
+ info->handle = NULL;
|
||||||
|
+
|
||||||
|
+ return TRUE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, CamelStream *mstream)
|
||||||
|
+{
|
||||||
|
+ char *classid, *text, *html;
|
||||||
|
+ struct _attach_puri *info;
|
||||||
|
+ CamelStream *stream = ((CamelStreamFilter *) fstream)->source;
|
||||||
|
+
|
||||||
|
+ classid = g_strdup_printf("optional%s", emf->part_id->str);
|
||||||
|
+ info = (struct _attach_puri *)em_format_add_puri(emf, sizeof(*info), classid, part, efhd_attachment_frame);
|
||||||
|
+ em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_attachment_optional);
|
||||||
|
+ info->handle = em_format_find_handler(emf, "text/plain");;
|
||||||
|
+ info->shown = FALSE;
|
||||||
|
+ info->snoop_mime_type = g_strdup("text/plain");
|
||||||
|
+ info->attachment = e_attachment_new_from_mime_part (info->puri.part);
|
||||||
|
+ info->mstream = mstream;
|
||||||
|
+ if (emf->valid) {
|
||||||
|
+ info->sign = emf->valid->sign.status;
|
||||||
|
+ info->encrypt = emf->valid->encrypt.status;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ camel_stream_write_string(stream,
|
||||||
|
+ EM_FORMAT_HTML_VPAD
|
||||||
|
+ "<table cellspacing=0 cellpadding=0><tr><td><h3><font size=-1 color=red>");
|
||||||
|
+
|
||||||
|
+ html = camel_text_to_html(_("Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."), ((EMFormatHTML *)emf)->text_html_flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
|
||||||
|
+ camel_stream_write_string(stream, html);
|
||||||
|
+ camel_stream_write_string(stream,
|
||||||
|
+ "</font></h3></td></tr></table>\n");
|
||||||
|
+ camel_stream_write_string(stream,
|
||||||
|
+ "<table cellspacing=0 cellpadding=0>"
|
||||||
|
+ "<tr>");
|
||||||
|
+ camel_stream_printf(stream, "<td><object classid=\"%s\"></object></td></tr></table>", classid);
|
||||||
|
+
|
||||||
|
+ g_free(html);
|
||||||
|
+
|
||||||
|
+ camel_stream_write_string(stream,
|
||||||
|
+/* "</font></h2></td></tr></table>\n" */
|
||||||
|
+ EM_FORMAT_HTML_VPAD);
|
||||||
|
|
||||||
|
g_free(classid);
|
||||||
|
}
|
||||||
|
Index: em-format-html.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-format-html.c,v
|
||||||
|
retrieving revision 1.93
|
||||||
|
diff -u -p -r1.93 em-format-html.c
|
||||||
|
--- em-format-html.c 29 Sep 2006 17:54:48 -0000 1.93
|
||||||
|
+++ mail/em-format-html.c 17 Nov 2006 18:46:23 -0000
|
||||||
|
@@ -767,7 +767,7 @@ efh_text_plain(EMFormatHTML *efh, CamelS
|
||||||
|
"<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px;\">\n",
|
||||||
|
efh->frame_colour & 0xffffff, efh->content_colour & 0xffffff);
|
||||||
|
camel_stream_write_string(stream, "<tt>\n");
|
||||||
|
- em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, camel_medium_get_content_object((CamelMedium *)newpart));
|
||||||
|
+ em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, newpart);
|
||||||
|
camel_stream_flush((CamelStream *)filtered_stream);
|
||||||
|
camel_stream_write_string(stream, "</tt>\n");
|
||||||
|
camel_stream_write_string(stream, "</div>\n");
|
||||||
|
@@ -807,7 +807,7 @@ efh_text_enriched(EMFormatHTML *efh, Cam
|
||||||
|
"<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px;\">\n",
|
||||||
|
efh->frame_colour & 0xffffff, efh->content_colour & 0xffffff);
|
||||||
|
|
||||||
|
- em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, dw);
|
||||||
|
+ em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, part);
|
||||||
|
|
||||||
|
camel_object_unref(filtered_stream);
|
||||||
|
camel_stream_write_string(stream, "</div>");
|
||||||
|
@@ -829,7 +829,7 @@ efh_write_text_html(EMFormat *emf, Camel
|
||||||
|
camel_data_wrapper_write_to_stream(dw, out);
|
||||||
|
camel_object_unref(out);
|
||||||
|
#endif
|
||||||
|
- em_format_format_text(emf, stream, camel_medium_get_content_object((CamelMedium *)puri->part));
|
||||||
|
+ em_format_format_text(emf, stream, puri->part);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -985,7 +985,7 @@ efh_message_deliverystatus(EMFormatHTML
|
||||||
|
camel_object_unref(html_filter);
|
||||||
|
|
||||||
|
camel_stream_write_string(stream, "<tt>\n");
|
||||||
|
- em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, camel_medium_get_content_object((CamelMedium *)part));
|
||||||
|
+ em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, part);
|
||||||
|
camel_stream_flush((CamelStream *)filtered_stream);
|
||||||
|
camel_stream_write_string(stream, "</tt>\n");
|
||||||
|
|
||||||
|
Index: em-format-quote.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-format-quote.c,v
|
||||||
|
retrieving revision 1.19
|
||||||
|
diff -u -p -r1.19 em-format-quote.c
|
||||||
|
--- em-format-quote.c 8 Aug 2005 04:30:38 -0000 1.19
|
||||||
|
+++ mail/em-format-quote.c 17 Nov 2006 18:46:23 -0000
|
||||||
|
@@ -411,7 +411,7 @@ emfq_format_source(EMFormat *emf, CamelS
|
||||||
|
camel_stream_filter_add(filtered_stream, html_filter);
|
||||||
|
camel_object_unref(html_filter);
|
||||||
|
|
||||||
|
- em_format_format_text(emf, (CamelStream *)filtered_stream, dw);
|
||||||
|
+ em_format_format_text(emf, (CamelStream *)filtered_stream, part);
|
||||||
|
camel_object_unref(filtered_stream);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -473,7 +473,7 @@ emfq_text_plain(EMFormatQuote *emfq, Cam
|
||||||
|
camel_stream_filter_add(filtered_stream, html_filter);
|
||||||
|
camel_object_unref(html_filter);
|
||||||
|
|
||||||
|
- em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, camel_medium_get_content_object((CamelMedium *)part));
|
||||||
|
+ em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, part);
|
||||||
|
camel_stream_flush((CamelStream *)filtered_stream);
|
||||||
|
camel_object_unref(filtered_stream);
|
||||||
|
}
|
||||||
|
@@ -501,7 +501,7 @@ emfq_text_enriched(EMFormatQuote *emfq,
|
||||||
|
camel_object_unref(enriched);
|
||||||
|
|
||||||
|
camel_stream_write_string(stream, "<br><hr><br>");
|
||||||
|
- em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, dw);
|
||||||
|
+ em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, part);
|
||||||
|
camel_object_unref(filtered_stream);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -509,7 +509,7 @@ static void
|
||||||
|
emfq_text_html(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
|
||||||
|
{
|
||||||
|
camel_stream_write_string(stream, "\n<!-- text/html -->\n");
|
||||||
|
- em_format_format_text(emf, stream, camel_medium_get_content_object((CamelMedium *)part));
|
||||||
|
+ em_format_format_text(emf, stream, part);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
Index: em-format.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-format.c,v
|
||||||
|
retrieving revision 1.52
|
||||||
|
diff -u -p -r1.52 em-format.c
|
||||||
|
--- em-format.c 20 Apr 2006 16:35:32 -0000 1.52
|
||||||
|
+++ mail/em-format.c 17 Nov 2006 18:46:26 -0000
|
||||||
|
@@ -47,6 +47,7 @@
|
||||||
|
#include <camel/camel-string-utils.h>
|
||||||
|
#include <camel/camel-stream-filter.h>
|
||||||
|
#include <camel/camel-stream-null.h>
|
||||||
|
+#include <camel/camel-stream-mem.h>
|
||||||
|
#include <camel/camel-mime-filter-charset.h>
|
||||||
|
#include <camel/camel-mime-filter-windows.h>
|
||||||
|
#include <camel/camel-mime-filter-pgp.h>
|
||||||
|
@@ -80,7 +81,6 @@ static const EMFormatHandler *emf_find_h
|
||||||
|
static void emf_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *emfsource);
|
||||||
|
static void emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid);
|
||||||
|
static gboolean emf_busy(EMFormat *emf);
|
||||||
|
-
|
||||||
|
enum {
|
||||||
|
EMF_COMPLETE,
|
||||||
|
EMF_LAST_SIGNAL,
|
||||||
|
@@ -117,8 +117,10 @@ static void
|
||||||
|
emf_init(GObject *o)
|
||||||
|
{
|
||||||
|
EMFormat *emf = (EMFormat *)o;
|
||||||
|
-
|
||||||
|
+ char * asize;
|
||||||
|
+
|
||||||
|
emf->inline_table = g_hash_table_new(g_str_hash, g_str_equal);
|
||||||
|
+ emf->composer = FALSE;
|
||||||
|
e_dlist_init(&emf->header_list);
|
||||||
|
em_format_default_headers(emf);
|
||||||
|
emf->part_id = g_string_new("");
|
||||||
|
@@ -469,6 +471,7 @@ em_format_find_visible_puri(EMFormat *em
|
||||||
|
* Return value:
|
||||||
|
**/
|
||||||
|
EMFormatPURI *
|
||||||
|
+
|
||||||
|
em_format_find_puri(EMFormat *emf, const char *uri)
|
||||||
|
{
|
||||||
|
return g_hash_table_lookup(emf->pending_uri_table, uri);
|
||||||
|
@@ -1016,7 +1019,7 @@ em_format_format_content(EMFormat *emf,
|
||||||
|
CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)part);
|
||||||
|
|
||||||
|
if (camel_content_type_is (dw->mime_type, "text", "*"))
|
||||||
|
- em_format_format_text(emf, stream, dw);
|
||||||
|
+ em_format_format_text(emf, stream, part);
|
||||||
|
else
|
||||||
|
camel_data_wrapper_decode_to_stream(dw, stream);
|
||||||
|
}
|
||||||
|
@@ -1036,6 +1039,9 @@ em_format_format_text(EMFormat *emf, Cam
|
||||||
|
CamelMimeFilterCharset *filter;
|
||||||
|
const char *charset = NULL;
|
||||||
|
CamelMimeFilterWindows *windows = NULL;
|
||||||
|
+ CamelStream *mem_stream = NULL;
|
||||||
|
+ size_t size;
|
||||||
|
+ size_t max;
|
||||||
|
|
||||||
|
if (emf->charset) {
|
||||||
|
charset = emf->charset;
|
||||||
|
@@ -1064,17 +1070,27 @@ em_format_format_text(EMFormat *emf, Cam
|
||||||
|
} else if (charset == NULL) {
|
||||||
|
charset = emf->default_charset;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- filter_stream = camel_stream_filter_new_with_stream(stream);
|
||||||
|
+
|
||||||
|
+ mem_stream = (CamelStreamMem *)camel_stream_mem_new ();
|
||||||
|
+ filter_stream = camel_stream_filter_new_with_stream(mem_stream);
|
||||||
|
|
||||||
|
if ((filter = camel_mime_filter_charset_new_convert(charset, "UTF-8"))) {
|
||||||
|
camel_stream_filter_add(filter_stream, (CamelMimeFilter *) filter);
|
||||||
|
camel_object_unref(filter);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- camel_data_wrapper_decode_to_stream(dw, (CamelStream *)filter_stream);
|
||||||
|
+
|
||||||
|
+ max = mail_config_get_message_limit();
|
||||||
|
+ size = camel_data_wrapper_decode_to_stream(emf->mode == EM_FORMAT_SOURCE ? (CamelDataWrapper *)dw: camel_medium_get_content_object((CamelMedium *)dw), (CamelStream *)filter_stream);
|
||||||
|
camel_stream_flush((CamelStream *)filter_stream);
|
||||||
|
camel_object_unref(filter_stream);
|
||||||
|
+ camel_stream_reset (mem_stream);
|
||||||
|
+
|
||||||
|
+ if (max == -1 || size < (max * 1024) || emf->composer) {
|
||||||
|
+ camel_stream_write_to_stream(mem_stream, (CamelStream *)stream);
|
||||||
|
+ camel_stream_flush((CamelStream *)stream);
|
||||||
|
+ } else {
|
||||||
|
+ ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_optional(emf, stream, (CamelMimePart *)dw, mem_stream);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (windows)
|
||||||
|
camel_object_unref(windows);
|
||||||
|
@@ -1495,7 +1511,7 @@ emf_message_rfc822(EMFormat *emf, CamelS
|
||||||
|
static void
|
||||||
|
emf_message_deliverystatus(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
|
||||||
|
{
|
||||||
|
- em_format_format_text(emf, stream, camel_medium_get_content_object((CamelMedium *)part));
|
||||||
|
+ em_format_format_text(emf, stream, part);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
Index: em-format.h
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-format.h,v
|
||||||
|
retrieving revision 1.16
|
||||||
|
diff -u -p -r1.16 em-format.h
|
||||||
|
--- em-format.h 19 May 2005 06:06:35 -0000 1.16
|
||||||
|
+++ mail/em-format.h 17 Nov 2006 18:46:26 -0000
|
||||||
|
@@ -226,6 +226,7 @@ struct _EMFormat {
|
||||||
|
em_format_mode_t mode; /* source/headers/etc */
|
||||||
|
char *charset; /* charset override */
|
||||||
|
char *default_charset; /* charset fallback */
|
||||||
|
+ gboolean composer; /* Formatting from composer ?*/
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _EMFormatClass {
|
||||||
|
@@ -257,6 +258,9 @@ struct _EMFormatClass {
|
||||||
|
/* returns true if the formatter is still busy with pending stuff */
|
||||||
|
gboolean (*busy)(EMFormat *);
|
||||||
|
|
||||||
|
+ /* Shows optional way to open messages */
|
||||||
|
+ void (*format_optional)(EMFormat *, struct _CamelStream *, struct _CamelMimePart *, struct _CamelStream* );
|
||||||
|
+
|
||||||
|
/* signals */
|
||||||
|
/* complete, alternative to polling busy, for asynchronous work */
|
||||||
|
void (*complete)(EMFormat *);
|
||||||
|
Index: em-mailer-prefs.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-mailer-prefs.c,v
|
||||||
|
retrieving revision 1.39
|
||||||
|
diff -u -p -r1.39 em-mailer-prefs.c
|
||||||
|
--- em-mailer-prefs.c 9 Aug 2006 08:43:27 -0000 1.39
|
||||||
|
+++ mail/em-mailer-prefs.c 17 Nov 2006 18:46:28 -0000
|
||||||
|
@@ -459,6 +459,16 @@ address_compress_count_changed (GtkSpinB
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
+mlimit_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs)
|
||||||
|
+{
|
||||||
|
+ int count;
|
||||||
|
+
|
||||||
|
+ count = (int) gtk_spin_button_get_value (prefs->mlimit_count);
|
||||||
|
+
|
||||||
|
+ gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/message_text_part_limit", count, NULL);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const char *key, float div, GCallback value_changed)
|
||||||
|
{
|
||||||
|
GError *err = NULL;
|
||||||
|
@@ -772,6 +782,16 @@ em_mailer_prefs_construct (EMMailerPrefs
|
||||||
|
"/apps/evolution/mail/display/mark_seen_timeout",
|
||||||
|
1000.0, G_CALLBACK (mark_seen_timeout_changed));
|
||||||
|
|
||||||
|
+ prefs->mlimit_toggle = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "mlimit_checkbutton"));
|
||||||
|
+ toggle_button_init (prefs, prefs->mlimit_toggle, FALSE,
|
||||||
|
+ "/apps/evolution/mail/display/force_message_limit",
|
||||||
|
+ G_CALLBACK (toggle_button_toggled));
|
||||||
|
+
|
||||||
|
+ prefs->mlimit_count = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "mlimit_spin"));
|
||||||
|
+ spin_button_init (prefs, prefs->mlimit_count,
|
||||||
|
+ "/apps/evolution/mail/display/message_text_part_limit",
|
||||||
|
+ 1, G_CALLBACK (mlimit_count_changed));
|
||||||
|
+
|
||||||
|
prefs->address_toggle = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "address_checkbox"));
|
||||||
|
toggle_button_init (prefs, prefs->address_toggle, FALSE,
|
||||||
|
"/apps/evolution/mail/display/address_compress",
|
||||||
|
Index: em-mailer-prefs.h
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-mailer-prefs.h,v
|
||||||
|
retrieving revision 1.15
|
||||||
|
diff -u -p -r1.15 em-mailer-prefs.h
|
||||||
|
--- em-mailer-prefs.h 25 May 2006 04:59:47 -0000 1.15
|
||||||
|
+++ mail/em-mailer-prefs.h 17 Nov 2006 18:46:28 -0000
|
||||||
|
@@ -75,7 +75,9 @@ struct _EMMailerPrefs {
|
||||||
|
struct _GtkToggleButton *timeout_toggle;
|
||||||
|
struct _GtkSpinButton *timeout;
|
||||||
|
struct _GtkToggleButton *address_toggle;
|
||||||
|
- struct _GtkSpinButton *address_count;
|
||||||
|
+ struct _GtkSpinButton *address_count;
|
||||||
|
+ struct _GtkToggleButton *mlimit_toggle;
|
||||||
|
+ struct _GtkSpinButton *mlimit_count;
|
||||||
|
struct _GtkOptionMenu *charset;
|
||||||
|
struct _GtkToggleButton *citation_highlight;
|
||||||
|
struct _GnomeColorPicker *citation_color;
|
||||||
|
Index: em-utils.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
|
||||||
|
retrieving revision 1.83
|
||||||
|
diff -u -p -r1.83 em-utils.c
|
||||||
|
--- em-utils.c 23 Aug 2006 14:05:19 -0000 1.83
|
||||||
|
+++ mail/em-utils.c 17 Nov 2006 18:46:30 -0000
|
||||||
|
@@ -1605,6 +1605,7 @@ em_utils_part_to_html(CamelMimePart *par
|
||||||
|
camel_stream_mem_set_byte_array (mem, buf);
|
||||||
|
|
||||||
|
emfq = em_format_quote_new(NULL, (CamelStream *)mem, 0);
|
||||||
|
+ ((EMFormat *) emfq)->composer = TRUE;
|
||||||
|
em_format_set_session((EMFormat *)emfq, session);
|
||||||
|
if (source) {
|
||||||
|
/* copy over things we can, other things are internal, perhaps need different api than 'clone' */
|
||||||
|
@@ -1653,6 +1654,7 @@ em_utils_message_to_html(CamelMimeMessag
|
||||||
|
camel_stream_mem_set_byte_array (mem, buf);
|
||||||
|
|
||||||
|
emfq = em_format_quote_new(credits, (CamelStream *)mem, flags);
|
||||||
|
+ ((EMFormat *) emfq)->composer = TRUE;
|
||||||
|
em_format_set_session((EMFormat *)emfq, session);
|
||||||
|
|
||||||
|
if (!source) {
|
||||||
|
Index: evolution-mail.schemas.in.in
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/evolution-mail.schemas.in.in,v
|
||||||
|
retrieving revision 1.29
|
||||||
|
diff -u -p -r1.29 evolution-mail.schemas.in.in
|
||||||
|
--- evolution-mail.schemas.in.in 14 Jul 2006 05:42:26 -0000 1.29
|
||||||
|
+++ mail/evolution-mail.schemas.in.in 17 Nov 2006 18:46:31 -0000
|
||||||
|
@@ -485,7 +485,36 @@
|
||||||
|
</long>
|
||||||
|
</locale>
|
||||||
|
</schema>
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ <schema>
|
||||||
|
+ <key>/schemas/apps/evolution/mail/display/force_message_limit</key>
|
||||||
|
+ <applyto>/apps/evolution/mail/display/force_message_limit</applyto>
|
||||||
|
+ <owner>evolution-mail</owner>
|
||||||
|
+ <type>bool</type>
|
||||||
|
+ <default>true</default>
|
||||||
|
+ <locale name="C">
|
||||||
|
+ <short>Allows evolution to display text part of limited size</short>
|
||||||
|
+ <long>
|
||||||
|
+ Enable to render message text part of limited size.
|
||||||
|
+ </long>
|
||||||
|
+ </locale>
|
||||||
|
+ </schema>
|
||||||
|
+
|
||||||
|
+ <schema>
|
||||||
|
+ <key>/schemas/apps/evolution/mail/display/message_text_part_limit</key>
|
||||||
|
+ <applyto>/apps/evolution/mail/display/message_text_part_limit</applyto>
|
||||||
|
+ <owner>evolution-mail</owner>
|
||||||
|
+ <type>int</type>
|
||||||
|
+ <default>4096</default>
|
||||||
|
+ <locale name="C">
|
||||||
|
+ <short>Text message part limit</short>
|
||||||
|
+ <long>
|
||||||
|
+ This decides the max size of the text part that can be formatted under
|
||||||
|
+ evolution. The default is 4MB / 4096 KB and is specified interms of KB.
|
||||||
|
+ </long>
|
||||||
|
+ </locale>
|
||||||
|
+ </schema>
|
||||||
|
+
|
||||||
|
<schema>
|
||||||
|
<key>/schemas/apps/evolution/mail/display/address_count</key>
|
||||||
|
<applyto>/apps/evolution/mail/display/address_count</applyto>
|
||||||
|
Index: mail-config.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
|
||||||
|
retrieving revision 1.326
|
||||||
|
diff -u -p -r1.326 mail-config.c
|
||||||
|
--- mail-config.c 25 May 2006 04:59:47 -0000 1.326
|
||||||
|
+++ mail/mail-config.c 17 Nov 2006 18:46:32 -0000
|
||||||
|
@@ -110,6 +110,11 @@ typedef struct {
|
||||||
|
guint address_compress_notify_id;
|
||||||
|
gboolean address_compress;
|
||||||
|
gint address_count;
|
||||||
|
+ guint mlimit_size_notify_id;
|
||||||
|
+ guint mlimit_notify_id;
|
||||||
|
+ gboolean mlimit;
|
||||||
|
+ gint mlimit_size;
|
||||||
|
+
|
||||||
|
|
||||||
|
GPtrArray *mime_types;
|
||||||
|
guint mime_types_notify_id;
|
||||||
|
@@ -339,6 +344,20 @@ gconf_address_compress_changed (GConfCli
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
+gconf_mlimit_size_changed (GConfClient *client, guint cnxn_id,
|
||||||
|
+ GConfEntry *entry, gpointer user_data)
|
||||||
|
+{
|
||||||
|
+ config->mlimit_size = gconf_client_get_int (config->gconf, "/apps/evolution/mail/display/message_text_part_limit", NULL);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+gconf_mlimit_changed (GConfClient *client, guint cnxn_id,
|
||||||
|
+ GConfEntry *entry, gpointer user_data)
|
||||||
|
+{
|
||||||
|
+ config->mlimit = gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/force_message_limit", NULL);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
gconf_mime_types_changed (GConfClient *client, guint cnxn_id,
|
||||||
|
GConfEntry *entry, gpointer user_data)
|
||||||
|
{
|
||||||
|
@@ -373,7 +392,11 @@ mail_config_init (void)
|
||||||
|
config->font_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/address_compress",
|
||||||
|
gconf_address_compress_changed, NULL, NULL, NULL);
|
||||||
|
config->font_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/address_count",
|
||||||
|
- gconf_address_count_changed, NULL, NULL, NULL);
|
||||||
|
+ gconf_address_count_changed, NULL, NULL, NULL);
|
||||||
|
+ config->mlimit_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/force_message_limit",
|
||||||
|
+ gconf_mlimit_changed, NULL, NULL, NULL);
|
||||||
|
+ config->mlimit_size_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/message_text_part_limit",
|
||||||
|
+ gconf_mlimit_size_changed, NULL, NULL, NULL);
|
||||||
|
config->spell_notify_id = gconf_client_notify_add (config->gconf, "/GNOME/Spell",
|
||||||
|
gconf_style_changed, NULL, NULL, NULL);
|
||||||
|
config->mark_citations__notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/mark_citations",
|
||||||
|
@@ -397,6 +420,8 @@ mail_config_init (void)
|
||||||
|
config_cache_mime_types ();
|
||||||
|
config->address_compress = gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/address_compress", NULL);
|
||||||
|
config->address_count = gconf_client_get_int (config->gconf, "/apps/evolution/mail/display/address_count", NULL);
|
||||||
|
+ config->mlimit = gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/force_message_limit", NULL);
|
||||||
|
+ config->mlimit_size = gconf_client_get_int (config->gconf, "/apps/evolution/mail/display/message_text_part_limit", NULL);
|
||||||
|
config->accounts = e_account_list_new (config->gconf);
|
||||||
|
config->signatures = e_signature_list_new (config->gconf);
|
||||||
|
}
|
||||||
|
@@ -536,6 +561,15 @@ mail_config_get_address_count (void)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return config->address_count;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int
|
||||||
|
+mail_config_get_message_limit (void)
|
||||||
|
+{
|
||||||
|
+ if (!config->mlimit)
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ return config->mlimit_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
Index: mail-config.glade
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
|
||||||
|
retrieving revision 1.174
|
||||||
|
diff -u -p -r1.174 mail-config.glade
|
||||||
|
--- mail-config.glade 19 Jul 2006 15:26:27 -0000 1.174
|
||||||
|
+++ mail/mail-config.glade 17 Nov 2006 18:46:45 -0000
|
||||||
|
@@ -3342,7 +3342,7 @@ For example: "Work" or "P
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label583">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="yes">S_end message receipts:</property>
|
||||||
|
+ <property name="label" translatable="yes">S_end message receipts:</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -3352,8 +3352,8 @@ For example: "Work" or "P
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||||
|
<property name="mnemonic_widget">receipt_policy_dropdown</property>
|
||||||
|
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||||
|
<property name="width_chars">-1</property>
|
||||||
|
<property name="single_line_mode">False</property>
|
||||||
|
<property name="angle">0</property>
|
||||||
|
@@ -4962,6 +4962,82 @@ For example: "Work" or "P
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
+ <widget class="GtkHBox" id="hbox234">
|
||||||
|
+ <property name="visible">True</property>
|
||||||
|
+ <property name="homogeneous">False</property>
|
||||||
|
+ <property name="spacing">4</property>
|
||||||
|
+
|
||||||
|
+ <child>
|
||||||
|
+ <widget class="GtkCheckButton" id="mlimit_checkbutton">
|
||||||
|
+ <property name="visible">True</property>
|
||||||
|
+ <property name="can_focus">True</property>
|
||||||
|
+ <property name="label" translatable="yes">Do not format text contents in mails if the text si_ze exceeds</property>
|
||||||
|
+ <property name="use_underline">True</property>
|
||||||
|
+ <property name="relief">GTK_RELIEF_NORMAL</property>
|
||||||
|
+ <property name="focus_on_click">True</property>
|
||||||
|
+ <property name="active">False</property>
|
||||||
|
+ <property name="inconsistent">False</property>
|
||||||
|
+ <property name="draw_indicator">True</property>
|
||||||
|
+ </widget>
|
||||||
|
+ <packing>
|
||||||
|
+ <property name="padding">0</property>
|
||||||
|
+ <property name="expand">False</property>
|
||||||
|
+ <property name="fill">False</property>
|
||||||
|
+ </packing>
|
||||||
|
+ </child>
|
||||||
|
+
|
||||||
|
+ <child>
|
||||||
|
+ <widget class="GtkSpinButton" id="mlimit_spin">
|
||||||
|
+ <property name="visible">True</property>
|
||||||
|
+ <property name="can_focus">True</property>
|
||||||
|
+ <property name="climb_rate">1</property>
|
||||||
|
+ <property name="digits">0</property>
|
||||||
|
+ <property name="numeric">False</property>
|
||||||
|
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
|
||||||
|
+ <property name="snap_to_ticks">False</property>
|
||||||
|
+ <property name="wrap">False</property>
|
||||||
|
+ <property name="adjustment">0 0 30000 1 10 10</property>
|
||||||
|
+ </widget>
|
||||||
|
+ <packing>
|
||||||
|
+ <property name="padding">0</property>
|
||||||
|
+ <property name="expand">False</property>
|
||||||
|
+ <property name="fill">True</property>
|
||||||
|
+ </packing>
|
||||||
|
+ </child>
|
||||||
|
+
|
||||||
|
+ <child>
|
||||||
|
+ <widget class="GtkLabel" id="label585">
|
||||||
|
+ <property name="visible">True</property>
|
||||||
|
+ <property name="label" translatable="yes">KB</property>
|
||||||
|
+ <property name="use_underline">False</property>
|
||||||
|
+ <property name="use_markup">False</property>
|
||||||
|
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
+ <property name="wrap">False</property>
|
||||||
|
+ <property name="selectable">False</property>
|
||||||
|
+ <property name="xalign">0.5</property>
|
||||||
|
+ <property name="yalign">0.5</property>
|
||||||
|
+ <property name="xpad">0</property>
|
||||||
|
+ <property name="ypad">0</property>
|
||||||
|
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||||
|
+ <property name="width_chars">-1</property>
|
||||||
|
+ <property name="single_line_mode">False</property>
|
||||||
|
+ <property name="angle">0</property>
|
||||||
|
+ </widget>
|
||||||
|
+ <packing>
|
||||||
|
+ <property name="padding">0</property>
|
||||||
|
+ <property name="expand">False</property>
|
||||||
|
+ <property name="fill">False</property>
|
||||||
|
+ </packing>
|
||||||
|
+ </child>
|
||||||
|
+ </widget>
|
||||||
|
+ <packing>
|
||||||
|
+ <property name="padding">0</property>
|
||||||
|
+ <property name="expand">False</property>
|
||||||
|
+ <property name="fill">False</property>
|
||||||
|
+ </packing>
|
||||||
|
+ </child>
|
||||||
|
+
|
||||||
|
+ <child>
|
||||||
|
<widget class="GtkHBox" id="hbox233">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="homogeneous">False</property>
|
||||||
|
@@ -6572,7 +6648,7 @@ For example: "Work" or "P
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label571">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="no"> </property>
|
||||||
|
+ <property name="label"> </property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -6675,7 +6751,7 @@ For example: "Work" or "P
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label572">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="no"> </property>
|
||||||
|
+ <property name="label"> </property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -6731,7 +6807,7 @@ For example: "Work" or "P
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label575">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="no"> </property>
|
||||||
|
+ <property name="label"> </property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
Index: mail-config.h
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/mail/mail-config.h,v
|
||||||
|
retrieving revision 1.121
|
||||||
|
diff -u -p -r1.121 mail-config.h
|
||||||
|
--- mail-config.h 25 May 2006 04:59:47 -0000 1.121
|
||||||
|
+++ mail/mail-config.h 17 Nov 2006 18:46:45 -0000
|
||||||
|
@@ -134,6 +134,7 @@ void mail_config_add_account (struct _EA
|
||||||
|
void mail_config_remove_account (struct _EAccount *account);
|
||||||
|
void mail_config_set_default_account (struct _EAccount *account);
|
||||||
|
int mail_config_get_address_count (void);
|
||||||
|
+int mail_config_get_message_limit (void);
|
||||||
|
|
||||||
|
void mail_config_remove_account_proxies (struct _EAccount *account);
|
||||||
|
void mail_config_prune_proxies (void);
|
||||||
34
fix-sendrecv.diff
Normal file
34
fix-sendrecv.diff
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
Index: ui/evolution.xml
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
|
||||||
|
retrieving revision 1.110
|
||||||
|
diff -u -p -r1.110 evolution.xml
|
||||||
|
--- ui/evolution.xml 30 Jan 2006 05:16:26 -0000 1.110
|
||||||
|
+++ ui/evolution.xml 21 Apr 2006 04:24:58 -0000
|
||||||
|
@@ -38,7 +38,7 @@
|
||||||
|
_tip="Submit a bug report using Bug Buddy"/>
|
||||||
|
|
||||||
|
<cmd name="SendReceive"
|
||||||
|
- _tip="Send queued items and retrieve new items"
|
||||||
|
+ _tip="Retrieve new items"
|
||||||
|
pixtype="pixbuf"/>
|
||||||
|
|
||||||
|
<cmd name="ForgetPasswords"
|
||||||
|
@@ -65,7 +65,7 @@
|
||||||
|
|
||||||
|
<separator f="" name="eshell4"/>
|
||||||
|
|
||||||
|
- <menuitem name="SendReceive" verb="" _label="Send / _Receive" accel="F9"/>
|
||||||
|
+ <menuitem name="SendReceive" verb="" _label="Get Mail" accel="F9"/>
|
||||||
|
|
||||||
|
<placeholder name="FileOps"/>
|
||||||
|
|
||||||
|
@@ -171,7 +171,7 @@
|
||||||
|
<separator f="" name="eshell4"/>
|
||||||
|
|
||||||
|
<toolitem name="SendReceive" verb="SendReceive"
|
||||||
|
- _label="Send / Receive" priority="1"
|
||||||
|
+ _label="Get Mail" priority="1"
|
||||||
|
pixtype="pixbuf"/>
|
||||||
|
|
||||||
|
<separator f="" name="global1"/>
|
||||||
23
nss-nspr.patch
Normal file
23
nss-nspr.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
--- configure.in
|
||||||
|
+++ configure.in
|
||||||
|
@@ -793,16 +793,16 @@
|
||||||
|
check_manually="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then
|
||||||
|
- PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes")
|
||||||
|
+ if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists nss`; then
|
||||||
|
+ PKG_CHECK_MODULES(NSS, nss, have_nss="yes")
|
||||||
|
if test "x${have_nss}" = "xyes"; then
|
||||||
|
msg_ssl="yes (Mozilla NSS)"
|
||||||
|
if test "x$enable_smime" = "xyes"; then
|
||||||
|
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
|
||||||
|
msg_smime="yes (Mozilla NSS)"
|
||||||
|
fi
|
||||||
|
- mozilla_nspr="mozilla-nspr"
|
||||||
|
- mozilla_nss="mozilla-nss"
|
||||||
|
+ mozilla_nspr="nspr"
|
||||||
|
+ mozilla_nss="nss"
|
||||||
|
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
|
||||||
|
AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
|
||||||
|
MANUAL_NSPR_CFLAGS=""
|
||||||
87
publish-calendar-glade-fix.patch
Normal file
87
publish-calendar-glade-fix.patch
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
--- plugins/publish-calendar/Makefile.am 2006-01-21 08:49:14.000000000 +0530
|
||||||
|
+++ plugins/publish-calendar/Makefile.am 2006-01-21 08:50:23.000000000 +0530
|
||||||
|
@@ -1,14 +1,14 @@
|
||||||
|
INCLUDES = \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
$(EVOLUTION_CALENDAR_CFLAGS) \
|
||||||
|
- -DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
|
||||||
|
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
|
||||||
|
|
||||||
|
@EVO_PLUGIN_RULE@
|
||||||
|
|
||||||
|
plugin_DATA = \
|
||||||
|
org-gnome-publish-calendar.eplug \
|
||||||
|
- org-gnome-publish-calendar.xml \
|
||||||
|
- publish-calendar.glade
|
||||||
|
+ org-gnome-publish-calendar.xml
|
||||||
|
+
|
||||||
|
plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la
|
||||||
|
|
||||||
|
liborg_gnome_publish_calendar_la_SOURCES = \
|
||||||
|
@@ -29,7 +29,10 @@ liborg_gnome_publish_calendar_la_LIBADD
|
||||||
|
$(top_builddir)/calendar/gui/libevolution-calendar.la \
|
||||||
|
$(EVOLUTION_CALENDAR_LIBS)
|
||||||
|
|
||||||
|
+glade_DATA = \
|
||||||
|
+ publish-calendar.glade
|
||||||
|
+
|
||||||
|
EXTRA_DIST = \
|
||||||
|
org-gnome-publish-calendar.eplug.xml \
|
||||||
|
- publish-calendar.glade \
|
||||||
|
- org-gnome-publish-calendar.xml
|
||||||
|
+ org-gnome-publish-calendar.xml \
|
||||||
|
+ $(glade_DATA)
|
||||||
|
--- plugins/publish-calendar/publish-calendar.c 2006-01-09 13:21:19.000000000 +0530
|
||||||
|
+++ plugins/publish-calendar/publish-calendar.c 2006-01-21 08:19:37.000000000 +0530
|
||||||
|
@@ -35,6 +39,8 @@
|
||||||
|
#include "publish-format-fb.h"
|
||||||
|
#include "publish-format-ical.h"
|
||||||
|
|
||||||
|
+#define GLADE_FILENAME EVOLUTION_GLADEDIR "/publish-calendar.glade"
|
||||||
|
+
|
||||||
|
static GtkListStore *store = NULL;
|
||||||
|
static GHashTable *uri_timeouts = NULL;
|
||||||
|
static GSList *publish_uris = NULL;
|
||||||
|
@@ -439,13 +445,8 @@ publish_calendar_locations (EPlugin *epl
|
||||||
|
GSList *l;
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GConfClient *client;
|
||||||
|
- char *gladefile;
|
||||||
|
|
||||||
|
- gladefile = g_build_filename (EVOLUTION_PLUGINDIR,
|
||||||
|
- "publish-calendar.glade",
|
||||||
|
- NULL);
|
||||||
|
- xml = glade_xml_new (gladefile, "toplevel", NULL);
|
||||||
|
- g_free (gladefile);
|
||||||
|
+ xml = glade_xml_new (GLADE_FILENAME, "toplevel", NULL);
|
||||||
|
|
||||||
|
ui->treeview = glade_xml_get_widget (xml, "url list");
|
||||||
|
if (store == NULL)
|
||||||
|
--- plugins/publish-calendar/url-editor-dialog.c 2006-01-21 08:55:29.000000000 +0530
|
||||||
|
+++ plugins/publish-calendar/url-editor-dialog.c 2006-01-21 09:05:17.000000000 +0530
|
||||||
|
@@ -26,6 +26,8 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <e-util/e-util-private.h>
|
||||||
|
|
||||||
|
+#define GLADE_FILENAME EVOLUTION_GLADEDIR "/publish-calendar.glade"
|
||||||
|
+
|
||||||
|
static GtkDialogClass *parent_class = NULL;
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -324,15 +326,10 @@ url_editor_dialog_construct (UrlEditorDi
|
||||||
|
GConfClient *gconf;
|
||||||
|
GtkSizeGroup *group;
|
||||||
|
EPublishUri *uri;
|
||||||
|
- char *gladefile;
|
||||||
|
|
||||||
|
gconf = gconf_client_get_default ();
|
||||||
|
|
||||||
|
- gladefile = g_build_filename (EVOLUTION_PLUGINDIR,
|
||||||
|
- "publish-calendar.glade",
|
||||||
|
- NULL);
|
||||||
|
- gui = glade_xml_new (gladefile, "publishing toplevel", NULL);
|
||||||
|
- g_free (gladefile);
|
||||||
|
+ gui = glade_xml_new (GLADE_FILENAME, "publishing toplevel", NULL);
|
||||||
|
dialog->gui = gui;
|
||||||
|
|
||||||
|
#define GW(name) ((dialog->name) = glade_xml_get_widget (dialog->gui, #name))
|
||||||
54
remove-nm-dep.patch
Normal file
54
remove-nm-dep.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
Index: configure.in
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/configure.in,v
|
||||||
|
retrieving revision 1.881
|
||||||
|
diff -u -p -w -r1.881 configure.in
|
||||||
|
--- configure.in 13 Feb 2006 16:18:43 -0000 1.881
|
||||||
|
+++ configure.in 16 Feb 2006 10:04:58 -0000
|
||||||
|
@@ -1203,22 +1203,16 @@ dnl --- evolution (shell) flags
|
||||||
|
|
||||||
|
NM_SUPPORT_PACKAGES=""
|
||||||
|
+NM_SUPPORT_GLIB="no"
|
||||||
|
|
||||||
|
-PKG_CHECK_MODULES(NM, dbus-glib-1 libnm_glib, NM_SUPPORT_GLIB="yes", NM_SUPPORT_GLIB="no")
|
||||||
|
-if test "x$NM_SUPPORT_GLIB" = "xyes"; then
|
||||||
|
- AC_DEFINE(NM_SUPPORT_GLIB, 1, [network manager available])
|
||||||
|
- NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1 libnm_glib"
|
||||||
|
-else
|
||||||
|
PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no")
|
||||||
|
- AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] )
|
||||||
|
- if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then
|
||||||
|
+ if test "x$NM_SUPPORT" = "xyes"; then
|
||||||
|
AC_DEFINE(NM_SUPPORT, 1, [network manager available])
|
||||||
|
NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1"
|
||||||
|
else
|
||||||
|
- NM_SUPPORT=no
|
||||||
|
- fi
|
||||||
|
+ NM_SUPPORT="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
-AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$NM_SUPPORT_GLIB = xyes)
|
||||||
|
+AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$NM_SUPPORT_GLIB = xyes)
|
||||||
|
AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes)
|
||||||
|
|
||||||
|
|
||||||
|
Index: shell/e-shell-nm.c
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvs/gnome/evolution/shell/e-shell-nm.c,v
|
||||||
|
retrieving revision 1.1
|
||||||
|
diff -u -p -w -r1.1 e-shell-nm.c
|
||||||
|
--- shell/e-shell-nm.c 22 Dec 2005 02:12:34 -0000 1.1
|
||||||
|
+++ shell/e-shell-nm.c 16 Feb 2006 10:04:58 -0000
|
||||||
|
@@ -31,7 +31,11 @@
|
||||||
|
#include <dbus/dbus.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
-#include <NetworkManager/NetworkManager.h>
|
||||||
|
+
|
||||||
|
+#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
|
||||||
|
+#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
|
||||||
|
+#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
|
||||||
|
+
|
||||||
|
|
||||||
|
int shell_dbus_initialize (EShellWindow *window);
|
||||||
|
|
||||||
3
summerdance-about2.png
Normal file
3
summerdance-about2.png
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ff20cf43525e5f2125d8b883ac2e78f3f9a2bc4a994dbaa9c3c9864556955393
|
||||||
|
size 28107
|
||||||
3
ximian-evolution-addressbook.png
Normal file
3
ximian-evolution-addressbook.png
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1291b1b79c2718a29d0463f12e5a3b525adda72a665c05d51a3da3ecd6a22904
|
||||||
|
size 2762
|
||||||
3
ximian-evolution-calendar.png
Normal file
3
ximian-evolution-calendar.png
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:895cb456ae7bddb99821e08486dc2fb328fceccc4445f0fce001f4c9f4628a6e
|
||||||
|
size 2733
|
||||||
3
ximian-evolution-email.png
Normal file
3
ximian-evolution-email.png
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2ecaee9a5b1a539a2df3065baa106b90bdeb1490fd948464446577e2c3133c82
|
||||||
|
size 2937
|
||||||
3
ximian-evolution-tasks.png
Normal file
3
ximian-evolution-tasks.png
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6f61b4f3dfafccdcbade28b4ccc5873f2c679370daa11acb26fd1adee07e665a
|
||||||
|
size 3601
|
||||||
Loading…
Reference in New Issue
Block a user