Changeset 199

Show
Ignore:
Timestamp:
04/28/06 10:56:36
Author:
pvanhoof
Message:

Refactoring

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r194 r199  
    3232        CamelException *ex; 
    3333        gchar *url_string, *id, *user, *host, *proto; 
    34         GetPassFunc get_pass_func; 
    35         ForgetPassFunc forget_pass_func; 
     34        TnyGetPassFunc get_pass_func; 
     35        TnyForgetPassFunc forget_pass_func; 
    3636        gboolean pass_func_set, forget_pass_func_set; 
    3737        const TnyAccountStoreIface *store; 

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

    r196 r199  
    4747        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
    4848 
    49         if (priv->store) 
    50                 g_object_unref (G_OBJECT (priv->store)); 
    51  
    52         g_object_ref (G_OBJECT (store)); 
     49        /* No need to reference (would also be cross reference): If store dies, 
     50           self should also die. */ 
     51 
    5352        priv->store = store; 
    5453 
    …… 
    7170 
    7271        g_static_rec_mutex_lock (priv->service_lock); 
     72 
    7373        if (priv->id) 
    7474                g_free (priv->id); 
    …… 
    8787         
    8888        g_static_rec_mutex_lock (priv->service_lock); 
     89 
    8990        if (priv->proto) 
    9091                g_free (priv->proto); 
    …… 
    105106         
    106107        g_static_rec_mutex_lock (priv->service_lock); 
     108 
    107109        if (priv->user) 
    108110                g_free (priv->user); 
    …… 
    123125         
    124126        g_static_rec_mutex_lock (priv->service_lock); 
     127 
    125128        if (priv->host) 
    126129                g_free (priv->host); 
    …… 
    136139 
    137140void 
    138 tny_account_set_pass_func (TnyAccountIface *self, GetPassFunc get_pass_func) 
    139 { 
    140         TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
    141  
    142         g_static_rec_mutex_lock (priv->service_lock); 
     141tny_account_set_pass_func (TnyAccountIface *self, TnyGetPassFunc get_pass_func) 
     142{ 
     143        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
     144 
     145        g_static_rec_mutex_lock (priv->service_lock); 
     146 
    143147        tny_session_camel_set_pass_func (priv->session, self, get_pass_func); 
    144148        priv->get_pass_func = get_pass_func; 
    145149        priv->pass_func_set = TRUE; 
    146150 
     151        if (!TNY_ACCOUNT_GET_CLASS (self)->reconnect_func) 
     152                g_error ("This TnyAccountIface instance isn't a fully implemented type\n"); 
     153 
    147154        TNY_ACCOUNT_GET_CLASS (self)->reconnect_func (TNY_ACCOUNT (self)); 
    148155 
    …… 
    153160 
    154161void 
    155 tny_account_set_forget_pass_func (TnyAccountIface *self, ForgetPassFunc get_forget_pass_func) 
    156 { 
    157         TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
    158  
    159         g_static_rec_mutex_lock (priv->service_lock); 
     162tny_account_set_forget_pass_func (TnyAccountIface *self, TnyForgetPassFunc get_forget_pass_func) 
     163{ 
     164        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
     165 
     166        g_static_rec_mutex_lock (priv->service_lock); 
     167 
    160168        tny_session_camel_set_forget_pass_func (priv->session, self, get_forget_pass_func); 
    161169        priv->forget_pass_func = get_forget_pass_func; 
    162170        priv->forget_pass_func_set = TRUE; 
     171 
    163172        g_static_rec_mutex_unlock (priv->service_lock); 
    164173 
    …… 
    218227} 
    219228 
    220 GetPassFunc 
     229TnyGetPassFunc 
    221230tny_account_get_pass_func (TnyAccountIface *self) 
    222231{ 
    223232        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
    224         GetPassFunc retval; 
     233        TnyGetPassFunc retval; 
    225234 
    226235        g_static_rec_mutex_lock (priv->service_lock); 
    …… 
    231240} 
    232241 
    233 ForgetPassFunc 
     242TnyForgetPassFunc 
    234243tny_account_get_forget_pass_func (TnyAccountIface *self) 
    235244{ 
    236245        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self); 
    237         ForgetPassFunc retval; 
     246        TnyForgetPassFunc retval; 
    238247 
    239248        g_static_rec_mutex_lock (priv->service_lock); 
    …… 
    321330                g_free (priv->proto); 
    322331        g_static_rec_mutex_unlock (priv->service_lock); 
    323  
    324         if (priv->store) 
    325                 g_object_unref (G_OBJECT (priv->store)); 
    326332 
    327333        camel_exception_free (priv->ex); 

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

    r194 r199  
    5252{ 
    5353        CamelService *service; 
    54         GetPassFunc func; 
     54        TnyGetPassFunc func; 
    5555        TnyAccountIface *account; 
    5656 
    …… 
    6060{ 
    6161        CamelService *service; 
    62         ForgetPassFunc func; 
     62        TnyForgetPassFunc func; 
    6363        TnyAccountIface *account; 
    6464 
    …… 
    8080 **/ 
    8181void 
    82 tny_session_camel_set_forget_pass_func (TnySessionCamel *self, TnyAccountIface *account, ForgetPassFunc get_forget_pass_func) 
     82tny_session_camel_set_forget_pass_func (TnySessionCamel *self, TnyAccountIface *account, TnyForgetPassFunc get_forget_pass_func) 
    8383{ 
    8484        GList *copy = forget_password_funcs, *mark_del = NULL; 
    …… 
    141141 **/ 
    142142void 
    143 tny_session_camel_set_pass_func (TnySessionCamel *self, TnyAccountIface *account, GetPassFunc get_pass_func) 
     143tny_session_camel_set_pass_func (TnySessionCamel *self, TnyAccountIface *account, TnyGetPassFunc get_pass_func) 
    144144{ 
    145145        GList *copy = password_funcs, *mark_del = NULL; 
    …… 
    195195{ 
    196196        GList *copy = password_funcs; 
    197         GetPassFunc func; 
     197        TnyGetPassFunc func; 
    198198        TnyAccountIface *account; 
    199199        gboolean found = FALSE; 
    …… 
    229229{ 
    230230        GList *copy = forget_password_funcs; 
    231         ForgetPassFunc func; 
     231        TnyForgetPassFunc func; 
    232232        TnyAccountIface *account; 
    233233        gboolean found = FALSE; 

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

    r139 r199  
    4646        CamelSessionClass parent_class; 
    4747 
    48         void        (*set_pass_func_func) (TnySessionCamel *self, TnyAccountIface *account, GetPassFunc get_pass_func); 
    49         void        (*set_forget_pass_func_func) (TnySessionCamel *self, TnyAccountIface *account, ForgetPassFunc forget_pass_func); 
     48        void        (*set_pass_func_func) (TnySessionCamel *self, TnyAccountIface *account, TnyGetPassFunc get_pass_func); 
     49        void        (*set_forget_pass_func_func) (TnySessionCamel *self, TnyAccountIface *account, TnyForgetPassFunc forget_pass_func); 
    5050 
    5151}; 
    …… 
    5454TnySessionCamel*  tny_session_camel_get_instance  (void); 
    5555 
    56 void              tny_session_camel_set_pass_func (TnySessionCamel *self, TnyAccountIface *account, GetPassFunc get_pass_func); 
    57 void              tny_session_camel_set_forget_pass_func (TnySessionCamel *self, TnyAccountIface *account, ForgetPassFunc get_forget_pass_func); 
     56void              tny_session_camel_set_pass_func (TnySessionCamel *self, TnyAccountIface *account, TnyGetPassFunc get_pass_func); 
     57void              tny_session_camel_set_forget_pass_func (TnySessionCamel *self, TnyAccountIface *account, TnyForgetPassFunc get_forget_pass_func); 
    5858 
    5959G_END_DECLS 

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

    r181 r199  
    9090 **/ 
    9191void 
    92 tny_account_iface_set_forget_pass_func (TnyAccountIface *self, ForgetPassFunc get_forget_pass_func) 
     92tny_account_iface_set_forget_pass_func (TnyAccountIface *self, TnyForgetPassFunc get_forget_pass_func) 
    9393{ 
    9494        TNY_ACCOUNT_IFACE_GET_CLASS (self)->set_forget_pass_func_func (self, get_forget_pass_func); 
    …… 
    104104 * Return value: A pointer to the forget-password function 
    105105 **/ 
    106 ForgetPassFunc 
     106TnyForgetPassFunc 
    107107tny_account_iface_get_forget_pass_func (TnyAccountIface *self) 
    108108{ 
    …… 
    166166 **/ 
    167167void 
    168 tny_account_iface_set_pass_func (TnyAccountIface *self, GetPassFunc get_pass_func) 
     168tny_account_iface_set_pass_func (TnyAccountIface *self, TnyGetPassFunc get_pass_func) 
    169169{ 
    170170        TNY_ACCOUNT_IFACE_GET_CLASS (self)->set_pass_func_func (self, get_pass_func); 
    …… 
    222222 * Return value: A pointer to the get-password function 
    223223 **/ 
    224 GetPassFunc 
     224TnyGetPassFunc 
    225225tny_account_iface_get_pass_func (TnyAccountIface *self) 
    226226{ 

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

    r181 r199  
    4343        void (*set_user_func)              (TnyAccountIface *self, const gchar *user); 
    4444        void (*set_hostname_func)          (TnyAccountIface *self, const gchar *host); 
    45         void (*set_pass_func_func)         (TnyAccountIface *self, GetPassFunc get_pass_func); 
    46         void (*set_forget_pass_func_func)  (TnyAccountIface *self, ForgetPassFunc get_forget_pass_func); 
     45        void (*set_pass_func_func)         (TnyAccountIface *self, TnyGetPassFunc get_pass_func); 
     46        void (*set_forget_pass_func_func)  (TnyAccountIface *self, TnyForgetPassFunc get_forget_pass_func); 
    4747 
    4848        const gchar*    (*get_id_func )           (TnyAccountIface *self); 
    …… 
    5151        const gchar*    (*get_hostname_func)         (TnyAccountIface *self); 
    5252 
    53         GetPassFunc     (*get_pass_func_func)        (TnyAccountIface *self); 
    54         ForgetPassFunc  (*get_forget_pass_func_func) (TnyAccountIface *self); 
     53        TnyGetPassFunc     (*get_pass_func_func)        (TnyAccountIface *self); 
     54        TnyForgetPassFunc  (*get_forget_pass_func_func) (TnyAccountIface *self); 
    5555 
    5656        void                         (*set_account_store_func)     (TnyAccountIface *self, const TnyAccountStoreIface *store); 
    …… 
    6666void         tny_account_iface_set_user        (TnyAccountIface *self, const gchar *user); 
    6767void         tny_account_iface_set_hostname    (TnyAccountIface *self, const gchar *host); 
    68 void         tny_account_iface_set_pass_func   (TnyAccountIface *self, GetPassFunc get_pass_func); 
     68void         tny_account_iface_set_pass_func   (TnyAccountIface *self, TnyGetPassFunc get_pass_func); 
    6969 
    7070const gchar* tny_account_iface_get_id          (TnyAccountIface *self); 
    …… 
    7373const gchar* tny_account_iface_get_user        (TnyAccountIface *self); 
    7474const gchar* tny_account_iface_get_hostname    (TnyAccountIface *self); 
    75 GetPassFunc  tny_account_iface_get_pass_func   (TnyAccountIface *self); 
     75TnyGetPassFunc  tny_account_iface_get_pass_func   (TnyAccountIface *self); 
    7676 
    77 void         tny_account_iface_set_forget_pass_func   (TnyAccountIface *self, ForgetPassFunc get_forget_pass_func); 
    78 ForgetPassFunc  
     77void         tny_account_iface_set_forget_pass_func   (TnyAccountIface *self, TnyForgetPassFunc get_forget_pass_func); 
     78TnyForgetPassFunc  
    7979             tny_account_iface_get_forget_pass_func   (TnyAccountIface *self); 
    8080 

  • trunk/libtinymail/tny-shared.h

    r172 r199  
    4343typedef struct _TnyMsgHeaderProxy TnyMsgHeaderProxy; 
    4444typedef struct _TnyMsgHeaderProxyClass TnyMsgHeaderProxyClass; 
    45 typedef gchar* (*GetPassFunc) (TnyAccountIface *self, const gchar *prompt); 
    46 typedef void (*ForgetPassFunc) (TnyAccountIface *self); 
     45typedef gchar* (*TnyGetPassFunc) (TnyAccountIface *self, const gchar *prompt); 
     46typedef void (*TnyForgetPassFunc) (TnyAccountIface *self); 
    4747typedef enum _TnyStoreAccountFolderType TnyStoreAccountFolderType; 
    4848