Changeset 1945

Show
Ignore:
Timestamp:
05/14/07 11:51:27
Author:
murrayc
Message:

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

        • libtinymail/tny-account.c: (tny_account_set_secure_auth_mech):
        • libtinymail/tny-account.h:
        • docs/devel/reference/tmpl/tny-account.sgml:
        • docs/devel/reference/tmpl/tny-shared.sgml:

Renamed tny_account_set_mech() to tny_account_set_secure_auth_mech(),
because that is clearer, after discussion with Philip.

Also renamed the TnyAccount
set_mech_func() vfunc to
set_secure_auth_mech_func().
Attempted to document the possible values, but I have not achieved that
completely.

(tny_camel_account_set_secure_auth_mech),
(tny_camel_account_set_secure_auth_mech_default),
(tny_account_init), (tny_camel_account_class_init):

(tny_camel_store_account_prepare):

(load_accounts):

(tny_combined_account_set_secure_auth_mech), (tny_account_init):
Adapted to the changed API.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1943 r1945  
     12007-05-14  Murray Cumming  <murrayc@murrayc.com> 
     2 
     3        * libtinymail/tny-account.c: (tny_account_set_secure_auth_mech): 
     4        * libtinymail/tny-account.h: 
     5        * docs/devel/reference/tmpl/tny-account.sgml: 
     6        * docs/devel/reference/tmpl/tny-shared.sgml: 
     7        Renamed tny_account_set_mech() to tny_account_set_secure_auth_mech(),  
     8        because that is clearer, after discussion with Philip. 
     9        Also renamed the TnyAccount::set_mech_func() vfunc to  
     10        set_secure_auth_mech_func(). 
     11        Attempted to document the possible values, but I have not achieved that  
     12        completely. 
     13         
     14        * libtinymail-camel/tny-camel-account.c: 
     15        (tny_camel_account_set_secure_auth_mech), 
     16        (tny_camel_account_set_secure_auth_mech_default), 
     17        (tny_account_init), (tny_camel_account_class_init): 
     18        * libtinymail-camel/tny-camel-account.h: 
     19        * libtinymail-camel/tny-camel-store-account.c: 
     20        (tny_camel_store_account_prepare): 
     21        * libtinymail-gnome-desktop/tny-gnome-account-store.c: 
     22        (load_accounts): 
     23        * libtinymail-gpe/tny-gpe-account-store.c: (load_accounts): 
     24        * libtinymail-maemo/tny-maemo-account-store.c: (load_accounts): 
     25        * libtinymail-olpc/tny-olpc-account-store.c: (load_accounts): 
     26        * libtinymail/tny-combined-account.c: 
     27        (tny_combined_account_set_secure_auth_mech), (tny_account_init): 
     28        Adapted to the changed API. 
     29 
    1302007-05-12  Philip Van Hoof  <pvanhoof@gnome.org> 
    231 

  • trunk/docs/devel/reference/tmpl/tny-account.sgml

    r1859 r1945  
    4040@set_id_func:  
    4141@set_name_func:  
    42 @set_mech_func:  
     42@set_secure_auth_mech_func:  
    4343@set_proto_func:  
    4444@set_user_func:  
    …… 
    9797 
    9898 
    99 <!-- ##### FUNCTION tny_account_set_mech ##### --> 
     99<!-- ##### FUNCTION tny_account_set_secure_auth_mech ##### --> 
    100100<para> 
    101101 

  • trunk/docs/devel/reference/tmpl/tny-shared.sgml

    r1931 r1945  
    264264@set_id_func:  
    265265@set_name_func:  
    266 @set_mech_func:  
     266@set_secure_auth_mech_func:  
    267267@set_proto_func:  
    268268@set_user_func:  

  • trunk/libtinymail-camel/camel-lite/COPYING

    r1051 r1945  
    1 The license of camel-lite is the same as the tinymail license: LGPL. For more  
    2 information please read the COPYING file in the toplevel directory of tinymail. 
    3  
    4 ../../COPYING 
    5  
     1                    GNU GENERAL PUBLIC LICENSE 
     2                       Version 2, June 1991 
     3 
     4 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
     5     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
     6 Everyone is permitted to copy and distribute verbatim copies 
     7 of this license document, but changing it is not allowed. 
     8 
     9                            Preamble 
     10 
     11  The licenses for most software are designed to take away your 
     12freedom to share and change it.  By contrast, the GNU General Public 
     13License is intended to guarantee your freedom to share and change free 
     14software--to make sure the software is free for all its users.  This 
     15General Public License applies to most of the Free Software 
     16Foundation's software and to any other program whose authors commit to 
     17using it.  (Some other Free Software Foundation software is covered by 
     18the GNU Library General Public License instead.)  You can apply it to 
     19your programs, too. 
     20 
     21  When we speak of free software, we are referring to freedom, not 
     22price.  Our General Public Licenses are designed to make sure that you 
     23have the freedom to distribute copies of free software (and charge for 
     24this service if you wish), that you receive source code or can get it 
     25if you want it, that you can change the software or use pieces of it 
     26in new free programs; and that you know you can do these things. 
     27 
     28  To protect your rights, we need to make restrictions that forbid 
     29anyone to deny you these rights or to ask you to surrender the rights. 
     30These restrictions translate to certain responsibilities for you if you 
     31distribute copies of the software, or if you modify it. 
     32 
     33  For example, if you distribute copies of such a program, whether 
     34gratis or for a fee, you must give the recipients all the rights that 
     35you have.  You must make sure that they, too, receive or can get the 
     36source code.  And you must show them these terms so they know their 
     37rights. 
     38 
     39  We protect your rights with two steps: (1) copyright the software, and 
     40(2) offer you this license which gives you legal permission to copy, 
     41distribute and/or modify the software. 
     42 
     43  Also, for each author's protection and ours, we want to make certain 
     44that everyone understands that there is no warranty for this free 
     45software.  If the software is modified by someone else and passed on, we 
     46want its recipients to know that what they have is not the original, so 
     47that any problems introduced by others will not reflect on the original 
     48authors' reputations. 
     49 
     50  Finally, any free program is threatened constantly by software 
     51patents.  We wish to avoid the danger that redistributors of a free 
     52program will individually obtain patent licenses, in effect making the 
     53program proprietary.  To prevent this, we have made it clear that any 
     54patent must be licensed for everyone's free use or not licensed at all. 
     55 
     56  The precise terms and conditions for copying, distribution and 
     57modification follow. 
     58  
     59                    GNU GENERAL PUBLIC LICENSE 
     60   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
     61 
     62  0. This License applies to any program or other work which contains 
     63a notice placed by the copyright holder saying it may be distributed 
     64under the terms of this General Public License.  The "Program", below, 
     65refers to any such program or work, and a "work based on the Program" 
     66means either the Program or any derivative work under copyright law: 
     67that is to say, a work containing the Program or a portion of it, 
     68either verbatim or with modifications and/or translated into another 
     69language.  (Hereinafter, translation is included without limitation in 
     70the term "modification".)  Each licensee is addressed as "you". 
     71 
     72Activities other than copying, distribution and modification are not 
     73covered by this License; they are outside its scope.  The act of 
     74running the Program is not restricted, and the output from the Program 
     75is covered only if its contents constitute a work based on the 
     76Program (independent of having been made by running the Program). 
     77Whether that is true depends on what the Program does. 
     78 
     79  1. You may copy and distribute verbatim copies of the Program's 
     80source code as you receive it, in any medium, provided that you 
     81conspicuously and appropriately publish on each copy an appropriate 
     82copyright notice and disclaimer of warranty; keep intact all the 
     83notices that refer to this License and to the absence of any warranty; 
     84and give any other recipients of the Program a copy of this License 
     85along with the Program. 
     86 
     87You may charge a fee for the physical act of transferring a copy, and 
     88you may at your option offer warranty protection in exchange for a fee. 
     89 
     90  2. You may modify your copy or copies of the Program or any portion 
     91of it, thus forming a work based on the Program, and copy and 
     92distribute such modifications or work under the terms of Section 1 
     93above, provided that you also meet all of these conditions: 
     94 
     95    a) You must cause the modified files to carry prominent notices 
     96    stating that you changed the files and the date of any change. 
     97 
     98    b) You must cause any work that you distribute or publish, that in 
     99    whole or in part contains or is derived from the Program or any 
     100    part thereof, to be licensed as a whole at no charge to all third 
     101    parties under the terms of this License. 
     102 
     103    c) If the modified program normally reads commands interactively 
     104    when run, you must cause it, when started running for such 
     105    interactive use in the most ordinary way, to print or display an 
     106    announcement including an appropriate copyright notice and a 
     107    notice that there is no warranty (or else, saying that you provide 
     108    a warranty) and that users may redistribute the program under 
     109    these conditions, and telling the user how to view a copy of this 
     110    License.  (Exception: if the Program itself is interactive but 
     111    does not normally print such an announcement, your work based on 
     112    the Program is not required to print an announcement.) 
     113  
     114These requirements apply to the modified work as a whole.  If 
     115identifiable sections of that work are not derived from the Program, 
     116and can be reasonably considered independent and separate works in 
     117themselves, then this License, and its terms, do not apply to those 
     118sections when you distribute them as separate works.  But when you 
     119distribute the same sections as part of a whole which is a work based 
     120on the Program, the distribution of the whole must be on the terms of 
     121this License, whose permissions for other licensees extend to the 
     122entire whole, and thus to each and every part regardless of who wrote it. 
     123 
     124Thus, it is not the intent of this section to claim rights or contest 
     125your rights to work written entirely by you; rather, the intent is to 
     126exercise the right to control the distribution of derivative or 
     127collective works based on the Program. 
     128 
     129In addition, mere aggregation of another work not based on the Program 
     130with the Program (or with a work based on the Program) on a volume of 
     131a storage or distribution medium does not bring the other work under 
     132the scope of this License. 
     133 
     134  3. You may copy and distribute the Program (or a work based on it, 
     135under Section 2) in object code or executable form under the terms of 
     136Sections 1 and 2 above provided that you also do one of the following: 
     137 
     138    a) Accompany it with the complete corresponding machine-readable 
     139    source code, which must be distributed under the terms of Sections 
     140    1 and 2 above on a medium customarily used for software interchange; or, 
     141 
     142    b) Accompany it with a written offer, valid for at least three 
     143    years, to give any third party, for a charge no more than your 
     144    cost of physically performing source distribution, a complete 
     145    machine-readable copy of the corresponding source code, to be 
     146    distributed under the terms of Sections 1 and 2 above on a medium 
     147    customarily used for software interchange; or, 
     148 
     149    c) Accompany it with the information you received as to the offer 
     150    to distribute corresponding source code.  (This alternative is 
     151    allowed only for noncommercial distribution and only if you 
     152    received the program in object code or executable form with such 
     153    an offer, in accord with Subsection b above.) 
     154 
     155The source code for a work means the preferred form of the work for 
     156making modifications to it.  For an executable work, complete source 
     157code means all the source code for all modules it contains, plus any 
     158associated interface definition files, plus the scripts used to 
     159control compilation and installation of the executable.  However, as a 
     160special exception, the source code distributed need not include 
     161anything that is normally distributed (in either source or binary 
     162form) with the major components (compiler, kernel, and so on) of the 
     163operating system on which the executable runs, unless that component 
     164itself accompanies the executable. 
     165 
     166If distribution of executable or object code is made by offering 
     167access to copy from a designated place, then offering equivalent 
     168access to copy the source code from the same place counts as 
     169distribution of the source code, even though third parties are not 
     170compelled to copy the source along with the object code. 
     171  
     172  4. You may not copy, modify, sublicense, or distribute the Program 
     173except as expressly provided under this License.  Any attempt 
     174otherwise to copy, modify, sublicense or distribute the Program is 
     175void, and will automatically terminate your rights under this License. 
     176However, parties who have received copies, or rights, from you under 
     177this License will not have their licenses terminated so long as such 
     178parties remain in full compliance. 
     179 
     180  5. You are not required to accept this License, since you have not 
     181signed it.  However, nothing else grants you permission to modify or 
     182distribute the Program or its derivative works.  These actions are 
     183prohibited by law if you do not accept this License.  Therefore, by 
     184modifying or distributing the Program (or any work based on the 
     185Program), you indicate your acceptance of this License to do so, and 
     186all its terms and conditions for copying, distributing or modifying 
     187the Program or works based on it. 
     188 
     189  6. Each time you redistribute the Program (or any work based on the 
     190Program), the recipient automatically receives a license from the 
     191original licensor to copy, distribute or modify the Program subject to 
     192these terms and conditions.  You may not impose any further 
     193restrictions on the recipients' exercise of the rights granted herein. 
     194You are not responsible for enforcing compliance by third parties to 
     195this License. 
     196 
     197  7. If, as a consequence of a court judgment or allegation of patent 
     198infringement or for any other reason (not limited to patent issues), 
     199conditions are imposed on you (whether by court order, agreement or 
     200otherwise) that contradict the conditions of this License, they do not 
     201excuse you from the conditions of this License.  If you cannot 
     202distribute so as to satisfy simultaneously your obligations under this 
     203License and any other pertinent obligations, then as a consequence you 
     204may not distribute the Program at all.  For example, if a patent 
     205license would not permit royalty-free redistribution of the Program by 
     206all those who receive copies directly or indirectly through you, then 
     207the only way you could satisfy both it and this License would be to 
     208refrain entirely from distribution of the Program. 
     209 
     210If any portion of this section is held invalid or unenforceable under 
     211any particular circumstance, the balance of the section is intended to 
     212apply and the section as a whole is intended to apply in other 
     213circumstances. 
     214 
     215It is not the purpose of this section to induce you to infringe any 
     216patents or other property right claims or to contest validity of any 
     217such claims; this section has the sole purpose of protecting the 
     218integrity of the free software distribution system, which is 
     219implemented by public license practices.  Many people have made 
     220generous contributions to the wide range of software distributed 
     221through that system in reliance on consistent application of that 
     222system; it is up to the author/donor to decide if he or she is willing 
     223to distribute software through any other system and a licensee cannot 
     224impose that choice. 
     225 
     226This section is intended to make thoroughly clear what is believed to 
     227be a consequence of the rest of this License. 
     228  
     229  8. If the distribution and/or use of the Program is restricted in 
     230certain countries either by patents or by copyrighted interfaces, the 
     231original copyright holder who places the Program under this License 
     232may add an explicit geographical distribution limitation excluding 
     233those countries, so that distribution is permitted only in or among 
     234countries not thus excluded.  In such case, this License incorporates 
     235the limitation as if written in the body of this License. 
     236 
     237  9. The Free Software Foundation may publish revised and/or new versions 
     238of the General Public License from time to time.  Such new versions will 
     239be similar in spirit to the present version, but may differ in detail to 
     240address new problems or concerns. 
     241 
     242Each version is given a distinguishing version number.  If the Program 
     243specifies a version number of this License which applies to it and "any 
     244later version", you have the option of following the terms and conditions 
     245either of that version or of any later version published by the Free 
     246Software Foundation.  If the Program does not specify a version number of 
     247this License, you may choose any version ever published by the Free Software 
     248Foundation. 
     249 
     250  10. If you wish to incorporate parts of the Program into other free 
     251programs whose distribution conditions are different, write to the author 
     252to ask for permission.  For software which is copyrighted by the Free 
     253Software Foundation, write to the Free Software Foundation; we sometimes 
     254make exceptions for this.  Our decision will be guided by the two goals 
     255of preserving the free status of all derivatives of our free software and 
     256of promoting the sharing and reuse of software generally. 
     257 
     258                            NO WARRANTY 
     259 
     260  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
     261FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN 
     262OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
     263PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 
     264OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
     265MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS 
     266TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE 
     267PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 
     268REPAIR OR CORRECTION. 
     269 
     270  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
     271WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
     272REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 
     273INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 
     274OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 
     275TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 
     276YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 
     277PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
     278POSSIBILITY OF SUCH DAMAGES. 
     279 
     280                     END OF TERMS AND CONDITIONS 
     281  
     282            How to Apply These Terms to Your New Programs 
     283 
     284  If you develop a new program, and you want it to be of the greatest 
     285possible use to the public, the best way to achieve this is to make it 
     286free software which everyone can redistribute and change under these terms. 
     287 
     288  To do so, attach the following notices to the program.  It is safest 
     289to attach them to the start of each source file to most effectively 
     290convey the exclusion of warranty; and each file should have at least 
     291the "copyright" line and a pointer to where the full notice is found. 
     292 
     293    <one line to give the program's name and a brief idea of what it does.> 
     294    Copyright (C) <year>  <name of author> 
     295 
     296    This program is free software; you can redistribute it and/or modify 
     297    it under the terms of the GNU General Public License as published by 
     298    the Free Software Foundation; either version 2 of the License, or 
     299    (at your option) any later version. 
     300 
     301    This program is distributed in the hope that it will be useful, 
     302    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     303    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     304    GNU General Public License for more details. 
     305 
     306    You should have received a copy of the GNU General Public License 
     307    along with this program; if not, write to the Free Software 
     308    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
     309 
     310 
     311Also add information on how to contact you by electronic and paper mail. 
     312 
     313If the program is interactive, make it output a short notice like this 
     314when it starts in an interactive mode: 
     315 
     316    Gnomovision version 69, Copyright (C) year  name of author 
     317    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 
     318    This is free software, and you are welcome to redistribute it 
     319    under certain conditions; type `show c' for details. 
     320 
     321The hypothetical commands `show w' and `show c' should show the appropriate 
     322parts of the General Public License.  Of course, the commands you use may 
     323be called something other than `show w' and `show c'; they could even be 
     324mouse-clicks or menu items--whatever suits your program. 
     325 
     326You should also get your employer (if you work as a programmer) or your 
     327school, if any, to sign a "copyright disclaimer" for the program, if 
     328necessary.  Here is a sample; alter the names: 
     329 
     330  Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
     331  `Gnomovision' (which makes passes at compilers) written by James Hacker. 
     332 
     333  <signature of Ty Coon>, 1 April 1989 
     334  Ty Coon, President of Vice 
     335 
     336This General Public License does not permit incorporating your program into 
     337proprietary programs.  If your program is a subroutine library, you may 
     338consider it more useful to permit linking proprietary applications with the 
     339library.  If this is what you want to do, use the GNU Library General 
     340Public License instead of this License. 

  • trunk/libtinymail-camel/camel-lite/ChangeLog

    r1914 r1945  
     12007-05-14  set REAL_NAME environment variable  <murrayc@murrayc-desktop> 
     2 
     3        reviewed by: <delete if not using a buddy> 
     4 
     5        * COPYING: 
     6 
    172007-05-08  set REAL_NAME environment variable  <murrayc@murrayc-desktop> 
    28 

  • trunk/libtinymail-camel/tny-camel-account.c

    r1911 r1945  
    411411 
    412412static void 
    413 tny_camel_account_set_mech (TnyAccount *self, const gchar *mech) 
    414 { 
    415         TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_mech_func (self, mech); 
    416 } 
    417  
    418 static void 
    419 tny_camel_account_set_mech_default (TnyAccount *self, const gchar *mech) 
     413tny_camel_account_set_secure_auth_mech (TnyAccount *self, const gchar *mech) 
     414{ 
     415        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->set_secure_auth_mech_func (self, mech); 
     416} 
     417 
     418static void 
     419tny_camel_account_set_secure_auth_mech_default (TnyAccount *self, const gchar *mech) 
    420420{ 
    421421        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
    …… 
    993993        klass->set_proto_func = tny_camel_account_set_proto; 
    994994        klass->get_mech_func = tny_camel_account_get_mech; 
    995         klass->set_mech_func = tny_camel_account_set_mech; 
     995        klass->set_secure_auth_mech_func = tny_camel_account_set_secure_auth_mech; 
    996996        klass->get_user_func = tny_camel_account_get_user; 
    997997        klass->set_user_func = tny_camel_account_set_user; 
    …… 
    10291029        class->set_proto_func = tny_camel_account_set_proto_default; 
    10301030        class->get_mech_func = tny_camel_account_get_mech_default; 
    1031         class->set_mech_func = tny_camel_account_set_mech_default; 
     1031        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; 
    10331033        class->set_user_func = tny_camel_account_set_user_default; 

  • trunk/libtinymail-camel/tny-camel-account.h

    r1718 r1945  
    5353        void (*set_id_func) (TnyAccount *self, const gchar *id); 
    5454        void (*set_name_func) (TnyAccount *self, const gchar *name); 
    55         void (*set_mech_func) (TnyAccount *self, const gchar *name); 
     55        void (*set_secure_auth_mech_func) (TnyAccount *self, const gchar *name); 
    5656        void (*set_proto_func) (TnyAccount *self, const gchar *proto); 
    5757        void (*set_user_func) (TnyAccount *self, const gchar *user); 

  • trunk/libtinymail-camel/tny-camel-store-account.c

    r1920 r1945  
    8585        if (!apriv->custom_url_string) 
    8686        { 
     87                /* Prepare the URL string that Camel needs to identify  
     88                 * the protocol, hostname, user, security options, etc: 
     89                 */ 
    8790                CamelURL *url = NULL; 
    8891                GList *options = apriv->options; 

  • trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

    r1918 r1945  
    245245 
    246246                        if (mech) 
    247                                 tny_account_set_mech (TNY_ACCOUNT (account), mech); 
     247                                tny_account_set_secure_auth_mech (TNY_ACCOUNT (account), mech); 
    248248 
    249249                        key = g_strdup_printf ("/apps/tinymail/accounts/%d/options", i); 

  • trunk/libtinymail-gpe/tny-gpe-account-store.c

    r1911 r1945  
    244244 
    245245                        if (mech) 
    246                                 tny_account_set_mech (TNY_ACCOUNT (account), mech); 
     246                                tny_account_set_secure_auth_mech (TNY_ACCOUNT (account), mech); 
    247247 
    248248 

  • trunk/libtinymail-maemo/tny-maemo-account-store.c

    r1911 r1945  
    270270 
    271271                        if (mech) 
    272                                 tny_account_set_mech (TNY_ACCOUNT (account), mech); 
     272                                tny_account_set_secure_auth_mech (TNY_ACCOUNT (account), mech); 
    273273 
    274274                        key = g_strdup_printf ("/apps/tinymail/accounts/%d/options", i); 

  • trunk/libtinymail-olpc/tny-olpc-account-store.c

    r1911 r1945  
    216216 
    217217                        if (mech) 
    218                                 tny_account_set_mech (TNY_ACCOUNT (account), mech); 
     218                                tny_account_set_secure_auth_mech (TNY_ACCOUNT (account), mech); 
    219219 
    220220                        options = g_key_file_get_string_list (keyfile, "tinymail", "options", &options_len, NULL); 

  • trunk/libtinymail/tny-account.c

    r1866 r1945  
    210210} 
    211211 
    212 /** 
    213  * tny_account_set_mech: 
     212 /* TODO: It would be nice to have a tny_account_set_secure_auth_mech_from_enum()  
     213  * convenience function, with common clearly-defined and documented choices. */ 
     214 /* TODO: Document how to discover the possible values, by getting the  
     215  * capabilities from the server. */ 
     216 /* TODO: Document _all_ of these possible values in terms of what kind of  
     217  * authentication behaviour they specify, and which are even possible for  
     218  * IMAP, POP, or SMTP. */ 
     219   
     220/** 
     221 * tny_account_set_secure_auth_mech: 
    214222 * @self: a #TnyAccount object 
    215223 * @mech: the authentication mechanism 
    216224 *  
    217  * Set the account's authentication mechanism. For example in case of plain 
    218  * you use "PLAIN" here. For anonymous you use "ANONYMOUS". This last one  
    219  * will for example result in a AUTHENTICATE ANONYMOUS request, as specified 
    220  * in RFC 2245, on for example IMAP servers. 
     225 * Set the account's secure authentication mechanism. The possible values depend on  
     226 * the capabilities of the server, but here are some possible values: 
     227 * - "ANONYMOUS": Results in an AUTHENTICATE ANONYMOUS request, as specified 
     228 * in <ulink url="http://www.faqs.org/rfcs/rfc2245.html">RFC 2245</ulink>. 
     229 * - "CRAM-MD5": Challenge-Response Authentication Mechanism, as specified in  
     230 * <ulink url="http://www.faqs.org/rfcs/rfc2195.html">RFC 2195</ulink>. 
     231 * - "DIGEST-MD5": Digest Authentication, as specified in  
     232 * <ulink url="http://www.faqs.org/rfcs/rfc2831.html">RFC 2831</ulink>. 
     233 * - GSSAPI: Generic Security Service Application Program Interface, as  
     234 * specified in <ulink url="http://www.faqs.org/rfcs/rfc2222.html">RFC 2222</ulink>  
     235 * and <ulink url="http://www.faqs.org/rfcs/rfc2078.html.html">RFC 2078</ulink>. 
     236 * - Kerberos 4: as specified in  
     237 * <ulink url="http://www.faqs.org/rfcs/rfc2222.htmll">RFC 2222</ulink>. 
     238 * - "NTLM / SPA": Secure Password Authentication, as used by Outlook Express. 
     239 * - "Login" 
     240 * - "PLAIN" 
     241 * - "POP before SMTP". 
     242 *  
     243 * Other relevant standards: 
     244 * - <ulink url="http://www.faqs.org/rfcs/rfc1731.html">RFC 1731 - IMAP4 Authentication Mechanisms</ulink>  
    221245 *  
    222246 **/ 
    223247void 
    224 tny_account_set_mech (TnyAccount *self, const gchar *mech) 
     248tny_account_set_secure_auth_mech (TnyAccount *self, const gchar *mech) 
    225249{ 
    226250#ifdef DBC /* require */ 
    …… 
    228252        g_assert (mech); 
    229253        g_assert (strlen (mech) > 0); 
    230         g_assert (TNY_ACCOUNT_GET_IFACE (self)->set_mech_func != NULL); 
    231 #endif 
    232  
    233         TNY_ACCOUNT_GET_IFACE (self)->set_mech_func (self, mech); 
     254        g_assert (TNY_ACCOUNT_GET_IFACE (self)->set_secure_auth_mech_func != NULL); 
     255#endif 
     256 
     257        TNY_ACCOUNT_GET_IFACE (self)->set_secure_auth_mech_func (self, mech); 
    234258 
    235259#ifdef DBC /* require */ 

  • trunk/libtinymail/tny-account.h

    r1869 r1945  
    5454        void (*set_id_func) (TnyAccount *self, const gchar *id); 
    5555        void (*set_name_func) (TnyAccount *self, const gchar *name); 
    56         void (*set_mech_func) (TnyAccount *self, const gchar *mech); 
     56        void (*set_secure_auth_mech_func) (TnyAccount *self, const gchar *mech); 
    5757        void (*set_proto_func) (TnyAccount *self, const gchar *proto); 
    5858        void (*set_user_func) (TnyAccount *self, const gchar *user); 
    …… 
    8383void tny_account_set_id (TnyAccount *self, const gchar *id); 
    8484void tny_account_set_name (TnyAccount *self, const gchar *name); 
    85 void tny_account_set_mech (TnyAccount *self, const gchar *mech); 
     85void tny_account_set_secure_auth_mech (TnyAccount *self, const gchar *mech); 
    8686void tny_account_set_proto (TnyAccount *self, const gchar *proto); 
    8787void tny_account_set_user (TnyAccount *self, const gchar *user); 

  • trunk/libtinymail/tny-combined-account.c

    r1879 r1945  
    9797 
    9898static void 
    99 tny_combined_account_set_mech (TnyAccount *self, const gchar *mech) 
    100 { 
    101         g_warning ("Don't use tny_account_set_mech on TnyCombinedAccount"); 
     99tny_combined_account_set_secure_auth_mech (TnyAccount *self, const gchar *mech) 
     100{ 
     101        g_warning ("Don't use tny_account_set_secure_auth_mech on TnyCombinedAccount"); 
    102102} 
    103103 
    …… 
    453453        klass->set_id_func = tny_combined_account_set_id; 
    454454        klass->set_name_func = tny_combined_account_set_name; 
    455         klass->set_mech_func = tny_combined_account_set_mech; 
     455        klass->set_secure_auth_mech_func = tny_combined_account_set_secure_auth_mech; 
    456456        klass->set_proto_func = tny_combined_account_set_proto; 
    457457        klass->set_user_func = tny_combined_account_set_user; 

  • trunk/po/ChangeLog

    r816 r1945  
     12007-05-14  set REAL_NAME environment variable  <murrayc@murrayc-desktop> 
     2 
     3        reviewed by: <delete if not using a buddy> 
     4 
     5        * Makefile.in.in: 
     6 
    172006-08-29 Robert-André Mauchin <zebob.m@gmail.com> 
    28 

  • trunk/po/Makefile.in.in

    r1836 r1945  
    2626prefix = @prefix@ 
    2727exec_prefix = @exec_prefix@ 
    28 datarootdir = @datarootdir@ 
    2928datadir = @datadir@ 
    3029libdir = @libdir@ 
    …… 
    4241GMSGFMT = @GMSGFMT@ 
    4342MSGFMT = @MSGFMT@ 
    44 MSGFMT_OPTS = @MSGFMT_OPTS@ 
    4543XGETTEXT = @XGETTEXT@ 
    4644MSGMERGE = msgmerge 
    …… 
    8179.po.gmo: 
    8280        file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ 
    83           && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< 
     81          && rm -f $$file && $(GMSGFMT) -c -o $$file $< 
    8482 
    8583.po.cat: