r1431 - in /experimental/anjal/debian: anjal.lintian-overrides changelog patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch

yanli-guest at users.alioth.debian.org yanli-guest at users.alioth.debian.org
Mon Nov 30 09:44:52 UTC 2009


Author: yanli-guest
Date: Mon Nov 30 09:44:52 2009
New Revision: 1431

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1431
Log:
Fixed GNOME Bug #599792 and #596027, override lintian warning on binary-without-manpage

Added:
    experimental/anjal/debian/patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch
    experimental/anjal/debian/patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch
Modified:
    experimental/anjal/debian/anjal.lintian-overrides
    experimental/anjal/debian/changelog

Modified: experimental/anjal/debian/anjal.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/anjal.lintian-overrides?rev=1431&op=diff
==============================================================================
--- experimental/anjal/debian/anjal.lintian-overrides (original)
+++ experimental/anjal/debian/anjal.lintian-overrides Mon Nov 30 09:44:52 2009
@@ -1,1 +1,2 @@
 anjal binary: binary-or-shlib-defines-rpath
+anjal binary: binary-without-manpage

Modified: experimental/anjal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/changelog?rev=1431&op=diff
==============================================================================
--- experimental/anjal/debian/changelog (original)
+++ experimental/anjal/debian/changelog Mon Nov 30 09:44:52 2009
@@ -17,9 +17,17 @@
     - commit ee0fb58 from upstream anjal-0-1 branch that fixes GNOME
       Bug #596050
 
+  * patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch
+    - commit fb9bcb3 from upstream anjal-0-1 branch that fixes GNOME
+      Bug #596027
+
   * patches/upstream-004_Save-password-enabled-by-default.patch
     - commit ffd6d2c from upstream anjal-0-1 branch that enables save
       password by default
+
+  * patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch
+    - commit 11eb247 from upstream anjal-0-1 branch that fixes GNOME
+      Bug #599792
 
   * patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch
     - commit 877290f from upstream anjal-0-1 branch that fixes GNOME
@@ -29,7 +37,7 @@
     - commit 60407aa from upstream anjal-0-1 branch that fixes GNOME
       Bug #592294
 
- -- Yan Li <yanli at infradead.org>  Tue, 24 Nov 2009 10:37:05 +0800
+ -- Yan Li <yanli at infradead.org>  Mon, 30 Nov 2009 17:35:26 +0800
 
 anjal (0.1-1) experimental; urgency=low
 

