[anjal] Update Evolution patch to Evolution 2.27.3
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjal] Update Evolution patch to Evolution 2.27.3
- Date: Thu, 25 Jun 2009 05:15:58 +0000 (UTC)
commit 53ac464e6dd430031e3692a832e71d422f594631
Author: Srinivasa Ragavan <sragavan novell com>
Date: Thu Jun 25 10:46:07 2009 +0530
Update Evolution patch to Evolution 2.27.3
evo-anjal-2-27-3.patch | 117 +++
evo-anjal-2-27.patch | 181 ----
evo-anjal.patch | 2233 ------------------------------------------------
3 files changed, 117 insertions(+), 2414 deletions(-)
---
diff --git a/evo-anjal-2-27-3.patch b/evo-anjal-2-27-3.patch
new file mode 100755
index 0000000..ddb0be0
--- /dev/null
+++ b/evo-anjal-2-27-3.patch
@@ -0,0 +1,117 @@
+diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
+index 95b525a..287fecc 100644
+--- a/mail/em-account-editor.c
++++ b/mail/em-account-editor.c
+@@ -2746,6 +2746,7 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data)
+ const gchar *tmp;
+ EAccount *ea;
+ gboolean refresh = FALSE;
++ gboolean edit = emae->original != NULL;
+
+ /* We use the page-check of various pages to 'prepare' or
+ pre-load their values, only in the druid */
+@@ -2784,7 +2785,7 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data)
+ index = check_servers(at);
+ gtk_entry_set_text(emae->priv->source.username, user);
+ gtk_entry_set_text(emae->priv->transport.username, user);
+- if (uri && (url = camel_url_new(uri, NULL)) != NULL) {
++ if (!edit && uri && (url = camel_url_new(uri, NULL)) != NULL) {
+ refresh = TRUE;
+ camel_url_set_user (url, user);
+ if (index != -1) {
+diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
+index e2942ca..980e11c 100644
+--- a/composer/e-composer-header.c
++++ b/composer/e-composer-header.c
+@@ -69,10 +69,6 @@ composer_header_addaction_clicked_cb (GtkButton *button,
+ EComposerHeader *header)
+ {
+ gboolean show = !e_composer_header_get_visible(header);
+- if (!show)
+- gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show"));
+- else
+- gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));
+
+ e_composer_header_set_visible (header, show);
+ }
+@@ -105,6 +101,7 @@ composer_header_constructor (GType type,
+ GTK_LABEL (widget), header->input_widget);
+ }
+
++ header->priv->action_label = NULL;
+ if (header->priv->addaction) {
+ GtkWidget *box, *tmp;
+ gchar *str;
+@@ -431,6 +428,12 @@ e_composer_header_set_visible (EComposerHeader *header,
+
+ header->priv->visible = visible;
+
++ if (header->priv->action_label) {
++ if (!visible)
++ gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show"));
++ else
++ gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));
++ }
+ g_object_notify (G_OBJECT (header), "visible");
+ }
+
+diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
+index 7bb8722..d76fc4e 100644
+--- a/mail/em-composer-utils.c
++++ b/mail/em-composer-utils.c
+@@ -763,7 +763,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
+
+ /* Editing messages... */
+
+-static void
++static GtkWidget *
+ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
+ {
+ EMsgComposer *composer;
+@@ -910,7 +910,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
+
+ composer_set_no_change (composer, TRUE, FALSE);
+
+- gtk_widget_show (GTK_WIDGET (composer));
++ if (!e_msg_composer_get_lite())
++ gtk_widget_show (GTK_WIDGET (composer));
++
++ return (GtkWidget *)composer;
+ }
+
+ /**
+@@ -921,15 +924,18 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
+ * Opens a composer filled in with the headers/mime-parts/etc of
+ * @message.
+ **/
+-void
++GtkWidget *
+ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
+ {
++ GtkWidget *composer = NULL;
+ g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+
+ if (folder)
+- edit_message (message, folder, NULL);
++ composer = edit_message (message, folder, NULL);
+ else
+- edit_message (message, NULL, NULL);
++ composer = edit_message (message, NULL, NULL);
++
++ return composer;
+ }
+
+ static void
+diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
+index 4c91652..66168e3 100644
+--- a/mail/em-composer-utils.h
++++ b/mail/em-composer-utils.h
+@@ -46,7 +46,7 @@ EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
+ /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */
+ EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri);
+
+-void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
++GtkWidget * em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
+ void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace);
+
+ void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]