Changeset 1800

Show
Ignore:
Timestamp:
04/18/07 17:15:11
Author:
djcb
Message:

murray's cleanup patch for tny-maemo-conic.[ch]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1799 r1800  
     12007-04-18  Murray Cumming  <murrayc@murrayc.com> 
     2 
     3        * libtinymail-maemo/tny-maemo-conic-device.c: 
     4        (tny_maemo_conic_device_connect), 
     5        (tny_maemo_conic_device_disconnect), 
     6        (tny_maemo_conic_device_get_current_iap_id), 
     7        (tny_maemo_conic_device_get_iap), 
     8        (tny_maemo_conic_device_get_iap_list), 
     9        (tny_maemo_conic_device_free_iap_list): 
     10        * libtinymail-maemo/tny-maemo-conic-device.h: 
     11        Takea TnyMaemoConicDevice* instead of a TnyDevice, as that is  
     12        the convention for derived/implemented objects. 
     13        Correct the TNY_TYPE_MAEMO_CONIC_DEVICE implementation so that this can be used.  
     14 
    1152007-04-17  Shilpa Musti  <Shilpa.Musti@nokia.com> 
    216 

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

    r1790 r1800  
    115115 **/ 
    116116gboolean 
    117 tny_maemo_conic_device_connect (TnyDevice *self, const gchar* iap_id) 
     117tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id) 
    118118{ 
    119119        TnyMaemoConicDevicePriv *priv;   
    …… 
    148148 **/ 
    149149gboolean 
    150 tny_maemo_conic_device_disconnect (TnyDevice *self, const gchar* iap_id) 
     150tny_maemo_conic_device_disconnect (TnyMaemoConicDevice *self, const gchar* iap_id) 
    151151{ 
    152152        TnyMaemoConicDevicePriv *priv;   
    …… 
    180180 **/ 
    181181const gchar* 
    182 tny_maemo_conic_device_get_current_iap_id (TnyDevice *self) 
     182tny_maemo_conic_device_get_current_iap_id (TnyMaemoConicDevice *self) 
    183183{ 
    184184        TnyMaemoConicDevicePriv *priv; 
    185185         
    186186        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL); 
    187         g_return_val_if_fail (tny_maemo_conic_device_is_online(self), NULL); 
     187        g_return_val_if_fail (tny_maemo_conic_device_is_online(TNY_DEVICE(self)), NULL); 
    188188 
    189189        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self); 
    …… 
    206206 **/ 
    207207ConIcIap* 
    208 tny_maemo_conic_device_get_iap (TnyDevice *self, const gchar *iap_id) 
     208tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id) 
    209209{ 
    210210        TnyMaemoConicDevicePriv *priv; 
    …… 
    230230 **/ 
    231231GSList* 
    232 tny_maemo_conic_device_get_iap_list (TnyDevice *self) 
     232tny_maemo_conic_device_get_iap_list (TnyMaemoConicDevice *self) 
    233233{ 
    234234        TnyMaemoConicDevicePriv *priv; 
    …… 
    250250 **/ 
    251251void 
    252 tny_maemo_conic_device_free_iap_list (TnyDevice *self, GSList* cnx_list) 
     252tny_maemo_conic_device_free_iap_list (TnyMaemoConicDevice *self, GSList* cnx_list) 
    253253{ 
    254254        GSList *cur = cnx_list; 

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

    r1790 r1800  
    3232G_BEGIN_DECLS 
    3333 
    34 #define TNY_TYPE_MAEMO_CONIC_DEVICE             (tny_maemo_device_get_type ()) 
     34#define TNY_TYPE_MAEMO_CONIC_DEVICE             (tny_maemo_conic_device_get_type ()) 
    3535#define TNY_MAEMO_CONIC_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_MAEMO_CONIC_DEVICE, TnyMaemoConicDevice)) 
    3636#define TNY_MAEMO_CONIC_DEVICE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_MAEMO_CONIC_DEVICE, TnyMaemoConicDeviceClass)) 
    …… 
    5858TnyDevice* tny_maemo_conic_device_new (void); 
    5959 
    60 gboolean tny_maemo_conic_device_connect (TnyDevice *self, const gchar* iap_id); 
    61 gboolean tny_maemo_conic_device_disconnect (TnyDevice *self, const gchar* iap_id); 
    62 const gchar* tny_maemo_conic_device_get_current_iap_id (TnyDevice *self); 
    63 ConIcIap* tny_maemo_conic_device_get_iap (TnyDevice *self, const gchar *iap_id); 
    64 GSList* tny_maemo_conic_device_get_iap_list (TnyDevice *self); 
    65 void tny_maemo_conic_device_free_iap_list (TnyDevice *self, GSList* cnx_list); 
     60gboolean tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id); 
     61gboolean tny_maemo_conic_device_disconnect (TnyMaemoConicDevice *self, const gchar* iap_id); 
     62const gchar* tny_maemo_conic_device_get_current_iap_id (TnyMaemoConicDevice *self); 
     63ConIcIap* tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id); 
     64GSList* tny_maemo_conic_device_get_iap_list (TnyMaemoConicDevice *self); 
     65void tny_maemo_conic_device_free_iap_list (TnyMaemoConicDevice *self, GSList* cnx_list); 
    6666 
    6767G_END_DECLS