Added: experimental/anjal/debian/patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch?rev=1431&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch (added)
+++ experimental/anjal/debian/patches/upstream-003_BUGFIX-GNOME-Bug-596027-In-Anjal-although-invalid-ma.patch Mon Nov 30 09:44:52 2009
@@ -1,0 +1,88 @@
+From fb9bcb391cc03fd59ab89f1b99f7a4b629f3b0d9 Mon Sep 17 00:00:00 2001
+Message-Id: <fb9bcb391cc03fd59ab89f1b99f7a4b629f3b0d9.1258967638.git.yanli at infradead.org>
+In-Reply-To: <ee0fb58d65a9e2eeb66654f8b7f52c64c30844f9.1258967638.git.yanli at infradead.org>
+References: <ee0fb58d65a9e2eeb66654f8b7f52c64c30844f9.1258967638.git.yanli at infradead.org>
+From: Yan Li <yanli at infradead.org>
+Date: Thu, 5 Nov 2009 14:31:33 +0800
+Subject: [PATCH 05/10] BUGFIX: GNOME Bug #596027: In Anjal, although invalid mail address warning popup, mail's tab closed automatically
+
+This bug is also reported as Moblin Bug #6108.
+
+This patch depends on an evolution commit (df1f9b3 of evo/master or
+50ffa65 of evo/gnome-2-28), which added a "mail_sent" bit to the
+composer. Now Anjal only close the composer when the mail is sent
+successfully.
+(cherry picked from commit d5624ca231c675c94f75e85a23b3fedd7f111300)
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-composer-view.c |   21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/src/mail-composer-view.c b/src/mail-composer-view.c
+index a083504..29496c2 100644
+--- a/src/mail-composer-view.c
++++ b/src/mail-composer-view.c
+@@ -1,3 +1,5 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++
+ /*
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -38,8 +40,6 @@ struct  _MailComposerViewPrivate {
+ 	GtkWidget *box;
+ 	GtkWidget *composer;
+ 	GList *children;
+-
+-	gboolean sending;
+ };
+ 
+ enum {
+@@ -60,7 +60,6 @@ mail_composer_view_init (MailComposerView  *shell)
+ 	shell->priv = g_new0(MailComposerViewPrivate, 1);
+ 	shell->uri = "new-message://";
+ 	shell->type = MAIL_VIEW_COMPOSER;
+-	shell->priv->sending = FALSE;
+ }
+ 
+ static void
+@@ -130,8 +129,10 @@ composer_send_close_cb (struct _EMsgComposer *composer, MailComposerView *mcv)
+ {
+ 	/*Emit view-close signal.*/
+ 	//g_object_unref (composer);
+-	mcv->priv->sending = TRUE;
+-	g_signal_emit (mcv, signals[VIEW_CLOSE], 0);
++
++	/* Only close when the Sending was successful */
++	if (e_msg_composer_get_mail_sent(composer))
++		g_signal_emit (mcv, signals[VIEW_CLOSE], 0);
+ }
+ 
+ void
+@@ -238,6 +239,14 @@ mail_composer_view_activate (MailComposerView *mfv, GtkWidget *folder_tree, GtkW
+ 	 gtk_widget_set_sensitive (sort_by, act);
+ }
+ 
++/* Whether we can close the composer or not.
++
++   The composer may be closed in two ways: by clicking the Send button
++   or closing the tab. When the Send button is clicked, this function
++   will only be called when the sending was successful (the
++   e_msg_composer_get_mail_sent() is check in callback function).  When
++   the tab is being closed, alert the user if editor is changed.
++*/
+ gboolean
+ mail_composer_view_can_quit (MailComposerView *mcv)
+ {
+@@ -247,7 +256,7 @@ mail_composer_view_can_quit (MailComposerView *mcv)
+ 
+ 	editor = GTKHTML_EDITOR(composer);
+ 	
+-	if (mcv->priv->sending)
++	if (e_msg_composer_get_mail_sent(composer))
+ 		return TRUE;
+ 
+ 	if (gtkhtml_editor_get_changed(editor) && !e_msg_composer_is_exiting (composer)) {
+-- 
+1.6.5.2
+

Added: experimental/anjal/debian/patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch?rev=1431&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch (added)
+++ experimental/anjal/debian/patches/upstream-005_BUGFIX-GNOME-Bug-599792-Anjal-composer-s-Send-button.patch Mon Nov 30 09:44:52 2009
@@ -1,0 +1,54 @@
+From 11eb2472f4f7cdb667c200a3f9a51b2f18c85dc4 Mon Sep 17 00:00:00 2001
+Message-Id: <11eb2472f4f7cdb667c200a3f9a51b2f18c85dc4.1258967638.git.yanli at infradead.org>
+In-Reply-To: <ee0fb58d65a9e2eeb66654f8b7f52c64c30844f9.1258967638.git.yanli at infradead.org>
+References: <ee0fb58d65a9e2eeb66654f8b7f52c64c30844f9.1258967638.git.yanli at infradead.org>
+From: Yan Li <yanli at infradead.org>
+Date: Fri, 6 Nov 2009 16:39:37 +0800
+Subject: [PATCH 07/10] BUGFIX: GNOME Bug #599792 - Anjal composer's Send button doesn't work after pressed Save Drafts button
+
+This patch depends on commit 08150f6 of Evolution/gnome-2-28.
+
+This bug is due to an old hack in Evolution that hiding a composer
+means we're closing it so save_draft_done() destroys the composer
+after saved draft. But in Anjal, the composer widget is always hidden
+(since the editor is reparented to the tab), and will be wrongly
+destroyed by save_draft_done() when you clicked "Save Draft" button.
+
+A new API function, e_msg_composer_request_close(), was added to
+Evolution composer for requesting close a composer so we no longer use
+its visibility to decide whether to destroy it or not.
+(cherry picked from commit 9493524d831e76b1c0563336168bd590d68daca8)
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-composer-view.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mail-composer-view.c b/src/mail-composer-view.c
+index 29496c2..aab908c 100644
+--- a/src/mail-composer-view.c
++++ b/src/mail-composer-view.c
+@@ -178,6 +178,7 @@ mail_composer_view_construct (MailComposerView *shell, struct _EMsgComposer *new
+ 
+ 	table = e_msg_composer_get_header_table (composer);	
+ 	e_composer_header_table_set_header_visible (table, E_COMPOSER_HEADER_FROM, FALSE);
++	/* steal the composer's vbox */
+ 	tmp = g_object_get_data((GObject *)composer, "vbox");
+ 	gtk_widget_reparent (tmp, box);
+ 	priv->box = box;
+@@ -267,9 +268,10 @@ mail_composer_view_can_quit (MailComposerView *mcv)
+ 		if (subject == NULL || *subject == '\0')
+ 			subject = _("Untitled Message");
+ 		response = e_error_run (GTK_WINDOW (composer), "mail-composer:exit-unsaved", subject, NULL);
+-		if (response ==  GTK_RESPONSE_YES) 
++		if (response ==  GTK_RESPONSE_YES) {
++			e_msg_composer_request_close (composer);
+ 			gtk_action_activate (gtkhtml_editor_get_action (editor, "save-draft"));
+-		else if (response == GTK_RESPONSE_CANCEL)
++		} else if (response == GTK_RESPONSE_CANCEL)
+ 			return FALSE;
+ 			
+ 	}
+-- 
+1.6.5.2
+




More information about the pkg-evolution-commits mailing list