Changeset 2043

Show
Ignore:
Timestamp:
05/23/07 23:57:38
Author:
pvanhoof
Message:

Fixed the OLPC build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2015 r2043  
    117117 
    118118        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, 
    119                                   gtktype, GTK_BUTTONS_YES_NO, prompt); 
     119                                  gtktype, GTK_BUTTONS_YES_NO, error->message); 
    120120 
    121121        if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) 
    …… 
    357357 
    358358 
    359  
    360 static void 
    361 tny_olpc_account_store_add_account (TnyAccountStore *self, TnyAccount *account, const gchar *type) 
    362 { 
    363         g_warning ("Not implemented\n"); 
    364  
    365         return; 
    366 } 
    367  
    368  
    369  
    370 void 
    371 tny_olpc_account_store_add_store_account (TnyOlpcAccountStore *self, TnyStoreAccount *account) 
    372 { 
    373         TnyOlpcAccountStorePriv *priv = TNY_OLPC_ACCOUNT_STORE_GET_PRIVATE (self); 
    374  
    375         tny_olpc_account_store_add_account (TNY_ACCOUNT_STORE (self), TNY_ACCOUNT (account), "store"); 
    376  
    377         g_signal_emit (self, tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_INSERTED], 0, account); 
    378  
    379         return; 
    380 } 
    381  
    382 void 
    383 tny_olpc_account_store_add_transport_account (TnyOlpcAccountStore *self, TnyTransportAccount *account) 
    384 { 
    385         TnyOlpcAccountStorePriv *priv = TNY_OLPC_ACCOUNT_STORE_GET_PRIVATE (self); 
    386  
    387         tny_olpc_account_store_add_account (TNY_ACCOUNT_STORE (self), TNY_ACCOUNT (account), "transport"); 
    388  
    389         g_signal_emit (self, tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_INSERTED], 0, account); 
    390  
    391         return; 
    392 } 
    393  
    394359static TnyDevice* 
    395360tny_olpc_account_store_get_device (TnyAccountStore *self) 
    …… 
    485450 
    486451        klass->get_accounts_func = tny_olpc_account_store_get_accounts; 
    487         klass->add_store_account_func = tny_olpc_account_store_add_store_account; 
    488         klass->add_transport_account_func = tny_olpc_account_store_add_transport_account; 
    489452        klass->get_cache_dir_func = tny_olpc_account_store_get_cache_dir; 
    490453        klass->get_device_func = tny_olpc_account_store_get_device; 

  • trunk/libtinymail-olpc/tny-olpc-device.c

    r1860 r2043  
    3636emit_status (TnyDevice *self) 
    3737{ 
    38         if (tny_gnome_device_is_online (self)) 
    39                 tny_gnome_device_on_online (self); 
     38        if (tny_olpc_device_is_online (self)) 
     39                tny_olpc_device_on_online (self); 
    4040        else 
    41                 tny_gnome_device_on_offline (self); 
     41                tny_olpc_device_on_offline (self); 
    4242} 
    4343 
    …… 
    4747        TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
    4848 
    49         const gboolean status_before = tny_gnome_device_is_online (self); 
     49        const gboolean status_before = tny_olpc_device_is_online (self); 
    5050 
    5151        priv->fset = FALSE; 
    …… 
    5353 
    5454        /* Signal if it changed: */ 
    55         if (status_before != tny_gnome_device_is_online (self)) 
     55        if (status_before != tny_olpc_device_is_online (self)) 
    5656                emit_status (self); 
    5757} 
    …… 
    6363        TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
    6464 
    65         const gboolean already_online = tny_gnome_device_is_online (self); 
     65        const gboolean already_online = tny_olpc_device_is_online (self); 
    6666 
    6767        priv->fset = TRUE; 
    …… 
    8181        TnyOlpcDevicePriv *priv = TNY_OLPC_DEVICE_GET_PRIVATE (self); 
    8282 
    83         const gboolean already_offline = !tny_gnome_device_is_online (self); 
     83        const gboolean already_offline = !tny_olpc_device_is_online (self); 
    8484 
    8585        priv->fset = TRUE;