Changeset 2443

Timestamp:

07/10/07 13:33:41

Author:

murrayc

Message:

2007-07-10 Murray Cumming <murrayc@murrayc.com>

• • • • libtinymail/tny-account-store.h: alert_func vfunc:
        
      • libtinymail/tny-account-store.c: (tny_account_store_alert):
        
      • libtinymail-acap/tny-acap-account-store.c:
        

(tny_acap_account_store_alert):

• • • • libtinymail-camel/tny-session-camel.c:
        

(tny_session_camel_do_an_error), (tny_session_camel_alert_user),
(foreach_account_set_connectivity):

• • • • libtinymail-gnome-desktop/tny-gnome-account-store.c:
        

(tny_gnome_account_store_alert):

• • • • libtinymail-gpe/tny-gpe-account-store.c:
        

(tny_gpe_account_store_alert):

• • • • libtinymail-maemo/tny-maemo-account-store.c:
        

(tny_maemo_account_store_alert):

• • • • libtinymail-olpc/tny-olpc-account-store.c:
        

(tny_olpc_account_store_alert):

• • • • tests/shared/account-store.c: (tny_test_account_store_alert):
        

Add a TnyAcccount* parameter to the alert_func vfunc, so that
applications an show information about the account (and server)
that failed. This is documented as sometimes being NULL for current
implementations (see the *ssl.c comment below).

• • • • camel/camel-session.h:
        
      • camel/camel-session.c: (camel_session_alert_user),
        

(camel_session_alert_user_with_id),
(camel_session_alert_user_generic): Added a CamelService*
paramteter to these functions. For tinymail, this allows us to use

CamelService?

data to get the TnyAccount*.

• • • • camel/camel-disco-diary.c: (camel_disco_diary_log),
        

(diary_decode_folder):

• • • • camel/providers/imap/camel-imap-command.c:
        

(camel_imap_command_response), (camel_imap_command_response_idle):

• • • • camel/providers/imap4/camel-imap4-engine.c:
        

(camel_imap4_engine_parse_resp_code):

• • • • camel/providers/imap4/camel-imap4-summary.c:
        

(courier_imap_is_a_piece_of_shit):

• • • • camel/providers/smtp/camel-smtp-transport.c: (smtp_connect):
        

Pass the CamelService?

data to camel_session_alert_user*().

• • • • camel/camel-tcp-stream-openssl.c: (ssl_verify):
        
      • camel/camel-tcp-stream-ssl.c: (ssl_bad_cert): Pass NULL for
        

service_user_data because I cannot see a suitable CamelService?.
See the TODOs.

trunk/ChangeLog

@@ +1 @@
+2007-07-10  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail/tny-account-store.h: alert_func vfunc:
+        * libtinymail/tny-account-store.c: (tny_account_store_alert):
+        * libtinymail-acap/tny-acap-account-store.c:
+        (tny_acap_account_store_alert):
+        * libtinymail-camel/tny-session-camel.c:
+        (tny_session_camel_do_an_error), (tny_session_camel_alert_user),
+        (foreach_account_set_connectivity):
+        * libtinymail-gnome-desktop/tny-gnome-account-store.c:
+        (tny_gnome_account_store_alert):
+        * libtinymail-gpe/tny-gpe-account-store.c:
+        (tny_gpe_account_store_alert):
+        * libtinymail-maemo/tny-maemo-account-store.c:
+        (tny_maemo_account_store_alert):
+        * libtinymail-olpc/tny-olpc-account-store.c:
+        (tny_olpc_account_store_alert):
+        * tests/shared/account-store.c: (tny_test_account_store_alert):
+        Add a TnyAcccount* parameter to the alert_func vfunc, so that 
+        applications an show information about the account (and server) 
+        that failed. This is documented as sometimes being NULL for current 
+        implementations (see the *ssl.c comment below).
+
+        * camel/camel-session.h:
+        * camel/camel-session.c: (camel_session_alert_user),
+        (camel_session_alert_user_with_id),
+        (camel_session_alert_user_generic): Added a CamelService* 
+        paramteter to these functions. For tinymail, this allows us to use 
+        CamelService::data to get the TnyAccount*. 
+        * camel/camel-disco-diary.c: (camel_disco_diary_log),
+        (diary_decode_folder):
+        * camel/providers/imap/camel-imap-command.c:
+        (camel_imap_command_response), (camel_imap_command_response_idle):
+        * camel/providers/imap4/camel-imap4-engine.c:
+        (camel_imap4_engine_parse_resp_code):
+        * camel/providers/imap4/camel-imap4-summary.c:
+        (courier_imap_is_a_piece_of_shit):
+        * camel/providers/smtp/camel-smtp-transport.c: (smtp_connect):
+        Pass the CamelService::data to camel_session_alert_user*().
+        * camel/camel-tcp-stream-openssl.c: (ssl_verify):
+        * camel/camel-tcp-stream-ssl.c: (ssl_bad_cert): Pass NULL for 
+        service_user_data because I cannot see a suitable CamelService. 
+        See the TODOs.
+
-2007-07-10  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-acap/tny-acap-account-store.c

