Changeset 2383

Show
Ignore:
Timestamp:
07/04/07 17:01:39
Author:
murrayc
Message:

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

        • libtinymail-maemo/tny-maemo-conic-device.c:

(on_dummy_connection_check): Changed the check for a NULL iap
(though it should have worked already) to ensure that the signal
is always emitted at initialization.
(tny_maemo_conic_device_force_online): Do not just return if we
are in scratchbox. Nothing here is libconic-specific. This
makes is_online() return the correct value after calling force_online().

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r2382 r2383  
     12007-07-04  Murray Cumming  <murrayc@murrayc.com> 
     2 
     3        * libtinymail-maemo/tny-maemo-conic-device.c: 
     4        (on_dummy_connection_check): Changed the check for a NULL iap 
     5        (though it should have worked already) to ensure that the signal  
     6        is always emitted at initialization. 
     7        (tny_maemo_conic_device_force_online): Do not just return if we  
     8        are in scratchbox. Nothing here is libconic-specific. This  
     9        makes is_online() return the correct value after calling force_online(). 
     10 
    1112007-07-04  Johannes Schmid <johannes.schmid@openismus.com> 
    212 

  • trunk/libtinymail-camel/camel-lite/ChangeLog

    r2277 r2383  
     12007-07-04  Murray Cumming,,,  <murrayc@murrayc-desktop> 
     2 
     3        reviewed by: <delete if not using a buddy> 
     4 
     5        * camel/camel-disco-store.c: (camel_disco_store_check_online): 
     6        * camel/providers/imap/camel-imap-command.c: (imap_command_start): 
     7        * camel/providers/imap/camel-imap-store.c: 
     8        (camel_imap_store_connected): 
     9 
    110Note: Please use this ChangeLog file only for merge changes (from upstream to 
    211this version, and the other way around). Changes to camel-lite that are 

  • trunk/libtinymail-camel/camel-lite/camel/camel-disco-store.c

    r1943 r2383  
    401401        if (camel_disco_store_status (store) != CAMEL_DISCO_STORE_ONLINE) { 
    402402                camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, 
    403                                      _("You must be working online to " 
     403                                     _("camel_disco_store_check_online(): You must be working online to " 
    404404                                       "complete this operation")); 
    405405                return FALSE; 

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

    r2351 r2383  
    208208                { 
    209209                        camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, 
    210                                      _("You must be working online to " 
     210                                     _("imap_command_start()1: You must be working online to " 
    211211                                       "complete this operation")); 
    212212                        return FALSE; 
    …… 
    218218        if (store->ostream==NULL) { 
    219219                camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, 
    220                                      _("You must be working online to " 
     220                                     _("imap_command_start()2: You must be working online to " 
    221221                                       "complete this operation")); 
    222222                 return FALSE; 
    …… 
    225225        if (store->istream==NULL) { 
    226226                camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, 
    227                                      _("You must be working online to " 
     227                                     _("imap_command_start()3: You must be working online to " 
    228228                                       "complete this operation")); 
    229229                return FALSE; 

  • trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

    r2359 r2383  
    37593759        if (!camel_exception_is_set(ex)) 
    37603760                camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, 
    3761                                      _("You must be working online to complete this operation")); 
     3761                                     _("camel_imap_store_connected(): You must be working online to complete this operation")); 
    37623762 
    37633763        return FALSE; 

  • trunk/libtinymail-maemo/tny-maemo-conic-device.c

    r2373 r2383  
    357357         
    358358        if (!test || !contents) { 
     359                /* printf ("DEBUG1: %s: priv->iap = %s\n", priv->iap); */ 
    359360                /* Default to the first debug connection: */ 
    360361                contents = g_strdup ("debug id0"); 
    …… 
    364365                g_strstrip(contents); 
    365366 
    366         if (!(priv->iap) || (strcmp (contents, priv->iap) != 0)) { 
     367        if ((priv->iap == NULL) || (strcmp (contents, priv->iap) != 0)) { 
    367368                if (priv->iap) { 
    368369                        g_free (priv->iap); 
    …… 
    381382                } 
    382383                 
     384                printf ("DEBUG1: %s: emitting is_online=%d\n", __FUNCTION__, priv->is_online); 
    383385                g_signal_emit (self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED], 
    384386                       0, priv->is_online); 
    …… 
    542544        self = TNY_MAEMO_CONIC_DEVICE (device); 
    543545        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self); 
    544  
    545 #ifdef MAEMO_CONIC_DUMMY 
    546         return; 
    547 #endif /*MAEMO_CONIC_DUMMY*/     
     546         
    548547        const gboolean already_online = tny_maemo_conic_device_is_online (device); 
    549548