X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-default-account-settings-dialog.c;h=75a0226a2c33e408c630138beb477540f625c7db;hb=601dda9cd13b952988d28a8f87f63a6a3ed84be8;hp=24b854f3843feb911e4bd5589aee26d8a848326b;hpb=51372832576ac3b1423ee599cc5b142aabdebd42;p=modest

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 24b854f..75a0226 100644
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -458,7 +458,7 @@ on_button_signature (GtkButton *button, gpointer user_data)
 
 	/* Show the window: */	
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-				     GTK_WINDOW (priv->signature_dialog));
+				     GTK_WINDOW (priv->signature_dialog), GTK_WINDOW (self));
 
 	response = gtk_dialog_run (GTK_DIALOG (priv->signature_dialog));
 	gtk_widget_hide (priv->signature_dialog);
@@ -673,7 +673,7 @@ on_check_button_clicked (GtkButton *button, gpointer user_data)
 	GtkWidget *widget = GTK_WIDGET (user_data);
 	
 	/* Enable the widget only if the check button is active: */
-	const gboolean enable = hildon_check_button_get_active (button);
+	const gboolean enable = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button));
 	gtk_widget_set_sensitive (widget, enable);
 }
 
@@ -703,7 +703,7 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
 	modest_connection_specific_smtp_window_fill_with_connections (smtp_win, priv->account_manager);
 
 	/* Show the window: */	
-	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win));
+	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win), GTK_WINDOW (self));
 	gtk_widget_show (GTK_WIDGET (smtp_win));
 	priv->modified = TRUE;
 }
@@ -762,7 +762,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self)
 	/* connection-specific checkbox: */
 	if (!priv->checkbox_outgoing_smtp_specific) {
 		priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (MODEST_EDITABLE_SIZE);
-		hildon_check_button_set_active (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), 
+		hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific), 
 			FALSE);
 	}
 	caption = create_captioned (self, sizegroup, _("mcen_fi_advsetup_connection_smtp"), 
@@ -1112,7 +1112,7 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo
 		modest_account_settings_get_retrieve_limit (settings));
 	
 	
-	hildon_check_button_set_active (GTK_BUTTON (priv->checkbox_leave_messages), 
+	hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages), 
 					modest_account_settings_get_leave_messages_on_server (settings));
 	
 
@@ -1195,7 +1195,7 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo
 		const gboolean has_specific = 
 			modest_account_settings_get_use_connection_specific_smtp (settings);
 		hildon_check_button_set_active (
-			GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), 
+			HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific), 
 			has_specific);
 		g_object_unref (outgoing_account);
 	}
@@ -1262,7 +1262,7 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog)
 		MODEST_LIMIT_RETRIEVE_PICKER (priv->limit_retrieve_picker));
 	modest_account_settings_set_retrieve_limit (priv->settings, retrieve_limit);
 	
-	leave_on_server = hildon_check_button_get_active (GTK_BUTTON (priv->checkbox_leave_messages));
+	leave_on_server = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages));
 	modest_account_settings_set_leave_messages_on_server (priv->settings, leave_on_server); 
 
 	store_settings = modest_account_settings_get_store_settings (priv->settings);
@@ -1307,7 +1307,7 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog)
 	/* Save connection-specific SMTP server accounts: */
 	modest_account_settings_set_use_connection_specific_smtp 
 		(priv->settings, 
-		 hildon_check_button_get_active(GTK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+		 hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
 
 	/* this configuration is not persistent, we should not save */
 	if (account_name != NULL)