Changeset 1912

Show
Ignore:
Timestamp:
05/08/07 12:26:47
Author:
djcb
Message:
        • make _finalize in tny-maemo-conic-device also do the dummy

disconnect, so we don't crash-on-exit in scratchbox

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1911 r1912  
     12007-05-08  Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
     2 
     3        * make _finalize in tny-maemo-conic-device also do the dummy 
     4                disconnect, so we don't crash-on-exit in scratchbox 
     5 
    162007-05-08  Murray Cumming  <murrayc@murrayc.com 
    27 

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

    r1896 r1912  
    7171 
    7272#ifdef MAEMO_CONIC_DUMMY 
    73         g_message ("%s: HACK: outsmarting libconic by emitting signal regardless of the reported connection status.", __FUNCTION__); 
     73        /* HACK: outsmarting libconic by emitting signal regardless of the reported connection status */ 
    7474        g_signal_emit (device, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED], 
    7575                       0, TRUE); 
    …… 
    170170 */ 
    171171#ifndef MAEMO_CONIC_DUMMY  
     172 
     173 
    172174        TnyMaemoConicDevicePriv *priv;   
    173175         
    …… 
    401403        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (obj); 
    402404        if (priv->cnx && CON_IC_IS_CONNECTION(priv->cnx)) { 
    403                 if (!con_ic_connection_disconnect (priv->cnx)) 
    404                         g_warning ("failed to send disconnect dbus message"); 
     405                if (!tny_maemo_conic_device_disconnect (TNY_MAEMO_CONIC_DEVICE(obj),priv->iap)) 
     406                        g_warning ("failed to disconnect dbus message"); 
    405407                g_object_unref (priv->cnx); 
    406408                priv->cnx = NULL;