+2007-05-17 Murray Cumming <murrayc@murrayc.com>
+
+ * src/maemo/modest-connection-specific-smtp-edit-window.h:
+ * src/maemo/modest-connection-specific-smtp-edit-window.c:
+ (modest_connection_specific_smtp_edit_window_init),
+ Do not try to connect to a combobox signal before the combobox exists.
+ This fixes the cras in projects.maemo.org bug NB#56288 .
+ (modest_connection_specific_smtp_edit_window_get_settings):
+ Remove the server_account_name parameter which was being checked for NULL
+ though it was not used.
+
+ * src/maemo/modest-connection-specific-smtp-window.c:
+ (modest_connection_specific_smtp_window_fill_with_connections),
+ (on_button_edit), (modest_connection_specific_smtp_window_init):
+ Correct the number of treemodel columns to prevent a warning.
+ Added DEBUG_WITHOUT_LIBCONIC #define, for debugging on scratchbox, where
+ libconic does not work.
+
2007-05-16 Murray Cumming <murrayc@murrayc.com>
* src/modest-tny-account.c:
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
- /* Show a default port number when the security method changes, as per the UI spec: */
- g_signal_connect (G_OBJECT (priv->combo_outgoing_security), "changed", (GCallback)on_combo_security_changed, self);
-
-
/* The secure authentication widgets: */
if (!priv->combo_outgoing_auth)
priv->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
+ /* Show a default port number when the security method changes, as per the UI spec: */
+ g_signal_connect (G_OBJECT (priv->combo_outgoing_security), "changed", (GCallback)on_combo_security_changed, self);
+
/* Add the buttons: */
gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
ModestServerAccountData*
modest_connection_specific_smtp_edit_window_get_settings (
ModestConnectionSpecificSmtpEditWindow *window,
- ModestAccountMgr *account_manager, const gchar* server_account_name)
+ ModestAccountMgr *account_manager)
{
ModestConnectionSpecificSmtpEditWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
- g_assert (server_account_name);
-
/* Use g_slice_new0(), because that's what modest_account_mgr_free_server_account_data()
* expects us to use. */
ModestServerAccountData *result = g_slice_new0 (ModestServerAccountData);
object_class->finalize = modest_connection_specific_smtp_window_finalize;
}
+/* libconic does not return a list of connections in scratchbox,
+ * so enable this to put a fake row in the list,
+ * so we can test other parts of the code. */
+/* #define DEBUG_WITHOUT_LIBCONIC 1 */
+
void
modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSpecificSmtpWindow *self, ModestAccountMgr *account_manager,
const gchar* account_name)
TnyDevice *device = modest_runtime_get_device ();
g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+ /* Get the list of Internet Access Points: */
+ #ifdef DEBUG_WITHOUT_LIBCONIC
+ GSList *list_iaps = g_slist_append(NULL, (gpointer)1);
+ #else
TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
+ GSList *list_iaps = tny_maemo_conic_device_get_iap_list (maemo_device);
+ #endif
- /* Get the list of Internet Access Points: */
- GSList* list_iaps = tny_maemo_conic_device_get_iap_list (maemo_device);
printf("debug: list_iaps=%p, list_iaps size = %d\n", list_iaps, g_slist_length(list_iaps));
GSList* iter = list_iaps;
while (iter) {
ConIcIap *iap = (ConIcIap*)iter->data;
if (iap) {
+ #ifdef DEBUG_WITHOUT_LIBCONIC
+ const gchar *name = "debug name";
+ const gchar *id = "debug id";
+ #else
const gchar *name = con_ic_iap_get_name (iap);
const gchar *id = con_ic_iap_get_id (iap);
+ #endif
+
printf ("debug: iac name=%s, id=%s\n", name, id);
/* Get any already-associated connection-specific server account: */
iter = g_slist_next (iter);
}
+ #ifndef DEBUG_WITHOUT_LIBCONIC
if (list_iaps)
tny_maemo_conic_device_free_iap_list (maemo_device, list_iaps);
+ #endif
update_model_server_names (self);
}
MODEL_COL_SERVER_ACCOUNT_DATA, &data,
-1);
+ printf("DEBUG: %s: BEFORE: connection-specific server_account_name=%s\n", __FUNCTION__, server_account_name);
/* TODO: Is 0 an allowed libconic IAP ID?
* If not then we should check for it. */
}
/* Get the new account data and save it in the row for later:
- * We free this in finalize(). */
+ * We free this in finalize(),
+ * and save it to our configuration in
+ * modest_connection_specific_smtp_window_save_server_accounts(). */
data = modest_connection_specific_smtp_edit_window_get_settings (
MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (window),
- priv->account_manager, server_account_name);
+ priv->account_manager);
+
gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
- MODEL_COL_SERVER_ACCOUNT_DATA, data,
- -1);
+ MODEL_COL_SERVER_ACCOUNT_DATA, data,
+ -1);
}
}
* with a string for the name, a string for the server name, and an int for the ID.
* This must match our MODEL_COLS enum constants.
*/
- priv->model = GTK_TREE_MODEL (gtk_list_store_new (4,
+ priv->model = GTK_TREE_MODEL (gtk_list_store_new (5,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER));
/* Setup the tree view: */
projects / modest / commitdiff