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

Fri Jan 6 07:24:16 UTC 2012

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 #24716:

  submit:   home:srini:branches:MeeGo:1.2.0:oss:Update:Testing/evolution(r2)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/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) and add missing patches from CDT repo.
- BMC #24289: Update fix-capplet-window-3874.diff to close window on delete event.
- BMC #3784: Make the evolution shell appear before the assistant quits to avoid it hide.
- Update express-plugin-bmc-23502.patch to avoid a regression.

State:   new          2012-01-05T23:01:08 srini
Comment: None



changes files:
--------------

--- evolution.changes
+++ evolution.changes
@@ -0,0 +1,6 @@
+* 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) and add missing patches from CDT repo.
+- BMC #24289: Update fix-capplet-window-3874.diff to close window on delete event.
+- BMC #3784: Make the evolution shell appear before the assistant quits to avoid it hide.
+- Update express-plugin-bmc-23502.patch to avoid a regression.
+

new:
----
  fix-bmc-24398-create-addressbook-wrongly.patch
  fix-capplet-window-3874.diff

spec files:
-----------
--- evolution.spec
+++ evolution.spec
@@ -64,6 +64,8 @@
 Patch17: fix-bmc-8969-google-contacts-refresh-interval.patch
 Patch18: evoluition-fix-BMC20191.patch
 Patch19: fix-bmc-9001-incorrect-send-progress-status.patch
+Patch20: fix-capplet-window-3874.diff
+Patch21: fix-bmc-24398-create-addressbook-wrongly.patch
 
 ## Dependencies ###
 
@@ -191,6 +193,8 @@
 %patch17 -p1 -b .fix-bmc-8969-google-contacts-refresh-interval
 %patch18 -p1 -b .evoluition-fix-BMC20191
 %patch19 -p1 -b .fix-bmc-9001-incorrect-send-progress-status
+%patch20 -p1 -b .fix-capplet-window
+%patch21 -p1 -b .fix-bmc-24398-create-incorrect-addressbook
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib

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

++++++ express-plugin-bmc-23502.patch
--- express-plugin-bmc-23502.patch
+++ express-plugin-bmc-23502.patch
@@ -291,13 +291,25 @@
  	} else if (((EConfig *)priv->config)->type == E_CONFIG_ASSISTANT) {
  		GtkWidget *page = emae_create_basic_assistant_page (emae, GTK_ASSISTANT (parent), "source_page");
  
-@@ -2747,7 +2765,11 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol
+@@ -2747,7 +2765,22 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol
  
  	w = e_builder_get_widget (builder, item->label);
  	if (emae->type == EMAE_PAGES) {
+-		gtk_box_pack_start ((GtkBox *)emae->pages[3], w, TRUE, TRUE, 0);
 +		GtkWidget *page = emae_create_basic_assistant_page (emae, GTK_ASSISTANT (parent), "transport_page");
++		GtkWidget *vbox, *child;
 +
- 		gtk_box_pack_start ((GtkBox *)emae->pages[3], w, TRUE, TRUE, 0);
++		child = g_object_get_data (emae->pages[3], "old-child");
++		if (child) 
++			gtk_container_remove (emae->pages[3], child);
++
++		vbox = gtk_vbox_new (FALSE, 12);
++		gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
++		gtk_widget_show (vbox);
++		gtk_box_pack_start ((GtkBox *)vbox, w, TRUE, TRUE, 0);
++		g_object_set_data (emae->pages[3], "old-child", vbox);
++
++		gtk_box_pack_start ((GtkBox *)emae->pages[3], vbox, TRUE, TRUE, 0);
 +
 +		w = page;
  	} else if (((EConfig *)priv->config)->type == E_CONFIG_ASSISTANT) {

++++++ 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;
+ }
+					
++++++ fix-capplet-window-3874.diff (new)
--- fix-capplet-window-3874.diff
+++ fix-capplet-window-3874.diff
+diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
+index 46201fb..0b1ba7f 100644
+--- a/capplet/settings/mail-capplet-shell.c
++++ b/capplet/settings/mail-capplet-shell.c
+@@ -172,9 +172,7 @@ mail_capplet_shell_quit (MailCappletShell *shell)
+ {
+ 	MailCappletShellPrivate *priv = shell->priv;
+ 
+-	if (priv->main_loop)
+-		gtk_main_quit();
+-	else
++	if (!priv->main_loop)
+ 		gtk_widget_hide ((GtkWidget *)shell);
+ }
+ 
+@@ -184,13 +182,16 @@ ms_delete_event (MailCappletShell *shell,
+ 		 gpointer data G_GNUC_UNUSED)
+ {
+ 	mail_capplet_shell_quit (shell);
++	gtk_main_quit();
+ }
+ 
+ static void
+ ms_show_post_druid (MailViewChild *mfv G_GNUC_UNUSED,
+ 		    MailCappletShell *shell)
+ {
+-	gtk_widget_destroy (GTK_WIDGET (shell));
++	gtk_main_quit ();
++	g_timeout_add_seconds (5, (GSourceFunc) gtk_widget_destroy, shell);
++	//gtk_widget_destroy (GTK_WIDGET (shell));
+ }
+ 
+ #define PACK_IN_TOOL(wid,icon)	{ GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0); wid = (GtkWidget *)gtk_tool_button_new (tbox, NULL); }
+diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
+index e1b8551..dfc1abe 100644
+--- a/modules/startup-wizard/evolution-startup-wizard.c
++++ b/modules/startup-wizard/evolution-startup-wizard.c
+@@ -499,9 +499,9 @@ startup_wizard_new_capplet (EStartupWizard *extension)
+ 
+ 	capplet = mail_capplet_shell_new (0, TRUE, TRUE);
+ 
+-	g_signal_connect (
++	/* g_signal_connect (
+ 		capplet, "destroy",
+-		G_CALLBACK (gtk_main_quit), NULL);
++		G_CALLBACK (gtk_main_quit), NULL); */
+ 
+ 	return capplet;
+ }
+@@ -528,16 +528,20 @@ startup_wizard_run (EStartupWizard *extension)
+ 
+ 	if (express_mode)
+ 		window = startup_wizard_new_capplet (extension);
+-	else
++	else {
+ 		window = startup_wizard_new_assistant (extension);
+-
+-	g_signal_connect (
+-		window, "delete-event",
+-		G_CALLBACK (startup_wizard_terminate), NULL);
++		g_signal_connect (
++			window, "delete-event",
++			G_CALLBACK (startup_wizard_terminate), NULL);
++	}
+ 
+ 	gtk_widget_show (window);
+ 
+ 	gtk_main ();
++
++	if (e_list_length (E_LIST (account_list)) <= 0)
++		exit(0);
++
+ }
+ 
+ static void

