Merge lp:~rodrigo-moya/ubuntu/natty/evolution/fix-717971 into lp:~ubuntu-desktop/evolution/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-28 18:33:03 +0000
+++ debian/changelog	2011-03-23 13:44:55 +0000
@@ -1,3 +1,10 @@
+evolution (2.32.2-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/95-git-04-express_acount_setup_5a25840.patch:
+    - Remove unneeded patch that was getting the wrong widget (LP: #717971)
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 17 Mar 2011 13:14:30 +0100
+
 evolution (2.32.2-0ubuntu3) natty; urgency=low
 
   * debian/evolution-plugins.install: Re-add the face plugin that was dropped

=== removed file 'debian/patches/95-git-04-express_acount_setup_5a25840.patch'
--- debian/patches/95-git-04-express_acount_setup_5a25840.patch	2011-02-07 03:55:05 +0000
+++ debian/patches/95-git-04-express_acount_setup_5a25840.patch	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-From 5a25840bbb20a1b29cd574a4cdde96faae8fb594 Mon Sep 17 00:00:00 2001
-From: Punit Jain <[e-mail]>
-Date: Wed, 01 Dec 2010 09:09:33 +0000
-Subject: Bug #636058 - Account setup issues express mode.
-
-Widget name required to update.
----
-Index: evolution-2.32.2/capplet/settings/mail-account-view.c
-===================================================================
---- evolution-2.32.2.orig/capplet/settings/mail-account-view.c	2010-10-15 08:18:35.000000000 +1100
-+++ evolution-2.32.2/capplet/settings/mail-account-view.c	2011-02-07 14:33:44.369160879 +1100
-@@ -1053,9 +1053,9 @@
- 
- 	shell = e_shell_get_default ();
- 	if (!shell || e_shell_get_express_mode (shell)) {
--		GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table");
-+		GtkWidget *table = em_account_editor_get_widget (view->edit, "identity-required-table");
- 		GtkWidget *label, *pwd;
--		gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame"));
-+		gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity-optional-section"));
- 
- 		if (!view->original) {
- 			label = gtk_label_new (_("Password:"));
-Index: evolution-2.32.2/doc/reference/shell/tmpl/e-shell.sgml
-===================================================================
---- evolution-2.32.2.orig/doc/reference/shell/tmpl/e-shell.sgml	2011-02-06 17:23:32.000000000 +1100
-+++ evolution-2.32.2/doc/reference/shell/tmpl/e-shell.sgml	2011-02-07 14:33:44.369160879 +1100
-@@ -75,14 +75,6 @@
- @eshell: the object which received the signal.
- @Param2: 
- 
--<!-- ##### SIGNAL EShell::send-receive ##### -->
--<para>
--
--</para>
--
--@eshell: the object which received the signal.
--@arg1: 
--
- <!-- ##### SIGNAL EShell::window-created ##### -->
- <para>
- 
-@@ -260,15 +252,6 @@
- @Returns: 
- 
- 
--<!-- ##### FUNCTION e_shell_send_receive ##### -->
--<para>
--
--</para>
--
--@shell: 
--@parent: 
--
--
- <!-- ##### FUNCTION e_shell_get_meego_mode ##### -->
- <para>
- 
-Index: evolution-2.32.2/doc/reference/shell/tmpl/eshell-unused.sgml
-===================================================================
---- evolution-2.32.2.orig/doc/reference/shell/tmpl/eshell-unused.sgml	2011-02-06 17:23:32.000000000 +1100
-+++ evolution-2.32.2/doc/reference/shell/tmpl/eshell-unused.sgml	2011-02-07 14:33:44.369160879 +1100
-@@ -82,12 +82,27 @@
- e-shell-window.sgml
- 
- 
-+<!-- ##### SIGNAL EShell::send-receive ##### -->
-+<para>
-+
-+</para>
-+
-+@eshell: the object which received the signal.
-+@arg1: 
-+
- <!-- ##### ARG EShellSearchbar:label-visible ##### -->
- <para>
- 
- </para>
- 
- 
-+<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEND_RECEIVE ##### -->
-+<para>
-+
-+</para>
-+
-+@window: 
-+
- <!-- ##### MACRO E_SHELL_WINDOW_ACTION_SYNC_OPTIONS ##### -->
- <para>
- 
-@@ -135,3 +150,11 @@
- @searchbar: 
- @label_visible: 
- 
-+<!-- ##### FUNCTION e_shell_send_receive ##### -->
-+<para>
-+
-+</para>
-+
-+@shell: 
-+@parent: 
-+
-Index: evolution-2.32.2/doc/reference/shell/tmpl/shell-actions.sgml
-===================================================================
---- evolution-2.32.2.orig/doc/reference/shell/tmpl/shell-actions.sgml	2011-02-06 17:23:32.000000000 +1100
-+++ evolution-2.32.2/doc/reference/shell/tmpl/shell-actions.sgml	2011-02-07 14:33:44.369160879 +1100
-@@ -180,14 +180,6 @@
- @window: 
- 
- 
--<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEND_RECEIVE ##### -->
--<para>
--
--</para>
--
--@window: 
--
--
- <!-- ##### MACRO E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR ##### -->
- <para>
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-25 16:30:40 +0000
+++ debian/patches/series	2011-03-23 13:44:55 +0000
@@ -16,7 +16,6 @@
 95-git-01-no_recipient_meetings_d545307.patch
 95-git-02-empty_trash_on_exit_30427e1.patch
 95-git-03-ctrl-r_nntp_focus_new_msg_f5562e9.patch
-95-git-04-express_acount_setup_5a25840.patch
 95-git-05-crash_in_mini_cal_view_5549b33.patch
 95-git-07-freebusy_invalid_writes_750abd6.patch
 95-git-08-open_meeting_as_meeting_0efc5f6.patch