Changeset 1947

Show
Ignore:
Timestamp:
05/14/07 12:15:10
Author:
murrayc
Message:

2007-05-14 Murray Cumming <murrayc@murrayc.com>

        • docs/devel/reference/tmpl/tny-account.sgml:
        • docs/devel/reference/tmpl/tny-shared.sgml:
        • libtinymail-camel/tny-camel-account.c:

(tny_camel_account_get_secure_auth_mech),
(tny_camel_account_get_secure_auth_mech_default),
(tny_account_init), (tny_camel_account_class_init):

        • libtinymail-camel/tny-camel-account.h:
        • libtinymail/tny-account.c: (tny_account_set_secure_auth_mech),

(tny_account_get_secure_auth_mech):

        • libtinymail/tny-account.h:
        • libtinymail/tny-combined-account.c:

(tny_combined_account_get_secure_auth_mech), (tny_account_init):
Renamed tny_account_get_mech() to tny_account_get_secure_auth_mech()

and TnyAccount
get_mech_func() to get_secure_auth_mech(),
to be consistent with the renamed set function.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/ChangeLog

    r1945 r1947  
     12007-05-14  Murray Cumming  <murrayc@murrayc.com> 
     2 
     3        * docs/devel/reference/tmpl/tny-account.sgml: 
     4        * docs/devel/reference/tmpl/tny-shared.sgml: 
     5        * libtinymail-camel/tny-camel-account.c: 
     6        (tny_camel_account_get_secure_auth_mech), 
     7        (tny_camel_account_get_secure_auth_mech_default), 
     8        (tny_account_init), (tny_camel_account_class_init): 
     9        * libtinymail-camel/tny-camel-account.h: 
     10        * libtinymail/tny-account.c: (tny_account_set_secure_auth_mech), 
     11        (tny_account_get_secure_auth_mech): 
     12        * libtinymail/tny-account.h: 
     13        * libtinymail/tny-combined-account.c: 
     14        (tny_combined_account_get_secure_auth_mech), (tny_account_init): 
     15        Renamed tny_account_get_mech() to tny_account_get_secure_auth_mech() 
     16        and TnyAccount::get_mech_func() to get_secure_auth_mech(), 
     17        to be consistent with the renamed set function. 
     18 
    1192007-05-14  Murray Cumming  <murrayc@murrayc.com> 
    220 
  • trunk/docs/devel/reference/tmpl/tny-account.sgml

    r1945 r1947  
    5252@get_id_func:  
    5353@get_name_func:  
    54 @get_mech_func:  
     54@get_secure_auth_mech_func:  
    5555@get_proto_func:  
    5656@get_user_func:  
     
    187187 
    188188 
    189 <!-- ##### FUNCTION tny_account_get_mech ##### --> 
     189<!-- ##### FUNCTION tny_account_get_secure_auth_mech ##### --> 
    190190<para> 
    191191 
  • trunk/docs/devel/reference/tmpl/tny-shared.sgml

    r1945 r1947  
    276276@get_id_func:  
    277277@get_name_func:  
    278 @get_mech_func:  
     278@get_secure_auth_mech_func:  
    279279@get_proto_func:  
    280280@get_user_func:  
  • trunk/libtinymail-camel/tny-camel-account.c

    r1945 r1947  
    609609 
    610610static const gchar* 
    611 tny_camel_account_get_mech (TnyAccount *self) 
    612 { 
    613         return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_mech_func (self); 
     611tny_camel_account_get_secure_auth_mech (TnyAccount *self) 
     612{ 
     613        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_secure_auth_mech_func (self); 
    614614} 
    615615 
    616616static const gchar* 
    617 tny_camel_account_get_mech_default (TnyAccount *self) 
     617tny_camel_account_get_secure_auth_mech_default (TnyAccount *self) 
    618618{ 
    619619        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
     
    992992        klass->get_proto_func = tny_camel_account_get_proto; 
    993993        klass->set_proto_func = tny_camel_account_set_proto; 
    994         klass->get_mech_func = tny_camel_account_get_mech; 
     994        klass->get_secure_auth_mech_func = tny_camel_account_get_secure_auth_mech; 
    995995        klass->set_secure_auth_mech_func = tny_camel_account_set_secure_auth_mech; 
    996996        klass->get_user_func = tny_camel_account_get_user; 
     
    10281028        class->get_proto_func = tny_camel_account_get_proto_default; 
    10291029        class->set_proto_func = tny_camel_account_set_proto_default; 
    1030         class->get_mech_func = tny_camel_account_get_mech_default; 
     1030        class->get_secure_auth_mech_func = tny_camel_account_get_secure_auth_mech_default; 
    10311031        class->set_secure_auth_mech_func = tny_camel_account_set_secure_auth_mech_default; 
    10321032        class->get_user_func = tny_camel_account_get_user_default; 
  • trunk/libtinymail-camel/tny-camel-account.h

    r1945 r1947  
    6565        const gchar* (*get_id_func) (TnyAccount *self); 
    6666        const gchar* (*get_name_func) (TnyAccount *self); 
    67         const gchar* (*get_mech_func) (TnyAccount *self); 
     67        const gchar* (*get_secure_auth_mech_func) (TnyAccount *self); 
    6868        const gchar* (*get_proto_func) (TnyAccount *self); 
    6969        const gchar* (*get_user_func) (TnyAccount *self); 
  • trunk/libtinymail/tny-account.c

    r1945 r1947  
    258258 
    259259#ifdef DBC /* require */ 
    260         g_assert (!strcmp (tny_account_get_mech (self), mech)); 
     260        g_assert (!strcmp (tny_account_get_secure_auth_mech (self), mech)); 
    261261#endif 
    262262 
     
    715715 
    716716/** 
    717  * tny_account_get_mech: 
    718  * @self: a #TnyAccount object 
    719  *  
    720  * Get the authentication mechanism for this account. Default is "PLAIN". The 
     717 * tny_account_get_secure_auth_mech: 
     718 * @self: a #TnyAccount object 
     719 *  
     720 * Get the secure authentication mechanism for this account. Default is "PLAIN". The 
    721721 * returned value can be NULL, in which case a undefined default is used. 
    722722 *  
     
    725725 **/ 
    726726const gchar* 
    727 tny_account_get_mech (TnyAccount *self) 
     727tny_account_get_secure_auth_mech (TnyAccount *self) 
    728728{ 
    729729        const gchar *retval; 
     
    731731#ifdef DBC /* require */ 
    732732        g_assert (TNY_IS_ACCOUNT (self)); 
    733         g_assert (TNY_ACCOUNT_GET_IFACE (self)->get_mech_func != NULL); 
    734 #endif 
    735  
    736         retval = TNY_ACCOUNT_GET_IFACE (self)->get_mech_func (self); 
     733        g_assert (TNY_ACCOUNT_GET_IFACE (self)->get_secure_auth_mech_func != NULL); 
     734#endif 
     735 
     736        retval = TNY_ACCOUNT_GET_IFACE (self)->get_secure_auth_mech_func (self); 
    737737 
    738738#ifdef DBC /* ensure */ 
  • trunk/libtinymail/tny-account.h

    r1945 r1947  
    6666        const gchar* (*get_id_func) (TnyAccount *self); 
    6767        const gchar* (*get_name_func) (TnyAccount *self); 
    68         const gchar* (*get_mech_func) (TnyAccount *self); 
     68        const gchar* (*get_secure_auth_mech_func) (TnyAccount *self); 
    6969        const gchar* (*get_proto_func) (TnyAccount *self); 
    7070        const gchar* (*get_user_func) (TnyAccount *self); 
     
    9393const gchar* tny_account_get_id (TnyAccount *self); 
    9494const gchar* tny_account_get_name (TnyAccount *self); 
    95 const gchar* tny_account_get_mech (TnyAccount *self); 
     95const gchar* tny_account_get_secure_auth_mech (TnyAccount *self); 
    9696const gchar* tny_account_get_proto (TnyAccount *self); 
    9797const gchar* tny_account_get_user (TnyAccount *self); 
  • trunk/libtinymail/tny-combined-account.c

    r1945 r1947  
    188188 
    189189static const gchar* 
    190 tny_combined_account_get_mech (TnyAccount *self) 
    191 { 
    192         TnyCombinedAccountPriv *priv = TNY_COMBINED_ACCOUNT_GET_PRIVATE (self); 
    193  
    194         g_warning ("Don't use tny_account_get_mech on TnyCombinedAccount"); 
    195  
    196         return tny_account_get_mech (TNY_ACCOUNT (priv->store_account)); 
     190tny_combined_account_get_secure_auth_mech (TnyAccount *self) 
     191{ 
     192        TnyCombinedAccountPriv *priv = TNY_COMBINED_ACCOUNT_GET_PRIVATE (self); 
     193 
     194        g_warning ("Don't use tny_account_get_secure_auth_mech on TnyCombinedAccount"); 
     195 
     196        return tny_account_get_secure_auth_mech (TNY_ACCOUNT (priv->store_account)); 
    197197} 
    198198 
     
    465465        klass->get_id_func = tny_combined_account_get_id; 
    466466        klass->get_name_func = tny_combined_account_get_name; 
    467         klass->get_mech_func = tny_combined_account_get_mech; 
     467        klass->get_secure_auth_mech_func = tny_combined_account_get_secure_auth_mech; 
    468468        klass->get_proto_func = tny_combined_account_get_proto; 
    469469        klass->get_user_func = tny_combined_account_get_user;