Changeset 1918

Show
Ignore:
Timestamp:
05/08/07 18:03:00
Author:
pvanhoof
Message:

Fixing compilation errors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1911 r1918  
    2424#include <stdlib.h> 
    2525#include <string.h> 
     26 
     27#include <tny-error.h> 
    2628 
    2729#include <glib.h> 
    …… 
    170172 
    171173static gboolean 
    172 tny_session_camel_alert_user (CamelSession *session, CamelSessionAlertType type, const GError *error, gboolean cancel) 
     174tny_session_camel_alert_user (CamelSession *session, CamelSessionAlertType type, const char *msg, gboolean cancel) 
    173175{ 
    174176        TnySessionCamel *self = (TnySessionCamel *)session; 
    …… 
    176178        GThread *thread; gboolean inf; 
    177179        gboolean retval = FALSE; 
     180        GError *err = NULL; 
    178181 
    179182        if (priv->account_store) 
    …… 
    196199                } 
    197200 
     201                g_set_error (&err, TNY_ACCOUNT_STORE_ERROR,  
     202                        TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT, msg); 
     203 
    198204                tny_lockable_lock (self->priv->ui_lock); 
     205 
    199206                retval = tny_account_store_alert ( 
    200207                        (TnyAccountStore*) self->priv->account_store,  
    201                         tnytype, error); 
     208                        tnytype, (const GError *) err); 
     209 
    202210                tny_lockable_unlock (self->priv->ui_lock); 
     211 
     212                g_error_free (err); 
    203213        } 
    204214 
    …… 
    415425                if (err != NULL)  
    416426                { 
    417                         tny_session_camel_alert_user (session, CAMEL_SESSION_ALERT_ERROR, err, FALSE); 
     427                        tny_session_camel_alert_user (session, CAMEL_SESSION_ALERT_ERROR, err->message, FALSE); 
    418428                        g_error_free (err); 
    419429                } 

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

    r1911 r1918  
    121121 
    122122        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, 
    123                 gtktype, GTK_BUTTONS_YES_NO, prompt); 
     123                gtktype, GTK_BUTTONS_YES_NO, error->message); 
    124124 
    125125        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) 

  • trunk/libtinymail/tny-enums.h

    r1884 r1918  
    4242        TNY_FOLDER_STORE_ERROR = 2, 
    4343        TNY_TRANSPORT_ACCOUNT_ERROR = 3, 
    44         TNY_ACCOUNT_ERROR = 4 
     44        TNY_ACCOUNT_ERROR = 4, 
     45        TNY_ACCOUNT_STORE_ERROR = 5 
    4546} TnyErrorDomain; 
    4647 
    …… 
    6263        TNY_TRANSPORT_ACCOUNT_ERROR_SEND = 13, 
    6364 
    64         TNY_ACCOUNT_ERROR_TRY_CONNECT = 14 
     65        TNY_ACCOUNT_ERROR_TRY_CONNECT = 14, 
     66        TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT = 15 
    6567} TnyError; 
    6668 

  • trunk/libtinymail/tny-error.c

    r1866 r1918  
    7575 
    7676      { TNY_ACCOUNT_ERROR_TRY_CONNECT, "TNY_ACCOUNT_ERROR_TRY_CONNECT", "account_error_try_connect" }, 
     77      { TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT, "TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT", "account_store_error_unknown_alert" }, 
    7778 
    7879      { 0, NULL, NULL } 

  • trunk/libtinymail/tny-error.h

    r1855 r1918  
    3333        TNY_TRANSPORT_ACCOUNT_ERROR = 3, 
    3434        TNY_ACCOUNT_ERROR = 4, 
     35        TNY_ACCOUNT_STORE_ERROR = 5 
    3536}; 
    3637 
    …… 
    5758 
    5859        TNY_ACCOUNT_ERROR_TRY_CONNECT = 14, 
     60 
     61        TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT = 15 
    5962}; 
    6063