Changeset 1696

Show
Ignore:
Timestamp:
03/04/07 20:21:24
Author:
djcb
Message:

* tny-maemo-device update

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1688 r1696  
     12007-03-04  Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> 
     2 
     3        * Small update for tny-maemo-device 
     4 
    152007-03-04  Philip Van Hoof  <pvanhoof@gnome.org> 
    26 

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

    r1552 r1696  
    104104        g_return_if_fail (TNY_IS_DEVICE(self)); 
    105105        priv   = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    106          
    107         if (!priv->is_online)  
    108                 if (!con_ic_connection_connect (priv->cnx,CON_IC_CONNECT_FLAG_NONE)) 
     106 
     107        if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_NONE)) 
    109108                        g_warning ("could not send connect dbus message"); 
    110109} 
    …… 
    119118        priv   = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    120119 
    121         if (priv->is_online) 
    122                 if (!con_ic_connection_disconnect (priv->cnx)) 
    123                         g_warning ("could not send disconnect dbus message"); 
     120        if (!con_ic_connection_disconnect (priv->cnx)) 
     121                g_warning ("could not send disconnect dbus message"); 
    124122} 
    125123 
    …… 
    171169         * thus, this will setup our state correctly when we receive the signals 
    172170         */ 
    173         if (!con_ic_connection_connect (priv->cnx, 
    174                                         CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED)) 
     171        if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED)) 
    175172                g_warning ("could not send connect dbus message"); 
    176173 
    …… 
    184181        priv   = TNY_MAEMO_DEVICE_GET_PRIVATE (obj); 
    185182 
    186         if (priv->cnx) { 
    187                 con_ic_connection_disconnect (priv->cnx); 
     183        if (CON_IC_IS_CONNECTION(priv->cnx)) { 
     184                if (!con_ic_connection_disconnect (priv->cnx)) 
     185                        g_warning ("failed to send disconnect dbus message"); 
    188186                g_object_unref (priv->cnx); 
    189187                priv->cnx = NULL; 
    190         } 
    191          
     188        }        
    192189        (*parent_class->finalize) (obj); 
    193190}