@@ -48 +48 @@
-
-static gboolean
-
-
-
-
+ccount *account, TnyA
+
+
+account, 
-}
-

trunk/libtinymail-camel/camel-lite/ChangeLog

@@ -1 @@
-
-
-
-Note: Please use this ChangeLog file only for merge changes (from upstream to
-this version, and the other way around). Changes to camel-lite that are

trunk/libtinymail-camel/camel-lite/camel/camel-disco-diary.c

@@ -203 +203 @@
-                camel_session_alert_user_generic (camel_service_get_session (CAMEL_SERVICE (diary->store)),
-                                          CAMEL_SESSION_ALERT_ERROR,
-
+, CAMEL_SERVICE (diary->store)->data
-                g_free (msg);
-
@@ -264 +264 @@
-                        camel_session_alert_user_generic (camel_service_get_session (CAMEL_SERVICE (diary->store)),
-                                                  CAMEL_SESSION_ALERT_WARNING,
-
+, CAMEL_SERVICE (diary->store)->data
-                        g_free (msg);
-                        g_free (name);

trunk/libtinymail-camel/camel-lite/camel/camel-session.c

@@ -415 +415 @@
- * @cancel: whether or not to provide a "Cancel" option in addition to
- * an "OK" option.
+ * @service: The CamelService.
- *
- * Presents an appropriate prompt to the user, in the style indicated by
@@ -424 +425 @@
-gboolean
-camel_session_alert_user (CamelSession *session, CamelSessionAlertType type,
-
+, CamelService *service
-{
-        g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);
-        g_return_val_if_fail (ex, FALSE);
-
-
+, service
-}
-
@@ -441 +442 @@
-gboolean
-camel_session_alert_user_with_id (CamelSession *session, CamelSessionAlertType type,
-
+, CamelService *service
-{
-        g_return_val_if_fail (message, FALSE);
@@ -447 +448 @@
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-        camel_exception_set (&ex, id, message);
-
+, service
-        camel_exception_clear (&ex);
-        return result;
@@ -462 +463 @@
-gboolean
-camel_session_alert_user_generic (CamelSession *session, CamelSessionAlertType type,
-
+, CamelService *service
-{
-        return camel_session_alert_user_with_id (session, type, 
-
+, service
-}
-

trunk/libtinymail-camel/camel-lite/camel/camel-session.h

@@ -97 +97 @@
-                                              CamelSessionAlertType type,
-                                              CamelException *ex,
-
+
+
-
-        CamelFilterDriver * (*get_filter_driver) (CamelSession *session,
@@ -154 +155 @@
-                                                     CamelSessionAlertType type,
-                                                     CamelException *ex,
-
+
+
-gboolean           camel_session_alert_user_generic (CamelSession *session,
-                                                     CamelSessionAlertType type,
-                                                     const gchar* message,
-
+
+
-gboolean           camel_session_alert_user_with_id (CamelSession *session,
-                                                     CamelSessionAlertType type,
-                                                     ExceptionId id,
-                                                     const gchar* message,
-
+
+
-
-gboolean           camel_session_is_online          (CamelSession *session);

trunk/libtinymail-camel/camel-lite/camel/camel-tcp-stream-openssl.c

@@ -861 +861 @@
-                                    cert_str, x509_strerror (err));
-        
-
+
+
+
-        g_free (prompt);
-        

trunk/libtinymail-camel/camel-lite/camel/camel-tcp-stream-ssl.c

@@ -1200 +1200 @@
-        
-                /* query the user to find out if we want to accept this certificate */
-
+
+
-                g_free(prompt);
-                if (accept) {
@@ -1243 +1244 @@
-                        prompt = g_strdup_printf(_("Certificate problem: %s\nIssuer: %s"), cert->subjectName, cert->issuerName);
-
-
+
+
-
-                                nick = get_nickname(cert);
@@ -1295 +1297 @@
-                        prompt = g_strdup_printf(_("Bad certificate domain: %s\nIssuer: %s"), cert->subjectName, cert->issuerName);
-
-
+
+
-                                host = SSL_RevealURL(sockfd);
-                                status = CERT_AddOKDomainName(cert, host);
@@ -1313 +1316 @@
-                        prompt = g_strdup_printf(_("Certificate expired: %s\nIssuer: %s"), cert->subjectName, cert->issuerName);
-
-
+
+
-                                cert->timeOK = PR_TRUE;
-                                status = CERT_VerifyCertNow(cert->dbhandle, cert, TRUE, certUsageSSLClient, NULL);
@@ -1330 +1334 @@
-                        prompt = g_strdup_printf(_("Certificate revocation list expired: %s\nIssuer: %s"), cert->subjectName, cert->issuerName);
-
-
+
+
-                                host = SSL_RevealURL(sockfd);
-                                status = CERT_AddOKDomainName(cert, host);

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c

@@ -445 +445 @@
-                        msg = g_strdup_printf(_("Alert from IMAP server %s@%s:\n%s"),
-                                              ((CamelService *)store)->url->user, ((CamelService *)store)->url->host, respbuf+12);
-
+
+
-                        g_free(msg);
-                }
@@ -506 +507 @@
-                        msg = g_strdup_printf(_("Alert from IMAP server %s@%s:\n%s"),
-                                              ((CamelService *)store)->url->user, ((CamelService *)store)->url->host, respbuf+12);
-
+
+
-                        g_free(msg);
-                } else if (!g_ascii_strncasecmp (respbuf, "* BAD Invalid tag",17))

trunk/libtinymail-camel/camel-lite/camel/providers/imap4/camel-imap4-engine.c

@@ -1031 +1031 @@
-                        goto exception;
-                
-
+
+
-                g_free (linebuf);
-        } else if (resp != NULL && code == CAMEL_IMAP4_RESP_CODE_PARSE) {

trunk/libtinymail-camel/camel-lite/camel/providers/imap4/camel-imap4-summary.c

@@ -751 +751 @@
-                                   "message is simply unreadable by the IMAP server and will need "
-                                   "to be given read permissions.", msg);
-
-
+
+
+
-        g_free (warning);
-}

trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c

@@ -507 +507 @@
-
-                        camel_session_alert_user (session, CAMEL_SESSION_ALERT_ERROR, 
-
+, service->data
-
-                        camel_service_disconnect (service, TRUE, NULL);

trunk/libtinymail-camel/tny-session-camel.c

@@ -169 +169 @@
-
-static gboolean
-
+ccount *account, TnyA
-{
-        return tny_account_store_alert (
-                (TnyAccountStore*) self->priv->account_store, 
-
+account, 
-}
-
@@ -183 +183 @@
-
-static gboolean
-
+, CamelService *service
-{
-        TnySessionCamel *self = (TnySessionCamel *)session;
@@ -189 +189 @@
-        gboolean retval = FALSE;
-        GError *err = NULL;
+
+        TnyAccount *account = NULL;
+        if (service && service->data)
+                account = TNY_ACCOUNT (service->data);
-
-        if (priv->account_store)
@@ -219 +223 @@
-                tny_lockable_lock (self->priv->ui_lock);
-
-
+
+
-
-                tny_lockable_unlock (self->priv->ui_lock);
@@ -430 +435 @@
-        BackgroundConnectInfo *info = udata;
-        TnySessionCamel *self = info->user_data;
-
+
-        if (data && TNY_IS_CAMEL_ACCOUNT (data))
-        {
+                TnyCamelAccount *account = TNY_CAMEL_ACCOUNT (data);
+                
-                GError *err = NULL;
-                TnyCamelAccountPriv *apriv = NULL;
-
-                /* We don't go online on transport accounts, yet */
-data
+account
-                {
-TNY_CAMEL_ACCOUNT (data)
+account
-                                tny_camel_account_signals [TNY_CAMEL_ACCOUNT_SET_ONLINE_HAPPENED], 0, info->online);
-                        return;
-                }
-
-data
+account
-
-                apriv->is_connecting = TRUE;
-
-TNY_CAMEL_ACCOUNT (data)
+account
-
-                if (err == NULL)
-TNY_CAMEL_ACCOUNT (data)
+account
-
-                if (err != NULL) 
@@ -460 +467 @@
-                                        tny_lockable_lock (self->priv->ui_lock);
-
-
+CCOUNT (account), TNY_A
-
-                                if (info->as_thread)

trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

@@ -100 +100 @@
-
-static gboolean
-
+ccount *account, TnyA
-{
-        GtkMessageType gtktype;

trunk/libtinymail-gpe/tny-gpe-account-store.c

@@ -98 +98 @@
-
-static gboolean
-
+ccount *account, TnyA
-{
-        GtkMessageType gtktype;

trunk/libtinymail-maemo/tny-maemo-account-store.c

@@ -102 +102 @@
-
-static gboolean
-
+ccount *account, TnyA
-{
-        GtkMessageType gtktype;

trunk/libtinymail-olpc/tny-olpc-account-store.c

@@ -97 +97 @@
-
-static gboolean
-
+ccount *account, TnyA
-{
-        GtkMessageType gtktype;

trunk/libtinymail/tny-account-store.c

@@ -80 +80 @@
- * tny_account_store_alert:
- * @self: a #TnyAccountStore object
+ * @account: The account (This is NULL sometimes for some current implementations).
- * @type: the message type (severity)
- * @question: whether or not this is a question
@@ -108 +109 @@
- * <informalexample><programlisting>
- * static gboolean
-
+ccount *account, TnyA
- * {
- *     GtkMessageType gtktype;
@@ -151 +152 @@
- **/
-gboolean 
-
+ccount *account, TnyA
-{
-        gboolean retval;
@@ -160 +161 @@
-#endif
-
-
+account, 
-
-#ifdef DBC /* ensure */

trunk/libtinymail/tny-account-store.h

@@ -77 +77 @@
-        const gchar* (*get_cache_dir_func) (TnyAccountStore *self);
-        TnyDevice* (*get_device_func) (TnyAccountStore *self);
-
+ccount *account, TnyA
-        TnyAccount* (*find_account_func) (TnyAccountStore *self, const gchar *url_string);
-
@@ -97 +97 @@
-const gchar*  tny_account_store_get_cache_dir (TnyAccountStore *self);
-TnyDevice* tny_account_store_get_device (TnyAccountStore *self);
-
+ccount *account, TnyA
-TnyAccount* tny_account_store_find_account (TnyAccountStore *self, const gchar *url_string);
-

trunk/tests/shared/account-store.c

@@ -66 +66 @@
-
-static gboolean
-
+ccount *account, TnyA
-{
-        return TRUE;