[meego-commits] 24710: Changes to MeeGo:1.2.0:CedarTrail:oss/evolution

[Srinivasa Ragavan]

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

Thank You,
Srinivasa Ragavan

[This message was auto-generated]

---

Request #24710:

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


Message:
    * Tue Jan 5 2012 Srinivasa Ragavan <srini at linux.intel.com>  - 2.32.3
- BMC #24398: Fix addressbook where a new addressbook incorrectly imports previous contacts. (Patch from Roger Luo)

State:   new          2012-01-04T22:45:33 srini
Comment: None



changes files:
--------------
--- evolution.changes
+++ evolution.changes
@@ -0,0 +1,3 @@
+* Tue Jan 5 2012 Srinivasa Ragavan <srini at linux.intel.com>  - 2.32.3
+- BMC #24398: Fix addressbook where a new addressbook incorrectly imports previous contacts. (Patch from Roger Luo)
+

new:
----
  fix-bmc-24398-create-addressbook-wrongly.patch

spec files:
-----------
--- evolution.spec
+++ evolution.spec
@@ -65,6 +65,7 @@
 Patch18: fix-capplet-window-3874.diff
 Patch19: evoluition-fix-BMC20191.patch
 Patch20: fix-bmc-9001-incorrect-send-progress-status.patch
+Patch21: fix-bmc-24398-create-addressbook-wrongly.patch
 
 ## Dependencies ###
 
@@ -193,6 +194,7 @@
 %patch18 -p1 -b .fix-capplet-window
 %patch19 -p1 -b .evoluition-fix-BMC20191
 %patch20 -p1 -b .fix-bmc-9001-incorrect-send-progress-status
+%patch21 -p1 -b .fix-bmc-24398-create-incorrect-addressbook
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib

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

++++++ fix-bmc-24398-create-addressbook-wrongly.patch (new)
--- fix-bmc-24398-create-addressbook-wrongly.patch
+++ fix-bmc-24398-create-addressbook-wrongly.patch
+diff -ruN a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
+--- a/modules/addressbook/addressbook-config.c	2011-12-20 13:42:13.490921500 +0800
++++ b/modules/addressbook/addressbook-config.c	2011-12-20 15:11:30.047084700 +0800
+@@ -1233,9 +1233,16 @@
+ 	else
+ 		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("New Address Book"));
+ 
++    /*Roger <rogerluo at linpus.com> 2011-12-21 BMC#24398
++     *The EConfig to be commited don't have the relative_uri.
++     *So it cause all new addressbook point to the same db file.
++     *It lead to the bug happen.
++     *So add statement "e_source_set_relative_uri..." to set relative_uri by uid when create addressbook, then fix BMC#24398.
++     */
+ 	/* forces initial validation */
+-	if (!sdialog->original_source)
+-		e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
+-
++	if (!sdialog->original_source)  {
++        e_source_set_relative_uri (sdialog->source, e_source_peek_uid (sdialog->source));
++        e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
++    }
+ 	return sdialog->window;
+ }
+