[meego-commits] 24093: Changes to MeeGo:1.2.0:oss:Update:Testing/evolution

[Srinivasa Ragavan]

Hi,
I have made the following changes to evolution in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
Srinivasa Ragavan

[This message was auto-generated]

---

Request #24093:

  submit:   home:srini:branches:MeeGo:1.2.0:oss:Update:Testing/evolution(r2)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/evolution


Message:
    * Thu Sep 22 2011 Srinivasa Ragavan <srini at linux.intel.com> - 2.32.3
- Added birthday-date-avoid-future-bmc-22945.patch to fix bmc #22945
- Added calendar-single-instance-express-bmc-23119.patch to fix bmc #23119
- Added first-launch-contact-failure-bmc-23097.patch to fix bmc #23097

State:   new          2011-09-22T05:07:36 srini
Comment: None



changes files:
--------------
--- evolution.changes
+++ evolution.changes
@@ -0,0 +1,5 @@
+* Thu Sep 22 2011 Srinivasa Ragavan <srini at linux.intel.com> - 2.32.3
+- Added birthday-date-avoid-future-bmc-22945.patch to fix bmc #22945
+- Added calendar-single-instance-express-bmc-23119.patch to fix bmc #23119
+- Added first-launch-contact-failure-bmc-23097.patch to fix bmc #23097
+

new:
----
  birthday-date-avoid-future-bmc-22945.patch
  calendar-single-instance-express-bmc-23119.patch
  first-launch-contact-failure-bmc-23097.patch

spec files:
-----------
--- evolution.spec
+++ evolution.spec
@@ -56,6 +56,9 @@
 Patch9: 0001-Make-sure-the-contacts-container-is-scrollable-when-.patch
 Patch10: 0001-Limit-the-size-of-tab-labels-to-a-reasonable-size.patch
 Patch11: 0001-Do-not-duplicate-google-address-book.patch
+Patch12: birthday-date-avoid-future-bmc-22945.patch
+Patch13: calendar-single-instance-express-bmc-23119.patch
+Patch14: first-launch-contact-failure-bmc-23097.patch
 
 ## Dependencies ###
 
@@ -173,6 +176,9 @@
 %patch9 -p1 -b .0001-Make-sure-the-contacts-container-is-scrollable-when-
 %patch10 -p1 -b .0001-Limit-the-size-of-tab-labels-to-a-reasonable-size
 %patch11 -p1 -b .0001-Do-not-duplicate-google-address-book
+%patch12 -p1 -b .evolution-contact-22945
+%patch13 -p1 -b .evolution-calendar-23119
+%patch14 -p1 -b .evolution-contact-23097
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib

other changes:
--------------

++++++ birthday-date-avoid-future-bmc-22945.patch (new)
--- birthday-date-avoid-future-bmc-22945.patch
+++ birthday-date-avoid-future-bmc-22945.patch
+diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
+index 85558a2..9b1be97 100644
+--- a/addressbook/gui/contact-editor/e-contact-editor.c
++++ b/addressbook/gui/contact-editor/e-contact-editor.c
+@@ -3273,6 +3273,7 @@ e_contact_editor_is_valid (EABEditor *editor)
+ 	gboolean validation_error = FALSE;
+ 	EIterator *iter;
+ 	GString *errmsg = g_string_new (_("The contact data is invalid:\n\n"));
++	time_t bday, now = time (NULL);
+ 
+ 	widget = e_builder_get_widget (ce->builder, "dateedit-birthday");
+ 	if (!(e_date_edit_date_is_valid (E_DATE_EDIT (widget)))) {
+@@ -3280,6 +3281,13 @@ e_contact_editor_is_valid (EABEditor *editor)
+ 					e_contact_pretty_name (E_CONTACT_BIRTH_DATE));
+ 		validation_error = TRUE;
+ 	}
++	/* If valid, see if the birthday is a future date */
++	bday = e_date_edit_get_time (E_DATE_EDIT (widget));
++	if (bday > now) {
++		g_string_append_printf (errmsg, _("'%s' cannot be a future date"),
++					e_contact_pretty_name (E_CONTACT_BIRTH_DATE));
++		validation_error = TRUE;
++	}
+ 
+ 	widget = e_builder_get_widget (ce->builder, "dateedit-anniversary");
+ 	if (!(e_date_edit_date_is_valid (E_DATE_EDIT (widget)))) {

++++++ calendar-single-instance-express-bmc-23119.patch (new)
--- calendar-single-instance-express-bmc-23119.patch
+++ calendar-single-instance-express-bmc-23119.patch
+diff --git a/shell/e-shell.c b/shell/e-shell.c
+index a168e21..73d11ec 100644
+--- a/shell/e-shell.c
++++ b/shell/e-shell.c
+@@ -1464,6 +1464,32 @@ e_shell_create_shell_window (EShell *shell,
+ 			g_warning ("%s", error->message);
+ 			g_error_free (error);
+ 		}
++
++		if (shell->priv->express_mode) {
++			GList *watched_windows;
++
++			watched_windows = e_shell_get_watched_windows (shell);
++
++			/* Present the first EShellWindow showing 'view_name'. */
++			while (watched_windows != NULL) {
++				GtkWindow *window = GTK_WINDOW (watched_windows->data);
++
++				if (E_IS_SHELL_WINDOW (window)) {
++					const gchar *active_view;
++
++					active_view = e_shell_window_get_active_view (
++								E_SHELL_WINDOW (window));
++					if (g_strcmp0 (active_view, view_name) == 0) {
++						gtk_window_present (window);
++						return window;
++					}
++				}
++
++				watched_windows = g_list_next (watched_windows);
++			}
++
++		}
++
+ 	}
+ 
+ 	shell_window = e_shell_window_new (

++++++ first-launch-contact-failure-bmc-23097.patch (new)
--- first-launch-contact-failure-bmc-23097.patch
+++ first-launch-contact-failure-bmc-23097.patch
+diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
+index 1688d36..4a366a8 100644
+--- a/modules/addressbook/e-book-shell-backend.c
++++ b/modules/addressbook/e-book-shell-backend.c
+@@ -123,9 +123,11 @@ book_shell_backend_ensure_sources (EShellBackend *shell_backend)
+ 		e_source_group_add_source (on_this_computer, source, -1);
+ 		e_source_set_property (source, "completion", "true");
+ 		g_object_unref (source);
++		e_source_list_sync (priv->source_list, NULL);		
+ 	} else {
+ 		/* Force the source name to the current locale. */
+ 		e_source_set_name (personal, name);
++		e_source_list_sync (priv->source_list, NULL);		
+ 	}
+ 
+ 	g_object_unref (on_this_computer);