Changeset 2054

Show
Ignore:
Timestamp:
05/27/07 22:49:00
Author:
pvanhoof
Message:

Several bugfixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libtinymail-gpe/tny-gpe-account-store.c

    r2015 r2054  
    3333#include <tny-account-store.h> 
    3434#include <tny-gpe-account-store.h> 
    35 #include <tny-gpe-password-dialog.h> 
     35#include <tny-gtk-password-dialog.h> 
    3636 
    3737#include <tny-account.h> 
     
    119119 
    120120        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, 
    121                                   gtktype, GTK_BUTTONS_YES_NO, prompt); 
     121               gtktype, GTK_BUTTONS_YES_NO, error->message); 
    122122 
    123123        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) 
  • trunk/libtinymail-gpe/tny-gpe-device.c

    r1860 r2054  
    3535emit_status (TnyDevice *self) 
    3636{ 
    37         if (tny_gnome_device_is_online (self)) 
    38                 tny_gnome_device_on_online (self); 
     37        if (tny_gpe_device_is_online (self)) 
     38                tny_gpe_device_on_online (self); 
    3939        else 
    40                 tny_gnome_device_on_offline (self); 
     40                tny_gpe_device_on_offline (self); 
    4141} 
    4242 
     
    4646        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
    4747 
    48         const gboolean status_before = tny_gnome_device_is_online (self); 
     48        const gboolean status_before = tny_gpe_device_is_online (self); 
    4949 
    5050        priv->fset = FALSE; 
     
    5252 
    5353        /* Signal if it changed: */ 
    54         if (status_before != tny_gnome_device_is_online (self)) 
     54        if (status_before != tny_gpe_device_is_online (self)) 
    5555                emit_status (self); 
    5656} 
     
    6161        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
    6262 
    63         const gboolean already_online = tny_gnome_device_is_online (self); 
     63        const gboolean already_online = tny_gpe_device_is_online (self); 
    6464 
    6565        priv->fset = TRUE; 
     
    7979        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
    8080 
    81         const gboolean already_offline = !tny_gnome_device_is_online (self); 
     81        const gboolean already_offline = !tny_gpe_device_is_online (self); 
    8282 
    8383        priv->fset = TRUE; 
     
    8787        if (!already_offline) 
    8888                emit_status (self); 
    89          
     89 
    9090        return; 
    9191} 
     
    111111{ 
    112112        TnyGpeDevicePriv *priv = TNY_GPE_DEVICE_GET_PRIVATE (self); 
    113         gboolean retval = TRUE; 
     113        gboolean retval = FALSE; 
     114 
     115        if (priv->fset) 
     116                retval = priv->forced; 
     117 
    114118        return retval; 
    115119} 
  • trunk/libtinymail-maemo/tny-maemo-device.c

    r1790 r2054  
    7272        priv->forced = FALSE; 
    7373 
    74  
    7574        tny_maemo_device_on_offline (self); 
    76          
     75 
    7776        return; 
    7877} 
     
    9897{ 
    9998        TnyMaemoDevicePriv *priv = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    100         gboolean retval = TRUE; 
     99        gboolean retval = FALSE; 
     100 
     101        if (priv->fset) 
     102                retval = priv->forced; 
     103 
    101104        return retval; 
    102105} 
     
    131134{ 
    132135        (*parent_class->finalize) (object); 
    133      
     136 
    134137        return; 
    135138}