r1425 - in /experimental/anjal/debian: ./ patches/
yanli-guest at users.alioth.debian.org
yanli-guest at users.alioth.debian.org
Tue Nov 24 03:48:19 UTC 2009
Author: yanli-guest
Date: Tue Nov 24 03:48:19 2009
New Revision: 1425
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1425
Log:
Anjal bugs fixed: GNOME Bug #596050, #600691, #592294 and webkit rendering widget height error
Added:
experimental/anjal/debian/patches/debian-01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
- copied unchanged from r1424, experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
experimental/anjal/debian/patches/upstream-001_scroll-well-with-webkit.patch
experimental/anjal/debian/patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch
experimental/anjal/debian/patches/upstream-004_Save-password-enabled-by-default.patch
experimental/anjal/debian/patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch
experimental/anjal/debian/patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch
Removed:
experimental/anjal/debian/patches/01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
Modified:
experimental/anjal/debian/changelog
Modified: experimental/anjal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/changelog?rev=1425&op=diff
==============================================================================
--- experimental/anjal/debian/changelog (original)
+++ experimental/anjal/debian/changelog Tue Nov 24 03:48:19 2009
@@ -1,3 +1,36 @@
+anjal (0.1-2) UNRELEASED; urgency=low
+
+ * Patches are classified as "upstream" or "debian". "upstream"
+ patches include commits from upstream for bug fixing, and "debian"
+ patches are Debian-specific.
+
+ * patches/debian-01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
+ - renamed from
+ 01-Revert-BUGFIX-GNOME-Bugzilla-593197-Fix-strings-in-r.patch
+ since this one is Debian-specific
+
+ * patches/upstream-001_scroll-well-with-webkit.patch
+ - commit 16b84e6 from upstream anjal-0-1 branch that fixes the wrong
+ webkit render height bug
+
+ * patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch
+ - commit ee0fb58 from upstream anjal-0-1 branch that fixes GNOME
+ Bug #596050
+
+ * 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-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch
+ - commit 877290f from upstream anjal-0-1 branch that fixes GNOME
+ Bug #600691
+
+ * patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch
+ - 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
+
anjal (0.1-1) experimental; urgency=low
* Initial release (Closes: #520342)
Added: experimental/anjal/debian/patches/upstream-001_scroll-well-with-webkit.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-001_scroll-well-with-webkit.patch?rev=1425&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-001_scroll-well-with-webkit.patch (added)
+++ experimental/anjal/debian/patches/upstream-001_scroll-well-with-webkit.patch Tue Nov 24 03:48:19 2009
@@ -1,0 +1,37 @@
+From 16b84e6a68427fef3285bcd9980deeee4381a07b Mon Sep 17 00:00:00 2001
+Message-Id: <16b84e6a68427fef3285bcd9980deeee4381a07b.1258966729.git.yanli at infradead.org>
+From: Srinivasa Ragavan <sragavan at gnome.org>
+Date: Tue, 3 Nov 2009 11:37:07 +0000
+Subject: [PATCH] Fix Anjal to scroll well with webkit. Multiple scroll windows were
+ loaded for message views. Fixed it.
+
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-message-view.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/mail-message-view.c b/src/mail-message-view.c
+index 26422c6..b30442d 100644
+--- a/src/mail-message-view.c
++++ b/src/mail-message-view.c
+@@ -648,12 +648,16 @@ static void
+ mmv_finished_loading_webkit (WebKitWebView *webkitwebview, WebKitWebFrame *arg1, gpointer user_data)
+ {
+ MailMessageView *mmview = (MailMessageView *) user_data;
++ GtkRequisition req;
++
+ // gtk_widget_hide (mmview->priv->table_headers);
+ // gtk_widget_show (mmview->priv->html_headers);
+ gtk_widget_hide(mmview->priv->spinner);
+ #if HAVE_WEBKIT_PATCHED
+ gtk_widget_set_size_request ((GtkWidget *)webkitwebview, -1, webkit_web_frame_get_height(arg1));
+ #endif
++ gtk_widget_size_request ((GtkWidget *)webkitwebview, &req);
++ gtk_widget_set_size_request ((GtkWidget *)webkitwebview, req.width, req.height);
+ /* Connect on expose, and mark mail as read on expose, when the mail is actually seen */
+ g_signal_connect (webkitwebview, "expose-event" , G_CALLBACK(mark_mail_read), mmview);
+ g_signal_emit (mmview, signals[MESSAGE_LOADED], 0);
+--
+1.6.5.2
+
Added: experimental/anjal/debian/patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch?rev=1425&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch (added)
+++ experimental/anjal/debian/patches/upstream-002_BUGFIX-GNOME-Bugzilla-596050-Show-the-folder-loading-status.patch Tue Nov 24 03:48:19 2009
@@ -1,0 +1,27 @@
+From ee0fb58d65a9e2eeb66654f8b7f52c64c30844f9 Mon Sep 17 00:00:00 2001
+Message-Id: <ee0fb58d65a9e2eeb66654f8b7f52c64c30844f9.1258967638.git.yanli at infradead.org>
+From: Srinivasa Ragavan <sragavan at gnome.org>
+Date: Wed, 4 Nov 2009 11:24:18 +0000
+Subject: [PATCH 01/10] BUGFIX: GNOME Bugzilla #596050 - Show the folder loading status right.
+
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-folder-view.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/mail-folder-view.c b/src/mail-folder-view.c
+index 6d317a9..3ee3aa6 100644
+--- a/src/mail-folder-view.c
++++ b/src/mail-folder-view.c
+@@ -474,6 +474,7 @@ mail_folder_view_set_folder_uri (MailFolderView *mfv, const char *uri)
+ if (uri) {
+ str = g_strdup_printf("%s %s", _("Loading folder"), uri);
+ gtk_label_set_text (g_object_get_data((GObject *)mfv->priv->info_bar, "label"), str);
++ gtk_label_set_text ((GtkLabel *)mfv->priv->tab_str, str);
+ g_free(str);
+ mail_get_folder(uri, 0, mfv_got_folder, mfv, mail_msg_fast_ordered_push);
+ }
+--
+1.6.5.2
+
Added: experimental/anjal/debian/patches/upstream-004_Save-password-enabled-by-default.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-004_Save-password-enabled-by-default.patch?rev=1425&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-004_Save-password-enabled-by-default.patch (added)
+++ experimental/anjal/debian/patches/upstream-004_Save-password-enabled-by-default.patch Tue Nov 24 03:48:19 2009
@@ -1,0 +1,32 @@
+From ffd6d2c3ea09b7edc9732e559c9cec33097301a9 Mon Sep 17 00:00:00 2001
+Message-Id: <ffd6d2c3ea09b7edc9732e559c9cec33097301a9.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: Srinivasa Ragavan <sragavan at gnome.org>
+Date: Thu, 5 Nov 2009 15:45:01 +0000
+Subject: [PATCH 06/10] Save password enabled by default.
+
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-account-view.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/mail-account-view.c b/src/mail-account-view.c
+index 66a5c02..4e54dae 100644
+--- a/src/mail-account-view.c
++++ b/src/mail-account-view.c
+@@ -594,6 +594,10 @@ mail_account_view_construct (MailAccountView *view)
+ view->current_page = 0;
+ gtk_box_pack_start ((GtkBox *)view, view->scroll, TRUE, TRUE, 0);
+ view->edit = em_account_editor_new_for_pages (view->original, EMAE_PAGES, "org.gnome.evolution.mail.config.accountWizard", view->wpages);
++ if (!view->original) {
++ e_account_set_bool (view->edit->account, E_ACCOUNT_SOURCE_SAVE_PASSWD, TRUE);
++ e_account_set_bool (view->edit->account, E_ACCOUNT_TRANSPORT_SAVE_PASSWD, TRUE);
++ }
+ em_account_editor_check (view->edit, mail_account_pages[0].path);
+ view->pages[0]->done = TRUE;
+
+--
+1.6.5.2
+
Added: experimental/anjal/debian/patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch?rev=1425&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch (added)
+++ experimental/anjal/debian/patches/upstream-006_BUGFIX-GNOME-Bugzill-600691-Remember-settings-for-Reply.patch Tue Nov 24 03:48:19 2009
@@ -1,0 +1,99 @@
+From 877290fc4378d3d15771c5dd733dae7fec023c31 Mon Sep 17 00:00:00 2001
+Message-Id: <877290fc4378d3d15771c5dd733dae7fec023c31.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: Srinivasa Ragavan <sragavan at gnome.org>
+Date: Fri, 6 Nov 2009 15:08:27 +0000
+Subject: [PATCH 08/10] BUGFIX: GNOME Bugzill #600691 - Remember settings for Reply [all] Forward
+
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ src/mail-message-view.c | 36 ++++++++++++++++++++++++++++++++++--
+ 1 files changed, 34 insertions(+), 2 deletions(-)
+
+diff --git a/src/mail-message-view.c b/src/mail-message-view.c
+index b30442d..930b48c 100644
+--- a/src/mail-message-view.c
++++ b/src/mail-message-view.c
+@@ -77,7 +77,9 @@ struct _MailMessageViewPrivate {
+ GtkWidget *attach_area;
+ GtkWidget *html_headers;
+ GtkWidget *table_headers;
+-
++ gboolean composer_changed;
++ char *composer_changed_text;
++ int composer_text_length;
+ char *folder_uri;
+ };
+
+@@ -114,6 +116,10 @@ mail_message_view_init (MailMessageView *shell)
+ shell->priv->mode = -2;
+ shell->composer = NULL;
+ shell->priv->show_composer = FALSE;
++ shell->priv->composer_changed = FALSE;
++ shell->priv->composer_changed_text = NULL;
++ shell->priv->composer_text_length = 0;
++
+ }
+
+ static void
+@@ -410,6 +416,15 @@ discard_composer_cb (GtkWidget *w, MailMessageView *mmv)
+ {
+ gtk_widget_hide (mmv->frame);
+ gtk_widget_hide (mmv->cbox);
++ if (mmv->composer && (gtkhtml_editor_get_changed (GTKHTML_EDITOR(mmv->composer)) || mmv->priv->composer_changed)) {
++ if (mmv->priv->composer_changed_text) {
++ g_free (mmv->priv->composer_changed_text);
++ mmv->priv->composer_changed_text = NULL;
++ mmv->priv->composer_text_length = 0;
++ }
++ mmv->priv->composer_changed_text = gtkhtml_editor_get_text_html (GTKHTML_EDITOR(mmv->composer), (gsize *)&mmv->priv->composer_text_length);
++ mmv->priv->composer_changed = TRUE;
++ }
+ if (mmv->comp_view)
+ gtk_widget_hide (mmv->comp_view);
+ if (mmv->composer)
+@@ -427,6 +442,18 @@ discard_composer_cb (GtkWidget *w, MailMessageView *mmv)
+ }
+
+ static void
++wrap_discard_composer_cb (GtkWidget *w, MailMessageView *mmv)
++{
++ discard_composer_cb (w, mmv);
++ if (mmv->priv->composer_changed_text) {
++ g_free (mmv->priv->composer_changed_text);
++ mmv->priv->composer_changed_text = NULL;
++ mmv->priv->composer_text_length = 0;
++ }
++ mmv->priv->composer_changed = FALSE;
++}
++
++static void
+ mmv_mail_send (struct _EMsgComposer *composer, MailMessageView *mmv)
+ {
+ gtk_widget_hide (mmv->frame);
+@@ -499,6 +526,11 @@ construct_reply_composer (MailMessageView *mmv, int mode)
+ mmv->composer = (GtkWidget *)em_utils_reply_to_message (mmv->priv->folder, mmv->priv->uid, mmv->priv->msg, mode, mmv->efwd);
+ else
+ mmv->composer = (GtkWidget *)em_utils_forward_message (mmv->priv->msg, mmv->priv->folder_uri);
++ g_assert (mmv->composer);
++ if (mmv->priv->composer_changed_text && mmv->priv->composer_text_length > 0 && mmv->priv->composer_changed) {
++ gtkhtml_editor_set_text_html (GTKHTML_EDITOR(mmv->composer), mmv->priv->composer_changed_text, mmv->priv->composer_text_length);
++ }
++ gtkhtml_editor_set_changed (GTKHTML_EDITOR(mmv->composer), FALSE);
+ mmv->comp_view = g_object_get_data((GObject *)mmv->composer,"vbox");
+ gtk_widget_reparent (mmv->comp_view, box);
+ gtk_widget_set_size_request (mmv->comp_view, -1, 400);
+@@ -1377,7 +1409,7 @@ mail_message_view_set_message (MailMessageView *mmview, CamelFolder *folder, con
+ gtk_box_pack_start ((GtkBox *)mmview->footer, forward, FALSE, FALSE, 12);
+
+ mmview->discard = gtk_button_new_with_label (_("Discard"));
+- g_signal_connect (mmview->discard, "clicked", G_CALLBACK (discard_composer_cb), mmview);
++ g_signal_connect (mmview->discard, "clicked", G_CALLBACK (wrap_discard_composer_cb), mmview);
+ gtk_widget_hide (mmview->discard);
+ gtk_box_pack_end ((GtkBox *)mmview->footer, mmview->discard, FALSE, FALSE, 12);
+
+--
+1.6.5.2
+
Added: experimental/anjal/debian/patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/anjal/debian/patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch?rev=1425&op=file
==============================================================================
--- experimental/anjal/debian/patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch (added)
+++ experimental/anjal/debian/patches/upstream-007_BUGFIX-GNOME-Bug-592294-Use-pkgconfig-for-EVOLUTION2.patch Tue Nov 24 03:48:19 2009
@@ -1,0 +1,50 @@
+From 60407aabee8b0face4bc319c91efd93180caa2d1 Mon Sep 17 00:00:00 2001
+Message-Id: <60407aabee8b0face4bc319c91efd93180caa2d1.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: Wed, 11 Nov 2009 17:18:51 +0800
+Subject: [PATCH 10/10] BUGFIX: GNOME Bug #592294 - Use pkgconfig for EVOLUTION228_PRIVDATADIR
+
+Evolution's datadir may be different from the datadir of Anjal. We
+should not use Anjal's datadir to access Evolution's data
+files. Instead, we should use pkg-config.
+(cherry picked from commit 88ea7f358767034e2ddf24306dcd8c52499b2552)
+
+Signed-off-by: Yan Li <yanli at infradead.org>
+---
+ configure.ac | 2 ++
+ src/Makefile.am | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c12a5cb..a77b399 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,8 @@ AC_SUBST(imagesdir)
+ evolutioncomponentdir=`pkg-config --variable=componentdir evolution-shell`
+ AC_SUBST(evolutioncomponentdir)
+
++evolutiondatadir=`pkg-config --variable=datadir evolution-shell`
++AC_SUBST(evolutiondatadir)
+
+ dnl ***************************************************************************
+ dnl Internatinalization
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 58c9625..0ae44bb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+- -DEVOLUTION226_PRIVDATADIR=\""$(datadir)/evolution/2.26/"\" \
+- -DEVOLUTION228_PRIVDATADIR=\""$(datadir)/evolution/2.28/"\" \
++ -DEVOLUTION226_PRIVDATADIR=\""$(evolutiondatadir)/evolution/2.26/"\" \
++ -DEVOLUTION228_PRIVDATADIR=\""$(evolutiondatadir)/evolution/2.28/"\" \
+ -DANJAL_IMAGEDIR=\""$(datadir)/anjal/images/"\" \
+ $(ANJAL_CFLAGS) -I. \
+ $(MOZILLA_CFLAGS) \
+--
+1.6.5.2
+
More information about the pkg-evolution-commits
mailing list