Changeset 1947
- Timestamp:
- 05/14/07 12:15:10
- trunk/ChangeLog (modified) (1 diff)
- trunk/docs/devel/reference/tmpl/tny-account.sgml (modified) (2 diffs)
- trunk/docs/devel/reference/tmpl/tny-shared.sgml (modified) (1 diff)
- trunk/libtinymail-camel/tny-camel-account.c (modified) (3 diffs)
- trunk/libtinymail-camel/tny-camel-account.h (modified) (1 diff)
- trunk/libtinymail/tny-account.c (modified) (4 diffs)
- trunk/libtinymail/tny-account.h (modified) (2 diffs)
- trunk/libtinymail/tny-combined-account.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r1945 r1947 1 2007-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 1 19 2007-05-14 Murray Cumming <murrayc@murrayc.com> 2 20 trunk/docs/devel/reference/tmpl/tny-account.sgml
r1945 r1947 52 52 @get_id_func: 53 53 @get_name_func: 54 @get_ mech_func:54 @get_secure_auth_mech_func: 55 55 @get_proto_func: 56 56 @get_user_func: … … 187 187 188 188 189 <!-- ##### FUNCTION tny_account_get_ mech ##### -->189 <!-- ##### FUNCTION tny_account_get_secure_auth_mech ##### --> 190 190 <para> 191 191 trunk/docs/devel/reference/tmpl/tny-shared.sgml
r1945 r1947 276 276 @get_id_func: 277 277 @get_name_func: 278 @get_ mech_func:278 @get_secure_auth_mech_func: 279 279 @get_proto_func: 280 280 @get_user_func: trunk/libtinymail-camel/tny-camel-account.c
r1945 r1947 609 609 610 610 static const gchar* 611 tny_camel_account_get_ mech (TnyAccount *self)612 { 613 return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_ mech_func (self);611 tny_camel_account_get_secure_auth_mech (TnyAccount *self) 612 { 613 return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->get_secure_auth_mech_func (self); 614 614 } 615 615 616 616 static const gchar* 617 tny_camel_account_get_ mech_default (TnyAccount *self)617 tny_camel_account_get_secure_auth_mech_default (TnyAccount *self) 618 618 { 619 619 TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); … … 992 992 klass->get_proto_func = tny_camel_account_get_proto; 993 993 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; 995 995 klass->set_secure_auth_mech_func = tny_camel_account_set_secure_auth_mech; 996 996 klass->get_user_func = tny_camel_account_get_user; … … 1028 1028 class->get_proto_func = tny_camel_account_get_proto_default; 1029 1029 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; 1031 1031 class->set_secure_auth_mech_func = tny_camel_account_set_secure_auth_mech_default; 1032 1032 class->get_user_func = tny_camel_account_get_user_default; trunk/libtinymail-camel/tny-camel-account.h
r1945 r1947 65 65 const gchar* (*get_id_func) (TnyAccount *self); 66 66 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); 68 68 const gchar* (*get_proto_func) (TnyAccount *self); 69 69 const gchar* (*get_user_func) (TnyAccount *self); trunk/libtinymail/tny-account.c
r1945 r1947 258 258 259 259 #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)); 261 261 #endif 262 262 … … 715 715 716 716 /** 717 * tny_account_get_ mech:718 * @self: a #TnyAccount object 719 * 720 * Get the authentication mechanism for this account. Default is "PLAIN". The717 * 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 721 721 * returned value can be NULL, in which case a undefined default is used. 722 722 * … … 725 725 **/ 726 726 const gchar* 727 tny_account_get_ mech (TnyAccount *self)727 tny_account_get_secure_auth_mech (TnyAccount *self) 728 728 { 729 729 const gchar *retval; … … 731 731 #ifdef DBC /* require */ 732 732 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); 737 737 738 738 #ifdef DBC /* ensure */ trunk/libtinymail/tny-account.h
r1945 r1947 66 66 const gchar* (*get_id_func) (TnyAccount *self); 67 67 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); 69 69 const gchar* (*get_proto_func) (TnyAccount *self); 70 70 const gchar* (*get_user_func) (TnyAccount *self); … … 93 93 const gchar* tny_account_get_id (TnyAccount *self); 94 94 const gchar* tny_account_get_name (TnyAccount *self); 95 const gchar* tny_account_get_ mech (TnyAccount *self);95 const gchar* tny_account_get_secure_auth_mech (TnyAccount *self); 96 96 const gchar* tny_account_get_proto (TnyAccount *self); 97 97 const gchar* tny_account_get_user (TnyAccount *self); trunk/libtinymail/tny-combined-account.c
r1945 r1947 188 188 189 189 static 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));190 tny_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)); 197 197 } 198 198 … … 465 465 klass->get_id_func = tny_combined_account_get_id; 466 466 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; 468 468 klass->get_proto_func = tny_combined_account_get_proto; 469 469 klass->get_user_func = tny_combined_account_get_user;
