Changeset 3125

Show
Ignore:
Timestamp:
12/14/07 02:33:49
Author:
pvanhoof
Message:

Renamed strategy to policy, which is a more accurate name

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3119 r3125  
    112007-12-13  Philip Van Hoof <pvanhoof@gnome.org> 
    22 
    3         * Added the TnyConnectionStrategy type for coping with connectivity 
     3        * Added the TnyConnectionPolicy type for coping with connectivity 
    44        changes (for example sheduling a reconnect or asking the user what to 
    55        do about the event of a lost connection) 
    6         * Added two connection strategies. One that retries every five seconds 
     6        * Added two connection policies. One that retries every five seconds 
    77        to reconnect, and recovers the state (the selected folder) 
    88 

  • trunk/libtinymail-camel/Makefile.am

    r3119 r3125  
    3939        tny-camel-bs-mime-part.h \ 
    4040        tny-camel-bs-msg-receive-strategy.h \ 
    41         tny-camel-default-connection-strategy.h \ 
    42         tny-camel-recover-connection-strategy.h 
     41        tny-camel-default-connection-policy.h \ 
     42        tny-camel-recover-connection-policy.h 
    4343 
    4444libtinymail_camel_priv_headers = \ 
    …… 
    9696        tny-camel-bs-msg-receive-strategy.c \ 
    9797        tny-camel-bs-msg-header.c \ 
    98         tny-camel-default-connection-strategy.c \ 
    99         tny-camel-recover-connection-strategy.c 
     98        tny-camel-default-connection-policy.c \ 
     99        tny-camel-recover-connection-policy.c 
    100100 
    101101libtinymail_camel_1_0_la_LIBADD = \ 

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

    r3119 r3125  
    7676        gchar *delete_this; 
    7777        TnyCamelQueue *queue; 
    78         TnyConnectionStrategy *con_strat; 
     78        TnyConnectionPolicy *con_strat; 
    7979}; 
    8080 

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

    r3119 r3125  
    4848#include <tny-status.h> 
    4949 
    50 #include <tny-camel-default-connection-strategy.h> 
     50#include <tny-camel-default-connection-policy.h> 
    5151 
    5252#include "tny-session-camel-priv.h" 
    …… 
    13711371 
    13721372        priv->retry_connect = FALSE; 
    1373         priv->con_strat = tny_camel_default_connection_strategy_new (); 
     1373        priv->con_strat = tny_camel_default_connection_policy_new (); 
    13741374        priv->queue = _tny_camel_queue_new (self); 
    13751375        priv->delete_this = NULL; 
    …… 
    17441744 
    17451745 
    1746 static TnyConnectionStrategy*  
    1747 tny_camel_account_get_connection_strategy (TnyAccount *self) 
    1748 { 
    1749         TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
    1750         return TNY_CONNECTION_STRATEGY (g_object_ref (priv->con_strat)); 
     1746static TnyConnectionPolicy*  
     1747tny_camel_account_get_connection_policy (TnyAccount *self) 
     1748{ 
     1749        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
     1750        return TNY_CONNECTION_POLICY (g_object_ref (priv->con_strat)); 
    17511751} 
    17521752 
    17531753static void  
    1754 tny_camel_account_set_connection_strategy (TnyAccount *self, TnyConnectionStrategy *strategy) 
     1754tny_camel_account_set_connection_policy (TnyAccount *self, TnyConnectionPolicy *policy) 
    17551755{ 
    17561756        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
    17571757        g_object_unref (priv->con_strat); 
    1758         priv->con_strat = TNY_CONNECTION_STRATEGY (g_object_ref (strategy)); 
     1758        priv->con_strat = TNY_CONNECTION_POLICY (g_object_ref (policy)); 
    17591759        return; 
    17601760} 
    …… 
    21132113        klass->stop_operation_func =  tny_camel_account_stop_operation; 
    21142114        klass->is_ready_func = tny_camel_account_is_ready; 
    2115         klass->set_connection_strategy_func = tny_camel_account_set_connection_strategy; 
    2116         klass->get_connection_strategy_func = tny_camel_account_get_connection_strategy; 
     2115        klass->set_connection_policy_func = tny_camel_account_set_connection_policy; 
     2116        klass->get_connection_policy_func = tny_camel_account_get_connection_policy; 
    21172117 
    21182118        return; 

  • trunk/libtinymail-camel/tny-camel-default-connection-policy.c

    r3119 r3125  
    55#include <glib/gi18n-lib.h> 
    66 
    7 #include <tny-camel-default-connection-strategy.h> 
     7#include <tny-camel-default-connection-policy.h> 
    88 
    99static GObjectClass *parent_class = NULL; 
    1010 
    1111static void 
    12 tny_camel_default_connection_strategy_set_current (TnyConnectionStrategy *self, TnyAccount *account, TnyFolder *folder) 
     12tny_camel_default_connection_policy_set_current (TnyConnectionPolicy *self, TnyAccount *account, TnyFolder *folder) 
    1313{ 
    1414        return; 
    …… 
    1616 
    1717static void 
    18 tny_camel_default_connection_strategy_on_connect (TnyConnectionStrategy *self, TnyAccount *account) 
     18tny_camel_default_connection_policy_on_connect (TnyConnectionPolicy *self, TnyAccount *account) 
    1919{ 
    2020        return; 
    …… 
    2222 
    2323static void 
    24 tny_camel_default_connection_strategy_on_connection_broken (TnyConnectionStrategy *self, TnyAccount *account) 
     24tny_camel_default_connection_policy_on_connection_broken (TnyConnectionPolicy *self, TnyAccount *account) 
    2525{ 
    2626        return; 
    …… 
    2828 
    2929static void 
    30 tny_camel_default_connection_strategy_on_disconnect (TnyConnectionStrategy *self, TnyAccount *account) 
     30tny_camel_default_connection_policy_on_disconnect (TnyConnectionPolicy *self, TnyAccount *account) 
    3131{ 
    3232        return; 
    …… 
    3434 
    3535static void 
    36 tny_camel_default_connection_strategy_finalize (GObject *object) 
     36tny_camel_default_connection_policy_finalize (GObject *object) 
    3737{ 
    3838        parent_class->finalize (object); 
    …… 
    4040 
    4141static void 
    42 tny_camel_default_connection_strategy_instance_init (GTypeInstance *instance, gpointer g_class) 
     42tny_camel_default_connection_policy_instance_init (GTypeInstance *instance, gpointer g_class) 
    4343{ 
    4444} 
    4545 
    4646static void 
    47 tny_connection_strategy_init (TnyConnectionStrategyIface *klass) 
     47tny_connection_policy_init (TnyConnectionPolicyIface *klass) 
    4848{ 
    49         klass->on_connect_func = tny_camel_default_connection_strategy_on_connect; 
    50         klass->on_connection_broken_func = tny_camel_default_connection_strategy_on_connection_broken; 
    51         klass->on_disconnect_func = tny_camel_default_connection_strategy_on_disconnect; 
    52         klass->set_current_func = tny_camel_default_connection_strategy_set_current; 
     49        klass->on_connect_func = tny_camel_default_connection_policy_on_connect; 
     50        klass->on_connection_broken_func = tny_camel_default_connection_policy_on_connection_broken; 
     51        klass->on_disconnect_func = tny_camel_default_connection_policy_on_disconnect; 
     52        klass->set_current_func = tny_camel_default_connection_policy_set_current; 
    5353} 
    5454 
    5555static void 
    56 tny_camel_default_connection_strategy_class_init (TnyCamelDefaultConnectionStrategyClass *klass) 
     56tny_camel_default_connection_policy_class_init (TnyCamelDefaultConnectionPolicyClass *klass) 
    5757{ 
    5858        GObjectClass *object_class; 
    …… 
    6060        parent_class = g_type_class_peek_parent (klass); 
    6161        object_class = (GObjectClass*) klass; 
    62         object_class->finalize = tny_camel_default_connection_strategy_finalize; 
     62        object_class->finalize = tny_camel_default_connection_policy_finalize; 
    6363} 
    6464 
    …… 
    6666 
    6767/** 
    68  * tny_camel_default_connection_strategy_new: 
     68 * tny_camel_default_connection_policy_new: 
    6969 *  
    70  * A connection strategy that does nothing special 
     70 * A connection policy that does nothing special 
    7171 * 
    72  * Return value: A new #TnyConnectionStrategy instance  
     72 * Return value: A new #TnyConnectionPolicy instance  
    7373 **/ 
    74 TnyConnectionStrategy* 
    75 tny_camel_default_connection_strategy_new (void) 
     74TnyConnectionPolicy* 
     75tny_camel_default_connection_policy_new (void) 
    7676{ 
    77         return TNY_CONNECTION_STRATEGY (g_object_new (TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY, NULL)); 
     77        return TNY_CONNECTION_POLICY (g_object_new (TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY, NULL)); 
    7878} 
    7979 
    8080GType 
    81 tny_camel_default_connection_strategy_get_type (void) 
     81tny_camel_default_connection_policy_get_type (void) 
    8282{ 
    8383        static GType type = 0; 
    …… 
    8686                static const GTypeInfo info =  
    8787                { 
    88                         sizeof (TnyCamelDefaultConnectionStrategyClass), 
     88                        sizeof (TnyCamelDefaultConnectionPolicyClass), 
    8989                        NULL,   /* base_init */ 
    9090                        NULL,   /* base_finalize */ 
    91                         (GClassInitFunc) tny_camel_default_connection_strategy_class_init,   /* class_init */ 
     91                        (GClassInitFunc) tny_camel_default_connection_policy_class_init,   /* class_init */ 
    9292                        NULL,   /* class_finalize */ 
    9393                        NULL,   /* class_data */ 
    94                         sizeof (TnyCamelDefaultConnectionStrategy), 
     94                        sizeof (TnyCamelDefaultConnectionPolicy), 
    9595                        0,      /* n_preallocs */ 
    96                         tny_camel_default_connection_strategy_instance_init,    /* instance_init */ 
     96                        tny_camel_default_connection_policy_instance_init,    /* instance_init */ 
    9797                        NULL 
    9898                }; 
    9999 
    100100 
    101                 static const GInterfaceInfo tny_connection_strategy_info =  
     101                static const GInterfaceInfo tny_connection_policy_info =  
    102102                { 
    103                         (GInterfaceInitFunc) tny_connection_strategy_init, /* interface_init */ 
     103                        (GInterfaceInitFunc) tny_connection_policy_init, /* interface_init */ 
    104104                        NULL,         /* interface_finalize */ 
    105105                        NULL          /* interface_data */ 
    …… 
    107107 
    108108                type = g_type_register_static (G_TYPE_OBJECT, 
    109                         "TnyCamelDefaultConnectionStrategy", 
     109                        "TnyCamelDefaultConnectionPolicy", 
    110110                        &info, 0); 
    111111 
    112                 g_type_add_interface_static (type, TNY_TYPE_CONNECTION_STRATEGY, 
    113                         &tny_connection_strategy_info); 
     112                g_type_add_interface_static (type, TNY_TYPE_CONNECTION_POLICY, 
     113                        &tny_connection_policy_info); 
    114114 
    115115        } 

  • trunk/libtinymail-camel/tny-camel-default-connection-policy.h

    r3118 r3125  
    1 #ifndef TNY_CAMEL_DEFAULT_CONNECTION_STRATEGY_H 
    2 #define TNY_CAMEL_DEFAULT_CONNECTION_STRATEGY_H 
     1#ifndef TNY_CAMEL_DEFAULT_CONNECTION_POLICY_H 
     2#define TNY_CAMEL_DEFAULT_CONNECTION_POLICY_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
    …… 
    2323#include <glib-object.h> 
    2424 
    25 #include <tny-connection-strategy.h> 
     25#include <tny-connection-policy.h> 
    2626 
    2727G_BEGIN_DECLS 
    2828 
    29 #define TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY             (tny_camel_default_connection_strategy_get_type ()) 
    30 #define TNY_CAMEL_DEFAULT_CONNECTION_STRATEGY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY, TnyCamelDefaultConnectionStrategy)) 
    31 #define TNY_CAMEL_DEFAULT_CONNECTION_STRATEGY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY, TnyCamelDefaultConnectionStrategyClass)) 
    32 #define TNY_IS_CAMEL_DEFAULT_CONNECTION_STRATEGY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY)) 
    33 #define TNY_IS_CAMEL_DEFAULT_CONNECTION_STRATEGY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY)) 
    34 #define TNY_CAMEL_DEFAULT_CONNECTION_STRATEGY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_STRATEGY, TnyCamelDefaultConnectionStrategyClass)) 
     29#define TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY             (tny_camel_default_connection_policy_get_type ()) 
     30#define TNY_CAMEL_DEFAULT_CONNECTION_POLICY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY, TnyCamelDefaultConnectionPolicy)) 
     31#define TNY_CAMEL_DEFAULT_CONNECTION_POLICY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY, TnyCamelDefaultConnectionPolicyClass)) 
     32#define TNY_IS_CAMEL_DEFAULT_CONNECTION_POLICY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY)) 
     33#define TNY_IS_CAMEL_DEFAULT_CONNECTION_POLICY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY)) 
     34#define TNY_CAMEL_DEFAULT_CONNECTION_POLICY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_CAMEL_DEFAULT_CONNECTION_POLICY, TnyCamelDefaultConnectionPolicyClass)) 
    3535 
    36 typedef struct _TnyCamelDefaultConnectionStrategy TnyCamelDefaultConnectionStrategy; 
    37 typedef struct _TnyCamelDefaultConnectionStrategyClass TnyCamelDefaultConnectionStrategyClass; 
     36typedef struct _TnyCamelDefaultConnectionPolicy TnyCamelDefaultConnectionPolicy; 
     37typedef struct _TnyCamelDefaultConnectionPolicyClass TnyCamelDefaultConnectionPolicyClass; 
    3838 
    39 struct _TnyCamelDefaultConnectionStrategy 
     39struct _TnyCamelDefaultConnectionPolicy 
    4040{ 
    4141        GObject parent; 
    …… 
    4343}; 
    4444 
    45 struct _TnyCamelDefaultConnectionStrategyClass 
     45struct _TnyCamelDefaultConnectionPolicyClass 
    4646{ 
    4747        GObjectClass parent_class; 
    4848}; 
    4949 
    50 GType tny_camel_default_connection_strategy_get_type (void); 
    51 TnyConnectionStrategy* tny_camel_default_connection_strategy_new (void); 
     50GType tny_camel_default_connection_policy_get_type (void); 
     51TnyConnectionPolicy* tny_camel_default_connection_policy_new (void); 
    5252 
    5353G_END_DECLS 

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

    r3119 r3125  
    4848#include <tny-simple-list.h> 
    4949#include <tny-merge-folder.h> 
    50 #include <tny-connection-strategy.h> 
     50#include <tny-connection-policy.h> 
    5151 
    5252 
    …… 
    16411641        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    16421642        TnyFolderChange *change = tny_folder_change_new (self); 
    1643         TnyConnectionStrategy *constrat; 
     1643        TnyConnectionPolicy *constrat; 
    16441644 
    16451645        tny_folder_change_set_new_all_count (change, priv->cached_length); 
    …… 
    16541654        } 
    16551655 
    1656         constrat = tny_account_get_connection_strategy (priv->account); 
    1657         tny_connection_strategy_set_current (constrat, priv->account, self); 
     1656        constrat = tny_account_get_connection_policy (priv->account); 
     1657        tny_connection_policy_set_current (constrat, priv->account, self); 
    16581658        g_object_unref (constrat); 
    16591659 
    …… 
    18371837        guint oldlen, oldurlen; 
    18381838        TnyFolderChange *change = NULL; 
    1839         TnyConnectionStrategy *constrat; 
     1839        TnyConnectionPolicy *constrat; 
    18401840 
    18411841        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv),  
    …… 
    18821882        g_object_unref (change); 
    18831883 
    1884         constrat = tny_account_get_connection_strategy (priv->account); 
    1885         tny_connection_strategy_set_current (constrat, priv->account, self); 
     1884        constrat = tny_account_get_connection_policy (priv->account); 
     1885        tny_connection_policy_set_current (constrat, priv->account, self); 
    18861886        g_object_unref (constrat); 
    18871887 

  • trunk/libtinymail-camel/tny-camel-recover-connection-policy.c

    r3124 r3125  
    77#include <tny-folder.h> 
    88 
    9 #include <tny-camel-recover-connection-strategy.h> 
     9#include <tny-camel-recover-connection-policy.h> 
    1010#include <tny-camel-account.h> 
    1111 
    …… 
    1313 
    1414 
    15 typedef struct _TnyCamelRecoverConnectionStrategyPriv TnyCamelRecoverConnectionStrategyPriv; 
    16  
    17 struct _TnyCamelRecoverConnectionStrategyPriv 
     15typedef struct _TnyCamelRecoverConnectionPolicyPriv TnyCamelRecoverConnectionPolicyPriv; 
     16 
     17struct _TnyCamelRecoverConnectionPolicyPriv 
    1818{ 
    1919        TnyFolder *folder; 
    …… 
    2222}; 
    2323 
    24 #define TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE(o) \ 
    25         (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY, TnyCamelRecoverConnectionStrategyPriv)) 
    26  
    27  
    28 static void 
    29 tny_camel_recover_connection_strategy_on_connect (TnyConnectionStrategy *self, TnyAccount *account) 
    30 { 
    31         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (self); 
     24#define TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE(o) \ 
     25        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY, TnyCamelRecoverConnectionPolicyPriv)) 
     26 
     27 
     28static void 
     29tny_camel_recover_connection_policy_on_connect (TnyConnectionPolicy *self, TnyAccount *account) 
     30{ 
     31        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (self); 
    3232 
    3333        if (priv->folder && priv->recover && priv->recov_folder) 
    …… 
    5555 
    5656/** 
    57  * tny_camel_recover_connection_strategy_set_recover_active_folder: 
    58  * @self: a #TnyCamelRecoverConnectionStrategy instance 
     57 * tny_camel_recover_connection_policy_set_recover_active_folder: 
     58 * @self: a #TnyCamelRecoverConnectionPolicy instance 
    5959 * @setting: whether to recover the active folder 
    6060 *  
    …… 
    6565 **/ 
    6666void  
    67 tny_camel_recover_connection_strategy_set_recover_active_folder (TnyCamelRecoverConnectionStrategy *self, gboolean setting) 
    68 { 
    69         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (self); 
     67tny_camel_recover_connection_policy_set_recover_active_folder (TnyCamelRecoverConnectionPolicy *self, gboolean setting) 
     68{ 
     69        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (self); 
    7070        priv->recov_folder = setting; 
    7171} 
    …… 
    7373 
    7474/** 
    75  * tny_camel_recover_connection_strategy_set_reconnect_delay: 
    76  * @self: a #TnyCamelRecoverConnectionStrategy instance 
     75 * tny_camel_recover_connection_policy_set_reconnect_delay: 
     76 * @self: a #TnyCamelRecoverConnectionPolicy instance 
    7777 * @milliseconds: delay before a reconnect attempt happens, use -1 to disable 
    7878 *  
    …… 
    8181 **/ 
    8282void  
    83 tny_camel_recover_connection_strategy_set_reconnect_delay (TnyCamelRecoverConnectionStrategy *self, gint milliseconds) 
    84 { 
    85         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (self); 
     83tny_camel_recover_connection_policy_set_reconnect_delay (TnyCamelRecoverConnectionPolicy *self, gint milliseconds) 
     84{ 
     85        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (self); 
    8686        priv->recon_delay = milliseconds; 
    8787} 
    8888 
    8989static void 
    90 tny_camel_recover_connection_strategy_on_connection_broken (TnyConnectionStrategy *self, TnyAccount *account) 
    91 { 
    92         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (self); 
     90tny_camel_recover_connection_policy_on_connection_broken (TnyConnectionPolicy *self, TnyAccount *account) 
     91{ 
     92        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (self); 
    9393 
    9494        priv->recover = TRUE; 
    …… 
    102102 
    103103static void 
    104 tny_camel_recover_connection_strategy_on_disconnect (TnyConnectionStrategy *self, TnyAccount *account) 
     104tny_camel_recover_connection_policy_on_disconnect (TnyConnectionPolicy *self, TnyAccount *account) 
    105105{ 
    106106        return; 
    …… 
    110110notify_folder_del (gpointer user_data, GObject *account) 
    111111{ 
    112         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (user_data); 
     112        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (user_data); 
    113113        priv->folder = NULL; 
    114114} 
    115115 
    116116static void 
    117 tny_camel_recover_connection_strategy_set_current (TnyConnectionStrategy *self, TnyAccount *account, TnyFolder *folder) 
    118 { 
    119         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (self); 
     117tny_camel_recover_connection_policy_set_current (TnyConnectionPolicy *self, TnyAccount *account, TnyFolder *folder) 
     118{ 
     119        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (self); 
    120120        if (priv->folder) 
    121121                g_object_weak_unref (G_OBJECT (priv->folder), notify_folder_del, self); 
    …… 
    125125 
    126126static void 
    127 tny_camel_recover_connection_strategy_finalize (GObject *object) 
    128 { 
    129         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (object); 
     127tny_camel_recover_connection_policy_finalize (GObject *object) 
     128{ 
     129        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (object); 
    130130 
    131131        if (priv->folder) 
    …… 
    136136 
    137137static void 
    138 tny_camel_recover_connection_strategy_instance_init (GTypeInstance *instance, gpointer g_class) 
    139 { 
    140         TnyCamelRecoverConnectionStrategyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_PRIVATE (instance); 
     138tny_camel_recover_connection_policy_instance_init (GTypeInstance *instance, gpointer g_class) 
     139{ 
     140        TnyCamelRecoverConnectionPolicyPriv *priv = TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_PRIVATE (instance); 
    141141        priv->folder = NULL; 
    142142        priv->recover = FALSE; 
    …… 
    146146 
    147147static void 
    148 tny_connection_strategy_init (TnyConnectionStrategyIface *klass) 
    149 { 
    150         klass->on_connect_func = tny_camel_recover_connection_strategy_on_connect; 
    151         klass->on_connection_broken_func = tny_camel_recover_connection_strategy_on_connection_broken; 
    152         klass->on_disconnect_func = tny_camel_recover_connection_strategy_on_disconnect; 
    153         klass->set_current_func = tny_camel_recover_connection_strategy_set_current; 
    154 } 
    155  
    156 static void 
    157 tny_camel_recover_connection_strategy_class_init (TnyCamelRecoverConnectionStrategyClass *klass) 
     148tny_connection_policy_init (TnyConnectionPolicyIface *klass) 
     149{ 
     150        klass->on_connect_func = tny_camel_recover_connection_policy_on_connect; 
     151        klass->on_connection_broken_func = tny_camel_recover_connection_policy_on_connection_broken; 
     152        klass->on_disconnect_func = tny_camel_recover_connection_policy_on_disconnect; 
     153        klass->set_current_func = tny_camel_recover_connection_policy_set_current; 
     154} 
     155 
     156static void 
     157tny_camel_recover_connection_policy_class_init (TnyCamelRecoverConnectionPolicyClass *klass) 
    158158{ 
    159159        GObjectClass *object_class; 
    …… 
    161161        parent_class = g_type_class_peek_parent (klass); 
    162162        object_class = (GObjectClass*) klass; 
    163         object_class->finalize = tny_camel_recover_connection_strategy_finalize; 
    164  
    165         g_type_class_add_private (object_class, sizeof (TnyCamelRecoverConnectionStrategyPriv)); 
     163        object_class->finalize = tny_camel_recover_connection_policy_finalize; 
     164 
     165        g_type_class_add_private (object_class, sizeof (TnyCamelRecoverConnectionPolicyPriv)); 
    166166 
    167167} 
    168168 
    169169/** 
    170  * tny_camel_recover_connection_strategy_new: 
     170 * tny_camel_recover_connection_policy_new: 
    171171 *  
    172  * A connection strategy that tries to camel_recover the connection and the currently 
     172 * A connection policy that tries to camel_recover the connection and the currently 
    173173 * selected folder. 
    174174 * 
    175  * Return value: A new #TnyConnectionStrategy instance  
     175 * Return value: A new #TnyConnectionPolicy instance  
    176176 **/ 
    177 TnyConnectionStrategy* 
    178 tny_camel_recover_connection_strategy_new (void) 
    179 { 
    180         return TNY_CONNECTION_STRATEGY (g_object_new (TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY, NULL)); 
     177TnyConnectionPolicy* 
     178tny_camel_recover_connection_policy_new (void) 
     179{ 
     180        return TNY_CONNECTION_POLICY (g_object_new (TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY, NULL)); 
    181181} 
    182182 
    183183 
    184184GType 
    185 tny_camel_recover_connection_strategy_get_type (void) 
     185tny_camel_recover_connection_policy_get_type (void) 
    186186{ 
    187187        static GType type = 0; 
    …… 
    190190                static const GTypeInfo info =  
    191191                { 
    192                         sizeof (TnyCamelRecoverConnectionStrategyClass), 
     192                        sizeof (TnyCamelRecoverConnectionPolicyClass), 
    193193                        NULL,   /* base_init */ 
    194194                        NULL,   /* base_finalize */ 
    195                         (GClassInitFunc) tny_camel_recover_connection_strategy_class_init,   /* class_init */ 
     195                        (GClassInitFunc) tny_camel_recover_connection_policy_class_init,   /* class_init */ 
    196196                        NULL,   /* class_finalize */ 
    197197                        NULL,   /* class_data */ 
    198                         sizeof (TnyCamelRecoverConnectionStrategy), 
     198                        sizeof (TnyCamelRecoverConnectionPolicy), 
    199199                        0,      /* n_preallocs */ 
    200                         tny_camel_recover_connection_strategy_instance_init,    /* instance_init */ 
     200                        tny_camel_recover_connection_policy_instance_init,    /* instance_init */ 
    201201                        NULL 
    202202                }; 
    203203 
    204204 
    205                 static const GInterfaceInfo tny_connection_strategy_info =  
     205                static const GInterfaceInfo tny_connection_policy_info =  
    206206                { 
    207                         (GInterfaceInitFunc) tny_connection_strategy_init, /* interface_init */ 
     207                        (GInterfaceInitFunc) tny_connection_policy_init, /* interface_init */ 
    208208                        NULL,         /* interface_finalize */ 
    209209                        NULL          /* interface_data */ 
    …… 
    211211 
    212212                type = g_type_register_static (G_TYPE_OBJECT, 
    213                         "TnyCamelRecoverConnectionStrategy", 
     213                        "TnyCamelRecoverConnectionPolicy", 
    214214                        &info, 0); 
    215215 
    216                 g_type_add_interface_static (type, TNY_TYPE_CONNECTION_STRATEGY, 
    217                         &tny_connection_strategy_info); 
     216                g_type_add_interface_static (type, TNY_TYPE_CONNECTION_POLICY, 
     217                        &tny_connection_policy_info); 
    218218 
    219219        } 

  • trunk/libtinymail-camel/tny-camel-recover-connection-policy.h

    r3121 r3125  
    1 #ifndef TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_H 
    2 #define TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_H 
     1#ifndef TNY_CAMEL_RECOVER_CONNECTION_POLICY_H 
     2#define TNY_CAMEL_RECOVER_CONNECTION_POLICY_H 
    33 
    44/* libtinymail - The Tiny Mail base library 
    …… 
    2323#include <glib-object.h> 
    2424 
    25 #include <tny-connection-strategy.h> 
     25#include <tny-connection-policy.h> 
    2626 
    2727G_BEGIN_DECLS 
    2828 
    29 #define TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY             (tny_camel_recover_connection_strategy_get_type ()) 
    30 #define TNY_CAMEL_RECOVER_CONNECTION_STRATEGY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY, TnyCamelRecoverConnectionStrategy)) 
    31 #define TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY, TnyCamelRecoverConnectionStrategyClass)) 
    32 #define TNY_IS_CAMEL_RECOVER_CONNECTION_STRATEGY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY)) 
    33 #define TNY_IS_CAMEL_RECOVER_CONNECTION_STRATEGY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY)) 
    34 #define TNY_CAMEL_RECOVER_CONNECTION_STRATEGY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_CAMEL_RECOVER_CONNECTION_STRATEGY, TnyCamelRecoverConnectionStrategyClass)) 
     29#define TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY             (tny_camel_recover_connection_policy_get_type ()) 
     30#define TNY_CAMEL_RECOVER_CONNECTION_POLICY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY, TnyCamelRecoverConnectionPolicy)) 
     31#define TNY_CAMEL_RECOVER_CONNECTION_POLICY_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY, TnyCamelRecoverConnectionPolicyClass)) 
     32#define TNY_IS_CAMEL_RECOVER_CONNECTION_POLICY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY)) 
     33#define TNY_IS_CAMEL_RECOVER_CONNECTION_POLICY_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY)) 
     34#define TNY_CAMEL_RECOVER_CONNECTION_POLICY_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_CAMEL_RECOVER_CONNECTION_POLICY, TnyCamelRecoverConnectionPolicyClass)) 
    3535 
    36 typedef struct _TnyCamelRecoverConnectionStrategy TnyCamelRecoverConnectionStrategy; 
    37 typedef struct _TnyCamelRecoverConnectionStrategyClass TnyCamelRecoverConnectionStrategyClass; 
     36typedef struct _TnyCamelRecoverConnectionPolicy TnyCamelRecoverConnectionPolicy; 
     37typedef struct _TnyCamelRecoverConnectionPolicyClass TnyCamelRecoverConnectionPolicyClass; 
    3838 
    39 struct _TnyCamelRecoverConnectionStrategy 
     39struct _TnyCamelRecoverConnectionPolicy 
    4040{ 
    4141        GObject parent; 
    …… 
    4343}; 
    4444 
    45 struct _TnyCamelRecoverConnectionStrategyClass 
     45struct _TnyCamelRecoverConnectionPolicyClass 
    4646{ 
    4747        GObjectClass parent_class; 
    4848}; 
    4949 
    50 GType tny_camel_recover_connection_strategy_get_type (void); 
    51 TnyConnectionStrategy* tny_camel_recover_connection_strategy_new (void); 
     50GType tny_camel_recover_connection_policy_get_type (void); 
     51TnyConnectionPolicy* tny_camel_recover_connection_policy_new (void); 
    5252 
    53 void tny_camel_recover_connection_strategy_set_reconnect_delay (TnyCamelRecoverConnectionStrategy *self, gint milliseconds); 
    54 void tny_camel_recover_connection_strategy_set_recover_active_folder (TnyCamelRecoverConnectionStrategy *self, gboolean setting); 
     53void tny_camel_recover_connection_policy_set_reconnect_delay (TnyCamelRecoverConnectionPolicy *self, gint milliseconds); 
     54void tny_camel_recover_connection_policy_set_recover_active_folder (TnyCamelRecoverConnectionPolicy *self, gboolean setting); 
    5555 
    5656G_END_DECLS 

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

    r3119 r3125  
    207207{ 
    208208        TnyAccount *self = (TnyAccount *) user_data; 
    209         TnyConnectionStrategy *strategy = tny_account_get_connection_strategy (self); 
    210  
    211         tny_connection_strategy_on_connect (strategy, self); 
     209        TnyConnectionPolicy *strategy = tny_account_get_connection_policy (self); 
     210 
     211        tny_connection_policy_on_connect (strategy, self); 
    212212 
    213213        g_object_unref (strategy); 
    …… 
    221221{ 
    222222        TnyAccount *self = (TnyAccount *) user_data; 
    223         TnyConnectionStrategy *strategy = tny_account_get_connection_strategy (self); 
    224  
    225         tny_connection_strategy_on_connection_broken (strategy, self); 
     223        TnyConnectionPolicy *strategy = tny_account_get_connection_policy (self); 
     224 
     225        tny_connection_policy_on_connection_broken (strategy, self); 
    226226 
    227227        g_object_unref (strategy); 
    …… 
    235235{ 
    236236        TnyAccount *self = (TnyAccount *) user_data; 
    237         TnyConnectionStrategy *strategy = tny_account_get_connection_strategy (self); 
    238  
    239         tny_connection_strategy_on_disconnect (strategy, self); 
     237        TnyConnectionPolicy *strategy = tny_account_get_connection_policy (self); 
     238 
     239        tny_connection_policy_on_disconnect (strategy, self); 
    240240 
    241241        g_object_unref (strategy); 

  • trunk/libtinymail/Makefile.am

    r3118 r3125  
    5050        tny-merge-folder.h \ 
    5151        tny-combined-account.h \ 
    52         tny-connection-strategy.h 
     52        tny-connection-policy.h 
    5353 
    5454libtinymail_1_0_la_SOURCES = \ 
    …… 
    9393        tny-idle-stopper.c \ 
    9494        tny-progress-info.c \ 
    95         tny-connection-strategy.c \ 
     95        tny-connection-policy.c \ 
    9696        $(private_headers) 
    9797 

  • trunk/libtinymail/tny-account.c

    r3118 r3125  
    3333 
    3434/** 
    35  * tny_account_get_connection_strategy: 
    36  * @self: a #TnyAccount object 
    37  * 
    38  * Get the connection strategy for @self. You must unreference the returned  
     35 * tny_account_get_connection_policy: 
     36 * @self: a #TnyAccount object 
     37 * 
     38 * Get the connection policy for @self. You must unreference the returned  
    3939 * value when you are finished with used it. 
    4040 * 
    41  * Return value: connection strategy 
    42  **/ 
    43 TnyConnectionStrategy*  
    44 tny_account_get_connection_strategy (TnyAccount *self) 
    45 { 
    46         TnyConnectionStrategy *retval; 
    47  
    48 #ifdef DBC /* require */ 
    49         g_assert (TNY_IS_ACCOUNT (self)); 
    50         g_assert (TNY_ACCOUNT_GET_IFACE (self)->get_connection_strategy_func != NULL); 
    51 #endif 
    52  
    53         retval = TNY_ACCOUNT_GET_IFACE (self)->get_connection_strategy_func (self); 
     41 * Return value: connection policy 
     42 **/ 
     43TnyConnectionPolicy*  
     44tny_account_get_connection_policy (TnyAccount *self) 
     45{ 
     46        TnyConnectionPolicy *retval; 
     47 
     48#ifdef DBC /* require */ 
     49        g_assert (TNY_IS_ACCOUNT (self)); 
     50        g_assert (TNY_ACCOUNT_GET_IFACE (self)->get_connection_policy_func != NULL); 
     51#endif 
     52 
     53        retval = TNY_ACCOUNT_GET_IFACE (self)->get_connection_policy_func (self); 
    5454 
    5555#ifdef DBC /* ensure*/ 
    56         g_assert (TNY_IS_CONNECTION_STRATEGY (retval)); 
    57 #endif 
    58  
    59         return retval; 
    60 } 
    61  
    62 /** 
    63  * tny_account_set_connection_strategy: 
    64  * @self: a #TnyAccount object 
    65  * @strategy: the #TnyConnectionStrategy 
     56        g_assert (TNY_IS_CONNECTION_POLICY (retval)); 
     57#endif 
     58 
     59        return retval; 
     60} 
     61 
     62/** 
     63 * tny_account_set_connection_policy: 
     64 * @self: a #TnyAccount object 
     65 * @policy: the #TnyConnectionStrategy 
    6666 * 
    6767 * Set the connection strategy for @self. 
    6868 **/ 
    6969void  
    70 tny_account_set_connection_strategy (TnyAccount *self, TnyConnectionStrategy *strategy) 
    71 { 
    72 #ifdef DBC /* require */ 
    73         g_assert (TNY_IS_ACCOUNT (self)); 
    74         g_assert (TNY_IS_CONNECTION_STRATEGY (strategy)); 
    75         g_assert (TNY_ACCOUNT_GET_IFACE (self)->set_connection_strategy_func != NULL); 
    76 #endif 
    77  
    78         TNY_ACCOUNT_GET_IFACE (self)->set_connection_strategy_func (self, strategy); 
     70tny_account_set_connection_policy (TnyAccount *self, TnyConnectionPolicy *policy) 
     71{ 
     72#ifdef DBC /* require */ 
     73        g_assert (TNY_IS_ACCOUNT (self)); 
     74        g_assert (TNY_IS_CONNECTION_POLICY (policy)); 
     75        g_assert (TNY_ACCOUNT_GET_IFACE (self)->set_connection_policy_func != NULL); 
     76#endif 
     77 
     78        TNY_ACCOUNT_GET_IFACE (self)->set_connection_policy_func (self, policy); 
    7979 
    8080#ifdef DBC /* ensure*/ 

  • trunk/libtinymail/tny-account.h

    r3118 r3125  
    2525#include <tny-shared.h> 
    2626#include <tny-status.h> 
    27 #include <tny-connection-strategy.h> 
     27#include <tny-connection-policy.h> 
    2828 
    2929G_BEGIN_DECLS 
    …… 
    110110        void (*stop_operation_func) (TnyAccount *self, gboolean *canceled); 
    111111        gboolean (*is_ready_func) (TnyAccount *self); 
    112         TnyConnectionStrategy* (*get_connection_strategy_func) (TnyAccount *self); 
    113         void (*set_connection_strategy_func) (TnyAccount *self, TnyConnectionStrategy *strategy); 
     112        TnyConnectionPolicy* (*get_connection_policy_func) (TnyAccount *self); 
     113        void (*set_connection_policy_func) (TnyAccount *self, TnyConnectionPolicy *policy); 
    114114 
    115115        /* Signals*/ 
    …… 
    150150void tny_account_stop_operation (TnyAccount *self, gboolean *canceled); 
    151151gboolean tny_account_is_ready (TnyAccount *self); 
    152 TnyConnectionStrategy* tny_account_get_connection_strategy (TnyAccount *self); 
    153 void tny_account_set_connection_strategy (TnyAccount *self, TnyConnectionStrategy *strategy); 
     152TnyConnectionPolicy* tny_account_get_connection_policy (TnyAccount *self); 
     153void tny_account_set_connection_policy (TnyAccount *self, TnyConnectionPolicy *policy); 
    154154 
    155155 

  • trunk/libtinymail/tny-connection-policy.c

    r3119 r3125  
    2121#include <tny-account.h> 
    2222#include <tny-folder.h> 
    23 #include <tny-connection-strategy.h> 
     23#include <tny-connection-policy.h> 
    2424#include <tny-list.h> 
    2525 
    2626 
    2727/** 
    28  * tny_connection_strategy_set_current: 
    29  * @self: A #TnyConnectionStrategy instance 
     28 * tny_connection_policy_set_current: 
     29 * @self: A #TnyConnectionPolicy instance 
    3030 * @account: the current #TnyAccount instance 
    3131 * @folder: the current #TnyFolder instance 
    …… 
    3535 **/ 
    3636void  
    37 tny_connection_strategy_set_current (TnyConnectionStrategy *self, TnyAccount *account, TnyFolder *folder) 
     37tny_connection_policy_set_current (TnyConnectionPolicy *self, TnyAccount *account, TnyFolder *folder) 
    3838{ 
    3939#ifdef DBC /* require */ 
    40         g_assert (TNY_IS_CONNECTION_STRATEGY (self)); 
     40        g_assert (TNY_IS_CONNECTION_POLICY (self)); 
    4141        g_assert (TNY_IS_ACCOUNT (account)); 
    4242        g_assert (TNY_IS_FOLDER (folder)); 
    4343 
    44         g_assert (TNY_CONNECTION_STRATEGY_GET_IFACE (self)->set_current_func != NULL); 
     44        g_assert (TNY_CONNECTION_POLICY_GET_IFACE (self)->set_current_func != NULL); 
    4545#endif 
    4646 
    47         TNY_CONNECTION_STRATEGY_GET_IFACE (self)->set_current_func (self, account, folder); 
     47        TNY_CONNECTION_POLICY_GET_IFACE (self)->set_current_func (self, account, folder); 
    4848 
    4949