summaryrefslogtreecommitdiffstats
path: root/mail/evolution/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-08-24 06:18:41 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-08-24 06:18:41 +0800
commit92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374 (patch)
treeab627bfbee0aaffd50d1fa59ff78ac64cc84df4d /mail/evolution/files
parentabbb91c6fe52baa973bfd0dc69733cd4bdfd4dc1 (diff)
downloadmarcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.tar
marcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.tar.gz
marcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.tar.bz2
marcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.tar.lz
marcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.tar.xz
marcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.tar.zst
marcuscom-ports-92351a28cd3155ee3b5b5f46b6b38cd1ce9ba374.zip
Update to 2.3.8.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4602 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'mail/evolution/files')
-rw-r--r--mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c17
-rw-r--r--mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c20
2 files changed, 37 insertions, 0 deletions
diff --git a/mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c b/mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c
new file mode 100644
index 000000000..aef49ffb1
--- /dev/null
+++ b/mail/evolution/files/patch-addressbook_gui_contact-editor_e-contact-editor.c
@@ -0,0 +1,17 @@
+--- gui/contract/editor/e-contact-editor.c.orig Tue Aug 23 14:46:51 2005
++++ gui/contract/editor/e-contact-editor.c Tue Aug 23 14:47:29 2005
+@@ -581,10 +581,12 @@ sensitize_ok (EContactEditor *ce)
+ gboolean allow_save;
+ GtkWidget *entry_fullname;
+ GtkWidget *entry_file_as;
++ const char *name_entry_string;
++ const char *file_as_entry_string;
+ entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" );
+ entry_file_as = glade_xml_get_widget (ce->gui, "entry-file-as");
+- const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
+- const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
++ name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname));
++ file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as));
+
+ allow_save = ce->target_editable && ce->changed ? TRUE : FALSE;
+
diff --git a/mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c b/mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c
new file mode 100644
index 000000000..d27506b24
--- /dev/null
+++ b/mail/evolution/files/patch-calendar_gui_dialogs_comp-editor.c
@@ -0,0 +1,20 @@
+--- calendar/gui/dialogs/comp-editor.c.orig Tue Aug 23 16:06:26 2005
++++ calendar/gui/dialogs/comp-editor.c Tue Aug 23 16:06:46 2005
+@@ -2027,7 +2027,7 @@ set_attachment_list (CompEditor *editor,
+ CamelDataWrapper *wrapper;
+ CamelStream *stream;
+ struct stat statbuf;
+- char *mime_type, *file_name;
++ char *mime_type, *file_name, *ptr;
+
+ attach_filename = (char *) p->data;
+ /* should we assert if g_str_has_prefix (attach_filename, "file://"))
+@@ -2079,7 +2079,7 @@ set_attachment_list (CompEditor *editor,
+
+ camel_mime_part_set_disposition (part, "attachment");
+
+- char *ptr = strstr (attach_filename, comp_uid);
++ ptr = strstr (attach_filename, comp_uid);
+ if (ptr) {
+ ptr += strlen(comp_uid);
+ if (*ptr++ == '-')