Changeset 1860

Show
Ignore:
Timestamp:
04/29/07 11:16:59
Author:
murrayc
Message:

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

        • libtinymail-gnome-desktop/tny-gnome-device.c:
        • libtinymail-gpe/tny-gpe-device.c: (emit_status),

(tny_gpe_device_reset), (tny_gpe_device_force_online),
(tny_gpe_device_force_offline):

        • libtinymail-olpc/tny-olpc-device.c: (emit_status),

(tny_olpc_device_reset), (tny_olpc_device_force_online),
(tny_olpc_device_force_offline):
Copy/Paste the implementations from TnyGnomeDevice?, so these implementations
also match the documented behaviour. I wish that GInterfaces could have default
implementations that could be shared.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1855 r1860  
     12007-04-29  Murray Cumming  <murrayc@murrayc.com> 
     2 
     3        * libtinymail-gnome-desktop/tny-gnome-device.c: 
     4        * libtinymail-gpe/tny-gpe-device.c: (emit_status), 
     5        (tny_gpe_device_reset), (tny_gpe_device_force_online), 
     6        (tny_gpe_device_force_offline): 
     7        * libtinymail-olpc/tny-olpc-device.c: (emit_status), 
     8        (tny_olpc_device_reset), (tny_olpc_device_force_online), 
     9        (tny_olpc_device_force_offline):  
     10        Copy/Paste the implementations from TnyGnomeDevice, so these implementations  
     11        also match the documented behaviour. I wish that GInterfaces could have default  
     12        implementations that could be shared. 
     13 
    1142007-04-28  Philip Van Hoof  <pvanhoof@gnome.org> 
    215 

  • trunk/libtinymail-gnome-desktop/tny-gnome-device.c

    r1858 r1860  
    287287        return type; 
    288288} 
     289 

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

    r971 r1860  
    3232static gboolean tny_gpe_device_is_online (TnyDevice *self); 
    3333 
     34static void 
     35emit_status (TnyDevice *self) 
     36{ 
     37        if (tny_gnome_device_is_online (self)) 
     38                tny_gnome_device_on_online (self); 
     39        else 
     40                tny_gnome_device_on_offline (self); 
     41} 
    3442 
    3543static void  
    …… 
    3846        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
    3947 
     48        const gboolean status_before = tny_gnome_device_is_online (self); 
     49 
    4050        priv->fset = FALSE; 
    4151        priv->forced = FALSE; 
    4252 
     53        /* Signal if it changed: */ 
     54        if (status_before != tny_gnome_device_is_online (self)) 
     55                emit_status (self); 
    4356} 
    4457 
    …… 
    4861        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
    4962 
     63        const gboolean already_online = tny_gnome_device_is_online (self); 
     64 
    5065        priv->fset = TRUE; 
    5166        priv->forced = TRUE; 
    5267 
    53         tny_gpe_device_on_online (self); 
    54  
     68        /* Signal if it changed: */ 
     69        if (!already_online) 
     70                emit_status (self); 
     71         
    5572        return; 
    5673} 
    …… 
    6178{ 
    6279        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
     80 
     81        const gboolean already_offline = !tny_gnome_device_is_online (self); 
    6382 
    6483        priv->fset = TRUE; 
    6584        priv->forced = FALSE; 
    6685 
    67  
    68         tny_gpe_device_on_offline (self); 
     86        /* Signal if it changed: */ 
     87        if (!already_offline) 
     88                emit_status (self); 
    6989         
    7090        return; 
    …… 
    197217        return type; 
    198218} 
     219 

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

    r971 r1860  
    3333 
    3434 
     35static void 
     36emit_status (TnyDevice *self) 
     37{ 
     38        if (tny_gnome_device_is_online (self)) 
     39                tny_gnome_device_on_online (self); 
     40        else 
     41                tny_gnome_device_on_offline (self); 
     42} 
     43 
    3544static void  
    3645tny_olpc_device_reset (TnyDevice *self) 
    …… 
    3847        TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
    3948 
     49        const gboolean status_before = tny_gnome_device_is_online (self); 
     50 
    4051        priv->fset = FALSE; 
    4152        priv->forced = FALSE; 
    4253 
     54        /* Signal if it changed: */ 
     55        if (status_before != tny_gnome_device_is_online (self)) 
     56                emit_status (self); 
    4357} 
    4458 
    …… 
    4660tny_olpc_device_force_online (TnyDevice *self) 
    4761{ 
    48         TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
     62 
     63        TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
     64 
     65        const gboolean already_online = tny_gnome_device_is_online (self); 
    4966 
    5067        priv->fset = TRUE; 
    5168        priv->forced = TRUE; 
    5269 
    53         tny_olpc_device_on_online (self); 
    54  
     70        /* Signal if it changed: */ 
     71        if (!already_online) 
     72                emit_status (self); 
     73         
    5574        return; 
    5675} 
    …… 
    6180{ 
    6281        TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
     82 
     83        const gboolean already_offline = !tny_gnome_device_is_online (self); 
    6384 
    6485        priv->fset = TRUE; 
    6586        priv->forced = FALSE; 
    6687 
    67  
    68         tny_olpc_device_on_offline (self); 
     88        /* Signal if it changed: */ 
     89        if (!already_offline) 
     90                emit_status (self); 
    6991         
    7092        return; 
    …… 
    200222        return type; 
    201223} 
     224