gtk_widget_destroy(DenyDialog);
}
-gchar *gtk_combo_box_get_entry_text (GtkWidget *combobox)
+gchar *get_text_from_combobox (GtkWidget *combobox)
{
/* Remember to free the returned variable after usage! */
gboolean advance_sanity_check(GtkWindow *parent, GladeXML *glade_xml, gint cp)
{
GtkDialog *DenyDialog;
- gchar *bla;
+ gchar *tmptext;
/* FIXME:
* all calls to wizard_missing_notification lack the parent window.
{
case 0:
/* Only needed if the "mailbox name" field is used in the first page of the wizard.
- *if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWMailboxnameEntry"))))==0)
- *{
- * wizard_missing_notification(NULL, "Please enter mailbox name");
- * return FALSE;
- *}
+ * if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWMailboxnameEntry"))))==0)
+ * {
+ * wizard_missing_notification(NULL, "Please enter mailbox name");
+ * return FALSE;
+ * }
*/
- bla=gtk_combo_box_get_active_text(GTK_COMBO_BOX(glade_xml_get_widget(glade_xml, "AWMailboxtypeComboBox")));
- if (bla==NULL)
+ tmptext=gtk_combo_box_get_active_text(GTK_COMBO_BOX(glade_xml_get_widget(glade_xml, "AWMailboxtypeComboBox")));
+ if (tmptext==NULL)
{
- wizard_missing_notification(NULL, "Please select mailbox type");
+ wizard_missing_notification(NULL, "Please select mailbox type.");
return FALSE;
}
+ free(tmptext);
return TRUE;
break;
case 1:
if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWUserNameEntry"))))==0)
{
- wizard_missing_notification(NULL, "Please enter user name");
+ wizard_missing_notification(NULL, "Please enter user name.");
return FALSE;
}
if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWEMailAddressEntry"))))==0)
{
- wizard_missing_notification(NULL, "Please enter the E-Mail address");
+ wizard_missing_notification(NULL, "Please enter the E-Mail address.");
+ return FALSE;
+ }
+ return TRUE;
+ break;
+ case 2:
+ if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWInServerComboEntry"))))==0)
+ {
+ wizard_missing_notification(NULL, "Please specify incoming server adress.");
+ return FALSE;
+ }
+ if (strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWOutServerComboEntry"))))==0)
+ {
+ wizard_missing_notification(NULL, "Please specify outgoing server address.");
return FALSE;
}
return TRUE;
return FALSE;
}
-void on_new_account1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+gboolean wizard_account_add(GladeXML *glade_xml, ModestUIPrivate *priv)
+{
+ ModestAccountMgr *acc_mgr;
+ ModestIdentityMgr *id_mgr;
+ const gchar *account_name="default";
+ ModestConf *conf=priv->modest_conf;
+ gchar *tmptext;
+
+ g_return_if_fail (conf);
+
+ acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (conf));
+ if (!acc_mgr) {
+ g_warning ("failed to instantiate account mgr");
+ return;
+ }
+
+ if (modest_account_mgr_account_exists (acc_mgr, account_name, NULL)) {
+ if (!modest_account_mgr_remove_account(acc_mgr, account_name, NULL)) {
+ g_warning ("could not delete existing account");
+ }
+ }
+
+ if (!modest_account_mgr_add_account (acc_mgr, account_name, "defaultstore", "defaulttransport", NULL))
+ g_warning ("failed to add default account");
+ else
+ {
+ tmptext=get_text_from_combobox(glade_xml_get_widget(glade_xml, "AWMailboxtypeComboBox"));
+ modest_account_mgr_add_server_account (acc_mgr, "defaultstore",
+ gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWInServerComboEntry"))),
+ gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWUserNameEntry"))),
+ NULL,
+ tmptext);
+ free(tmptext);
+ modest_account_mgr_add_server_account (acc_mgr, "defaulttransport",
+ gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWOutServerComboEntry"))),
+ NULL,
+ NULL,
+ "smtp");
+
+ }
+ id_mgr = MODEST_IDENTITY_MGR(modest_identity_mgr_new (conf));
+ if (modest_identity_mgr_identity_exists(id_mgr, "defaultidentity", NULL)) {
+ if (!modest_identity_mgr_remove_identity(id_mgr, "defaultidentity", NULL)) {
+ g_warning ("could not delete existing default identity");
+ }
+ }
+ if (!modest_identity_mgr_add_identity (id_mgr,
+ MODEST_IDENTITY_DEFAULT_IDENTITY,
+ gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWEMailAddressEntry"))),
+ "", "", FALSE, NULL, FALSE ))
+ g_warning ("failed to add default identity");
+
+ g_object_unref (G_OBJECT(acc_mgr));
+ g_object_unref (G_OBJECT(id_mgr));
+
+}
+
+
+void wizard_account_dialog(ModestUI *modest_ui)
{
GladeXML *glade_xml;
GtkWidget *dialog;
GtkWidget *awidget;
gint cp;
gint result;
- gint finishallowed=0;
+ gint finishallowed=0;
+ gboolean account_added_successfully;
- priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
+ priv = MODEST_UI_GET_PRIVATE(MODEST_UI(modest_ui));
glade_xml = glade_xml_new(MODEST_GLADE, "account_wizard", NULL);
gtk_widget_set_sensitive(FinishButton, FALSE);
do
- {
+ {
cp=gtk_notebook_get_current_page(GTK_NOTEBOOK(Notebook));
switch (cp)
{
gtk_widget_set_sensitive(NextButton, FALSE);
break;
default:
- g_error("I'm on page %d of notebook AWNotebook, which shouldn't have happened. Pulling Emeregency breaks.", cp);
+ g_error("I'm on page %d of notebook AWNotebook, which shouldn't have happened. Pulling emergency breaks.", cp);
break;
}
break;
case 2:
gtk_notebook_prev_page(GTK_NOTEBOOK(Notebook));
- break;
+ break;
+ case GTK_RESPONSE_ACCEPT:
+ account_added_successfully=wizard_account_add(glade_xml, priv);
+ break;
+ default:
+ account_added_successfully=FALSE;
}
}
- while(result!=GTK_RESPONSE_DELETE_EVENT && result!=GTK_RESPONSE_ACCEPT && result!=GTK_RESPONSE_CANCEL);
-
- if (result==GTK_RESPONSE_ACCEPT)
- {
- /* Do someting with the DATA from the widget */
- }
+ while(result!=GTK_RESPONSE_DELETE_EVENT && result!=GTK_RESPONSE_CANCEL && account_added_successfully!=TRUE);
gtk_widget_destroy(dialog);
g_object_unref(glade_xml);
}
+void new_wizard_account (GtkWidget *widget,
+ gpointer user_data)
+{
+ /* for now: */
+ wizard_account_dialog(MODEST_UI(user_data));
+}
+
projects / modest / blobdiff