aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-05-03 19:02:14 +0800
committerMilan Crha <mcrha@redhat.com>2012-05-03 19:02:14 +0800
commita5984501854e6625a92f6323cfef5aaea1225484 (patch)
tree1a52a9a41621ba96d44680c1fe26d4f6d97ee55a
parent55a83bbbaa1e78363f3c631f9f92b86c87ed80b5 (diff)
downloadgsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.tar
gsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.tar.gz
gsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.tar.bz2
gsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.tar.lz
gsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.tar.xz
gsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.tar.zst
gsoc2013-evolution-a5984501854e6625a92f6323cfef5aaea1225484.zip
Bug #669295 - Choice made for 'setup Google contact/calendar' is not remembered
-rw-r--r--mail/em-account-editor.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index a84691e48b..37133605f4 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -4915,6 +4915,12 @@ emae_update_review_page_for_google (EMAccountEditor *emae)
GtkWidget *container;
GtkWidget *widget;
gchar *markup;
+ gboolean can_contacts, can_calendar;
+
+ can_contacts = !emae->priv->gcontacts ||
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (emae->priv->gcontacts));
+ can_calendar = !emae->priv->calendar ||
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (emae->priv->calendar));
emae_destroy_widget (emae->priv->gcontacts);
emae_destroy_widget (emae->priv->calendar);
@@ -4935,14 +4941,14 @@ emae_update_review_page_for_google (EMAccountEditor *emae)
widget = gtk_check_button_new_with_mnemonic (
_("Setup Google con_tacts with Evolution"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), can_contacts);
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
emae->priv->gcontacts = widget;
gtk_widget_show (widget);
widget = gtk_check_button_new_with_mnemonic (
_("Setup Google ca_lendar with Evolution"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), can_calendar);
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
emae->priv->calendar = widget;
gtk_widget_show (widget);