Changeset 877

Show
Ignore:
Timestamp:
09/04/06 22:34:21
Author:
pvanhoof
Message:

Renamed the types in libtinymail-maemo

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r876 r877  
    22 
    33        * Renamed the GPE types in libtinymail-gpe 
     4        * Renamed the Maemo types in libtinymail-maemo 
    45        * Made compilation of the demo-ui optional 
    56        * Added some ifdefs to the demo-ui 
    67 
    7         * This was a major API change in libtinymail-gpe 
     8        * This was a major API change in libtinymail-gpe, libtinymail-maemo 
    89 
    9102006-09-04  Philip Van Hoof <pvanhoof@gnome.org> 

  • trunk/configure.ac

    r876 r877  
    6666        PLATFORMDIR=libtinymail-gnome-desktop  
    6767        build_demoui=true 
    68         PLATFORM="gnome" 
     68        PLATFORM=1 
    6969        ;; 
    7070  olpc) 
    …… 
    7575        with_html_component=none 
    7676        build_demoui=true 
    77         PLATFORM="olpc" 
     77        PLATFORM=4 
    7878        ;; 
    7979  maemo) 
    …… 
    8484        with_html_component=none 
    8585        build_demoui=true 
    86         PLATFORM="maemo" 
     86        PLATFORM=2 
    8787        ;; 
    8888  gpe)  
    8989        PLATFORMDIR=libtinymail-gpe  
    9090        build_demoui=true 
    91         PLATFORM="gpe" 
     91        PLATFORM=3 
    9292        ;; 
    9393  *)  
    9494        PLATFORMDIR=${with_platform} 
    9595        build_demoui=false 
    96         PLATFORM="unknown" 
     96        PLATFORM=0 
    9797esac], [PLATFORMDIR=libtinymail-gnome-desktop 
    9898        with_platform=gnome-desktop]) 

  • trunk/libtinymail-maemo/Makefile.am

    r848 r877  
    1111lib_LTLIBRARIES = libtinymail-maemo-1.0.la 
    1212 
    13 libtinymail_maemo_1_0_headers =                 \ 
    14         tny-account-store.h                     \ 
    15         tny-password-dialog.h                   \ 
    16         tny-device.h                            \ 
    17         tny-platform-factory.h 
     13libtinymail_maemo_1_0_headers =         \ 
     14        tny-maemo-account-store.h      \ 
     15        tny-maemo-password-dialog.h    \ 
     16        tny-maemo-device.h             \ 
     17        tny-maemo-platform-factory.h 
    1818 
    19 libtinymail_maemo_1_0_la_SOURCES =              \ 
    20         $(libtinymail_maemo_1_0_headers)        \ 
    21         tny-account-store.c                    \ 
    22         tny-device-priv.h                      \ 
    23         tny-device.c                           \ 
    24         tny-password-dialog.c                  \ 
    25         tny-platform-factory.c 
     19libtinymail_maemo_1_0_la_SOURCES =       \ 
     20        $(libtinymail_maemo_1_0_headers) \ 
     21        tny-maemo-account-store.c      \ 
     22        tny-maemo-device-priv.h                \ 
     23        tny-maemo-device.c             \ 
     24        tny-maemo-password-dialog.c    \ 
     25        tny-maemo-platform-factory.c 
    2626 
    2727libtinymail_maemo_1_0_la_LIBADD =       \ 

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

    r876 r877  
    3030 
    3131#include <tny-platform-factory-iface.h> 
    32 #include <tny-platform-factory.h> 
     32#include <tny-maemo-platform-factory.h> 
    3333#include <tny-account-store-iface.h> 
    34 #include <tny-account-store.h> 
    35 #include <tny-password-dialog.h> 
     34#include <tny-maemo-account-store.h> 
     35#include <tny-maemo-password-dialog.h> 
    3636#include <tny-account-iface.h> 
    3737#include <tny-store-account-iface.h> 
    …… 
    4343#include <tny-camel-transport-account.h> 
    4444#include <tny-session-camel.h> 
    45 #include <tny-device.h> 
     45#include <tny-maemo-device.h> 
    4646 
    4747 
    …… 
    5050static GObjectClass *parent_class = NULL; 
    5151 
    52 typedef struct _TnyAccountStorePriv TnyAccountStorePriv; 
    53  
    54 struct _TnyAccountStorePriv 
     52typedef struct _TnyMaemoAccountStorePriv TnyMaemoAccountStorePriv; 
     53 
     54struct _TnyMaemoAccountStorePriv 
    5555{ 
    5656        GConfClient *client; 
    …… 
    6161}; 
    6262 
    63 #define TNY_ACCOUNT_STORE_GET_PRIVATE(o)      \ 
    64         (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_ACCOUNT_STORE, TnyAccountStorePriv)) 
     63#define TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE(o)        \ 
     64        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MAEMO_ACCOUNT_STORE, TnyMaemoAccountStorePriv)) 
    6565 
    6666 
    …… 
    8080        if (G_UNLIKELY (!retval)) 
    8181        { 
    82                 GtkDialog *dialog = GTK_DIALOG (tny_password_dialog_new ()); 
     82                GtkDialog *dialog = GTK_DIALOG (tny_maemo_password_dialog_new ()); 
    8383         
    84                 tny_password_dialog_set_prompt (TNY_PASSWORD_DIALOG (dialog), prompt); 
     84                tny_maemo_password_dialog_set_prompt (TNY_MAEMO_PASSWORD_DIALOG (dialog), prompt); 
    8585 
    8686                if (G_LIKELY (gtk_dialog_run (dialog) == GTK_RESPONSE_OK)) 
    8787                { 
    88                         const gchar *pwd = tny_password_dialog_get_password  
    89                                 (TNY_PASSWORD_DIALOG (dialog)); 
     88                        const gchar *pwd = tny_maemo_password_dialog_get_password  
     89                                (TNY_MAEMO_PASSWORD_DIALOG (dialog)); 
    9090         
    9191                        retval = g_strdup (pwd); 
    …… 
    139139 
    140140static gboolean 
    141 tny_account_store_alert (TnyAccountStoreIface *self, TnyAlertType type, const gchar *prompt) 
     141tny_maemo_account_store_alert (TnyAccountStoreIface *self, TnyAlertType type, const gchar *prompt) 
    142142{ 
    143143        GtkMessageType gtktype; 
    …… 
    175175{ 
    176176        TnyAccountStoreIface *self = user_data; 
    177         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     177        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    178178 
    179179 
    …… 
    195195 
    196196static const gchar* 
    197 tny_account_store_get_cache_dir (TnyAccountStoreIface *self) 
    198 { 
    199         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     197tny_maemo_account_store_get_cache_dir (TnyAccountStoreIface *self) 
     198{ 
     199        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    200200 
    201201        if (G_UNLIKELY (!priv->cache_dir)) 
    …… 
    226226 
    227227static void 
    228 tny_account_store_get_accounts (TnyAccountStoreIface *self, TnyListIface *list, TnyGetAccountsRequestType types) 
    229 { 
    230         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     228tny_maemo_account_store_get_accounts (TnyAccountStoreIface *self, TnyListIface *list, TnyGetAccountsRequestType types) 
     229{ 
     230        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    231231        gint i=0, count; 
    232232 
    …… 
    379379 
    380380static void 
    381 tny_account_store_notify_add (TnyAccountStoreIface *self) 
    382 { 
    383         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     381tny_maemo_account_store_notify_add (TnyAccountStoreIface *self) 
     382{ 
     383        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    384384        priv->notify = gconf_client_notify_add (priv->client,  
    385385                "/apps/tinymail/accounts", gconf_listener_account_changed, 
    …… 
    389389 
    390390static void 
    391 tny_account_store_notify_remove (TnyAccountStoreIface *self) 
    392 { 
    393         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     391tny_maemo_account_store_notify_remove (TnyAccountStoreIface *self) 
     392{ 
     393        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    394394        gconf_client_notify_remove (priv->client, priv->notify); 
    395395        return; 
    …… 
    411411 
    412412static void 
    413 tny_account_store_add_account (TnyAccountStoreIface *self, TnyAccountIface *account, const gchar *type) 
    414 { 
    415         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     413tny_maemo_account_store_add_account (TnyAccountStoreIface *self, TnyAccountIface *account, const gchar *type) 
     414{ 
     415        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    416416        gchar *key = NULL; 
    417417        gint count = gconf_client_get_int (priv->client, "/apps/tinymail/accounts/count", NULL); 
    …… 
    447447 
    448448static void 
    449 tny_account_store_add_store_account (TnyAccountStoreIface *self, TnyStoreAccountIface *account) 
    450 { 
    451         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
    452  
    453         tny_account_store_notify_remove (self); 
    454         tny_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "store"); 
    455         tny_account_store_notify_add (self); 
     449tny_maemo_account_store_add_store_account (TnyAccountStoreIface *self, TnyStoreAccountIface *account) 
     450{ 
     451        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
     452 
     453        tny_maemo_account_store_notify_remove (self); 
     454        tny_maemo_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "store"); 
     455        tny_maemo_account_store_notify_add (self); 
    456456 
    457457        g_signal_emit (self, tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, account); 
    …… 
    461461 
    462462static void 
    463 tny_account_store_add_transport_account (TnyAccountStoreIface *self, TnyTransportAccountIface *account) 
    464 { 
    465         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
    466  
    467         tny_account_store_notify_remove (self); 
    468         tny_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "transport"); 
    469         tny_account_store_notify_add (self); 
     463tny_maemo_account_store_add_transport_account (TnyAccountStoreIface *self, TnyTransportAccountIface *account) 
     464{ 
     465        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
     466 
     467        tny_maemo_account_store_notify_remove (self); 
     468        tny_maemo_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "transport"); 
     469        tny_maemo_account_store_notify_add (self); 
    470470 
    471471        g_signal_emit (self, tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, account); 
    …… 
    475475 
    476476static TnyDeviceIface* 
    477 tny_account_store_get_device (TnyAccountStoreIface *self) 
    478 { 
    479         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     477tny_maemo_account_store_get_device (TnyAccountStoreIface *self) 
     478{ 
     479        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    480480 
    481481        return priv->device; 
    …… 
    483483 
    484484/** 
    485  * tny_account_store_new: 
     485 * tny_maemo_account_store_new: 
    486486 * 
    487487 * 
    488  * Return value: A new #TnyAccountStoreIface instance 
     488 * Return value: A new #TnyAccountStoreIface instance implemented for Maemo 
    489489 **/ 
    490 TnyAccountStore* 
    491 tny_account_store_new (void) 
    492 { 
    493         TnyAccountStore *self = g_object_new (TNY_TYPE_ACCOUNT_STORE, NULL); 
    494         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     490TnyAccountStoreIface* 
     491tny_maemo_account_store_new (void) 
     492{ 
     493        TnyMaemoAccountStore *self = g_object_new (TNY_TYPE_MAEMO_ACCOUNT_STORE, NULL); 
     494        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    495495        priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE_IFACE (self)); 
    496496 
    497         return self; 
    498 } 
    499  
    500  
    501 static void 
    502 tny_account_store_instance_init (GTypeInstance *instance, gpointer g_class) 
    503 { 
    504         TnyAccountStore *self = (TnyAccountStore *)instance; 
    505         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     497        return TNY_ACCOUNT_STORE_IFACE (self); 
     498} 
     499 
     500 
     501static void 
     502tny_maemo_account_store_instance_init (GTypeInstance *instance, gpointer g_class) 
     503{ 
     504        TnyMaemoAccountStore *self = (TnyMaemoAccountStore *)instance; 
     505        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    506506        TnyPlatformFactoryIface *platfact; 
    507507     
    …… 
    511511                GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); 
    512512 
    513         tny_account_store_notify_add (TNY_ACCOUNT_STORE_IFACE (self)); 
     513        tny_maemo_account_store_notify_add (TNY_ACCOUNT_STORE_IFACE (self)); 
    514514 
    515515        platfact = TNY_PLATFORM_FACTORY_IFACE ( 
    516                 tny_platform_factory_get_instance ()); 
     516                tny_maemo_platform_factory_get_instance ()); 
    517517 
    518518        priv->device = tny_platform_factory_iface_new_device (platfact); 
    …… 
    524524 
    525525static void 
    526 tny_account_store_finalize (GObject *object) 
    527 { 
    528         TnyAccountStore *self = (TnyAccountStore *)object;     
    529         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
    530  
    531         tny_account_store_notify_remove (TNY_ACCOUNT_STORE_IFACE (self)); 
     526tny_maemo_account_store_finalize (GObject *object) 
     527{ 
     528        TnyMaemoAccountStore *self = (TnyMaemoAccountStore *)object;   
     529        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
     530 
     531        tny_maemo_account_store_notify_remove (TNY_ACCOUNT_STORE_IFACE (self)); 
    532532        g_object_unref (G_OBJECT (priv->client)); 
    533533 
    …… 
    542542 
    543543/** 
    544  * tny_account_store_get_session: 
    545  * @self: The #TnyAccountStore instance 
     544 * tny_maemo_account_store_get_session: 
     545 * @self: The #TnyMaemoAccountStore instance 
    546546 * 
    547547 * Return value: A #TnySessionCamel instance 
    548548 **/ 
    549549TnySessionCamel* 
    550 tny_account_store_get_session (TnyAccountStore *self) 
    551 { 
    552         TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self); 
     550tny_maemo_account_store_get_session (TnyMaemoAccountStore *self) 
     551{ 
     552        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self); 
    553553 
    554554        return priv->session; 
    …… 
    556556 
    557557static void  
    558 tny_account_store_class_init (TnyAccountStoreClass *class) 
     558tny_maemo_account_store_class_init (TnyMaemoAccountStoreClass *class) 
    559559{ 
    560560        GObjectClass *object_class; 
    …… 
    563563        object_class = (GObjectClass*) class; 
    564564 
    565         object_class->finalize = tny_account_store_finalize; 
    566  
    567         g_type_class_add_private (object_class, sizeof (TnyAccountStorePriv)); 
     565        object_class->finalize = tny_maemo_account_store_finalize; 
     566 
     567        g_type_class_add_private (object_class, sizeof (TnyMaemoAccountStorePriv)); 
    568568 
    569569        return; 
    …… 
    575575        TnyAccountStoreIfaceClass *klass = (TnyAccountStoreIfaceClass *)g_iface; 
    576576 
    577         klass->get_accounts_func = tny_account_store_get_accounts; 
    578         klass->add_store_account_func = tny_account_store_add_store_account; 
    579         klass->add_transport_account_func = tny_account_store_add_transport_account; 
    580         klass->get_cache_dir_func = tny_account_store_get_cache_dir; 
    581         klass->get_device_func = tny_account_store_get_device; 
    582         klass->alert_func = tny_account_store_alert; 
     577        klass->get_accounts_func = tny_maemo_account_store_get_accounts; 
     578        klass->add_store_account_func = tny_maemo_account_store_add_store_account; 
     579        klass->add_transport_account_func = tny_maemo_account_store_add_transport_account; 
     580        klass->get_cache_dir_func = tny_maemo_account_store_get_cache_dir; 
     581        klass->get_device_func = tny_maemo_account_store_get_device; 
     582        klass->alert_func = tny_maemo_account_store_alert; 
    583583 
    584584        return; 
    …… 
    587587 
    588588GType  
    589 tny_account_store_get_type (void) 
     589tny_maemo_account_store_get_type (void) 
    590590{ 
    591591        static GType type = 0; 
    …… 
    595595                static const GTypeInfo info =  
    596596                { 
    597                   sizeof (TnyAccountStoreClass), 
     597                  sizeof (TnyMaemoAccountStoreClass), 
    598598                  NULL,   /* base_init */ 
    599599                  NULL,   /* base_finalize */ 
    600                   (GClassInitFunc) tny_account_store_class_init,   /* class_init */ 
     600                  (GClassInitFunc) tny_maemo_account_store_class_init,   /* class_init */ 
    601601                  NULL,   /* class_finalize */ 
    602602                  NULL,   /* class_data */ 
    603                   sizeof (TnyAccountStore), 
     603                  sizeof (TnyMaemoAccountStore), 
    604604                  0,      /* n_preallocs */ 
    605                   tny_account_store_instance_init    /* instance_init */ 
     605                  tny_maemo_account_store_instance_init    /* instance_init */ 
    606606                }; 
    607607 
    …… 
    614614 
    615615                type = g_type_register_static (G_TYPE_OBJECT, 
    616                         "TnyAccountStore", 
     616                        "TnyMaemoAccountStore", 
    617617                        &info, 0); 
    618618 

  • trunk/libtinymail-maemo/tny-maemo-account-store.h

    r876 r877  
    1 #ifndef TNY_ACCOUNT_STORE_H 
    2 #define TNY_ACCOUNT_STORE_H 
     1#ifndef TNY_MAEMO_ACCOUNT_STORE_H 
     2#define TNY_MAEMO_ACCOUNT_STORE_H 
    33 
    44/* tinymail - Tiny Mail 
    …… 
    2828G_BEGIN_DECLS 
    2929 
    30 #define TNY_TYPE_ACCOUNT_STORE             (tny_account_store_get_type ()) 
    31 #define TNY_ACCOUNT_STORE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_ACCOUNT_STORE, TnyAccountStore)) 
    32 #define TNY_ACCOUNT_STORE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_ACCOUNT_STORE, TnyAccountStoreClass)) 
    33 #define TNY_IS_ACCOUNT_STORE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_ACCOUNT_STORE)) 
    34 #define TNY_IS_ACCOUNT_STORE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_ACCOUNT_STORE)) 
    35 #define TNY_ACCOUNT_STORE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_ACCOUNT_STORE, TnyAccountStoreClass)) 
     30#define TNY_TYPE_MAEMO_ACCOUNT_STORE             (tny_maemo_account_store_get_type ()) 
     31#define TNY_MAEMO_ACCOUNT_STORE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_MAEMO_ACCOUNT_STORE, TnyMaemoAccountStore)) 
     32#define TNY_MAEMO_ACCOUNT_STORE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_MAEMO_ACCOUNT_STORE, TnyMaemoAccountStoreClass)) 
     33#define TNY_IS_MAEMO_ACCOUNT_STORE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_MAEMO_ACCOUNT_STORE)) 
     34#define TNY_IS_MAEMO_ACCOUNT_STORE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_MAEMO_ACCOUNT_STORE)) 
     35#define TNY_MAEMO_ACCOUNT_STORE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_MAEMO_ACCOUNT_STORE, TnyMaemoAccountStoreClass)) 
    3636 
    37 typedef struct _TnyAccountStore TnyAccountStore; 
    38 typedef struct _TnyAccountStoreClass TnyAccountStoreClass; 
     37typedef struct _TnyMaemoAccountStore TnyMaemoAccountStore; 
     38typedef struct _TnyMaemoAccountStoreClass TnyMaemoAccountStoreClass; 
    3939 
    40 struct _TnyAccountStore 
     40struct _TnyMaemoAccountStore 
    4141{ 
    4242        GObject parent; 
    4343}; 
    4444 
    45 struct _TnyAccountStoreClass 
     45struct _TnyMaemoAccountStoreClass 
    4646{ 
    4747        GObjectClass parent; 
    4848}; 
    4949 
    50 GType               tny_account_store_get_type      (void); 
    51 TnyAccountStore*    tny_account_store_new            (void); 
    52 TnySessionCamel*    tny_account_store_get_session    (TnyAccountStore *self); 
     50GType tny_maemo_account_store_get_type (void); 
     51TnyAccountStoreIface* tny_maemo_account_store_new (void); 
     52TnySessionCamel* tny_maemo_account_store_get_session (TnyMaemoAccountStore *self); 
    5353 
    5454G_END_DECLS 

  • trunk/libtinymail-maemo/tny-maemo-device-priv.h

    r876 r877  
    1 #ifndef TNY_DEVICE_PRIV_H 
    2 #define TNY_DEVICE_PRIV_H 
     1#ifndef TNY_MAEMO_DEVICE_PRIV_H 
     2#define TNY_MAEMO_DEVICE_PRIV_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
    …… 
    2121 */ 
    2222 
    23 typedef struct _TnyDevicePriv TnyDevicePriv; 
     23typedef struct _TnyMaemoDevicePriv TnyMaemoDevicePriv; 
    2424 
    25 struct _TnyDevicePriv 
     25struct _TnyMaemoDevicePriv 
    2626{ 
    2727        gboolean forced, fset; 
    …… 
    2929 
    3030 
    31 #define TNY_DEVICE_GET_PRIVATE(o)     \ 
    32         (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_DEVICE, TnyDevicePriv)) 
     31#define TNY_MAEMO_DEVICE_GET_PRIVATE(o)       \ 
     32        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MAEMO_DEVICE, TnyMaemoDevicePriv)) 
    3333 
    3434#endif 

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

    r876 r877  
    2222#include <glib/gi18n-lib.h> 
    2323 
    24 #include <tny-device.h> 
     24#include <tny-maemo-device.h> 
    2525 
    2626static GObjectClass *parent_class = NULL; 
    2727 
    28 #include "tny-device-priv.h" 
     28#include "tny-maemo-device-priv.h" 
    2929 
    30 static void tny_device_on_online (TnyDeviceIface *self); 
    31 static void tny_device_on_offline (TnyDeviceIface *self); 
    32 static gboolean tny_device_is_online (TnyDeviceIface *self); 
     30static void tny_maemo_device_on_online (TnyDeviceIface *self); 
     31static void tny_maemo_device_on_offline (TnyDeviceIface *self); 
     32static gboolean tny_maemo_device_is_online (TnyDeviceIface *self); 
    3333 
    3434 
    3535static void  
    36 tny_device_reset (TnyDeviceIface *self) 
     36tny_maemo_device_reset (TnyDeviceIface *self) 
    3737{ 
    38         TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); 
     38        TnyMaemoDevicePriv *priv = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    3939 
    4040        priv->fset = FALSE; 
    …… 
    4444 
    4545static void  
    46 tny_device_force_online (TnyDeviceIface *self) 
     46tny_maemo_device_force_online (TnyDeviceIface *self) 
    4747{ 
    48         TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); 
     48        TnyMaemoDevicePriv *priv = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    4949 
    5050        priv->fset = TRUE; 
    5151        priv->forced = TRUE; 
    5252 
    53         tny_device_on_online (self); 
     53        tny_maemo_device_on_online (self); 
    5454 
    5555        return; 
    …… 
    5858 
    5959static void 
    60 tny_device_force_offline (TnyDeviceIface *self) 
     60tny_maemo_device_force_offline (TnyDeviceIface *self) 
    6161{ 
    62         TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); 
     62        TnyMaemoDevicePriv *priv = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    6363 
    6464        priv->fset = TRUE; 
    …… 
    6666 
    6767 
    68         tny_device_on_offline (self); 
     68        tny_maemo_device_on_offline (self); 
    6969         
    7070        return; 
    …… 
    7272 
    7373static void 
    74 tny_device_on_online (TnyDeviceIface *self) 
     74tny_maemo_device_on_online (TnyDeviceIface *self) 
    7575{ 
    7676        g_signal_emit (self, tny_device_iface_signals [TNY_DEVICE_IFACE_CONNECTION_CHANGED], 0, TRUE); 
    …… 
    8080 
    8181static void 
    82 tny_device_on_offline (TnyDeviceIface *self) 
     82tny_maemo_device_on_offline (TnyDeviceIface *self) 
    8383{ 
    8484        g_signal_emit (self, tny_device_iface_signals [TNY_DEVICE_IFACE_CONNECTION_CHANGED], 0, FALSE); 
    …… 
    8888 
    8989static gboolean 
    90 tny_device_is_online (TnyDeviceIface *self) 
     90tny_maemo_device_is_online (TnyDeviceIface *self) 
    9191{ 
    92         TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); 
     92        TnyMaemoDevicePriv *priv = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    9393        gboolean retval = FALSE; 
    9494        return retval; 
    …… 
    9696 
    9797static void 
    98 tny_device_instance_init (GTypeInstance *instance, gpointer g_class) 
     98tny_maemo_device_instance_init (GTypeInstance *instance, gpointer g_class) 
    9999{ 
    100         TnyDevice *self = (TnyDevice *)instance; 
    101         TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); 
     100        TnyMaemoDevice *self = (TnyMaemoDevice *)instance; 
     101        TnyMaemoDevicePriv *priv = TNY_MAEMO_DEVICE_GET_PRIVATE (self); 
    102102 
    103103        return; 
    …… 
    107107 
    108108/** 
    109  * tny_device_new: 
     109 * tny_maemo_device_new: 
    110110 * 
    111111 * Return value: A new #TnyDeviceIface instance 
    112112 **/ 
    113 TnyDevice* 
    114 tny_device_new (void) 
     113TnyDeviceIface* 
     114tny_maemo_device_new (void) 
    115115{ 
    116         TnyDevice *self = g_object_new (TNY_TYPE_DEVICE, NULL); 
     116        TnyMaemoDevice *self = g_object_new (TNY_TYPE_MAEMO_DEVICE, NULL); 
    117117 
    118         return self; 
     118        return TNY_DEVICE_IFACE (self); 
    119119} 
    120120 
    121121 
    122122static void 
    123 tny_device_finalize (GObject *object) 
     123tny_maemo_device_finalize (GObject *object) 
    124124{ 
    125         TnyDevice *self = (TnyDevice *)object;   
    126         TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); 
    127  
    128125        (*parent_class->finalize) (object); 
    129126 
    …… 
    137134        TnyDeviceIfaceClass *klass = (TnyDeviceIfaceClass *)g_iface; 
    138135 
    139         klass->is_online_func = tny_device_is_online; 
    140         klass->reset_func = tny_device_reset; 
    141         klass->force_offline_func = tny_device_force_offline; 
    142         klass->force_online_func = tny_device_force_online; 
     136        klass->is_online_func = tny_maemo_device_is_online; 
     137        klass->reset_func = tny_maemo_device_reset; 
     138        klass->force_offline_func = tny_maemo_device_force_offline; 
     139        klass->force_online_func = tny_maemo_device_force_online; 
    143140 
    144141        return; 
    …… 
    148145 
    149146static void  
    150 tny_device_class_init (TnyDeviceClass *class) 
     147tny_maemo_device_class_init (TnyMaemoDeviceClass *class) 
    151148{ 
    152149        GObjectClass *object_class; 
    …… 
    155152        object_class = (GObjectClass*) class; 
    156153 
    157         object_class->finalize = tny_device_finalize; 
     154        object_class->finalize = tny_maemo_device_finalize; 
    158155 
    159         g_type_class_add_private (object_class, sizeof (TnyDevicePriv)); 
     156        g_type_class_add_private (object_class, sizeof (TnyMaemoDevicePriv)); 
    160157 
    161158        return; 
    …… 
    163160 
    164161GType  
    165 tny_device_get_type (void) 
     162tny_maemo_device_get_type (void) 
    166163{ 
    167164        static GType type = 0; 
    …… 
    171168                static const GTypeInfo info =  
    172169                { 
    173                   sizeof (TnyDeviceClass), 
     170                  sizeof (TnyMaemoDeviceClass), 
    174171                  NULL,   /* base_init */ 
    175172                  NULL,   /* base_finalize */ 
    176                   (GClassInitFunc) tny_device_class_init,   /* class_init */ 
     173                  (GClassInitFunc) tny_maemo_device_class_init,   /* class_init */ 
    177174                  NULL,   /* class_finalize */ 
    178175                  NULL,   /* class_data */ 
    179                   sizeof (TnyDevice), 
     176                  sizeof (TnyMaemoDevice), 
    180177                  0,      /* n_preallocs */ 
    181                   tny_device_instance_init    /* instance_init */ 
     178                  tny_maemo_device_instance_init    /* instance_init */ 
    182179                }; 
    183180 
    …… 
    190187 
    191188                type = g_type_register_static (G_TYPE_OBJECT, 
    192                         "TnyDevice", 
     189                        "TnyMaemoDevice", 
    193190                        &info, 0); 
    194191 

  • trunk/libtinymail-maemo/tny-maemo-device.h

    r876 r877  
    1 #ifndef TNY_DEVICE_H 
    2 #define TNY_DEVICE_H 
     1#ifndef TNY_MAEMO_DEVICE_H 
     2#define TNY_MAEMO_DEVICE_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
    …… 
    2828G_BEGIN_DECLS 
    2929 
    30 #define TNY_TYPE_DEVICE             (tny_device_get_type ()) 
    31 #define TNY_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_DEVICE, TnyDevice)) 
    32 #define TNY_DEVICE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_DEVICE, TnyDeviceClass)) 
    33 #define TNY_IS_DEVICE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_DEVICE)) 
    34 #define TNY_IS_DEVICE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_DEVICE)) 
    35 #define TNY_DEVICE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_DEVICE, TnyDeviceClass)) 
     30#define TNY_TYPE_MAEMO_DEVICE             (tny_maemo_device_get_type ()) 
     31#define TNY_MAEMO_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_MAEMO_DEVICE, TnyMaemoDevice)) 
     32#define TNY_MAEMO_DEVICE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_MAEMO_DEVICE, TnyMaemoDeviceClass)) 
     33#define TNY_IS_MAEMO_DEVICE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_MAEMO_DEVICE)) 
     34#define TNY_IS_MAEMO_DEVICE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_MAEMO_DEVICE)) 
     35#define TNY_MAEMO_DEVICE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_MAEMO_DEVICE, TnyMaemoDeviceClass)) 
    3636 
    3737/* This is an abstract type */ 
    3838 
    39 typedef struct _TnyDevice TnyDevice; 
    40 typedef struct _TnyDeviceClass TnyDeviceClass; 
     39typedef struct _TnyMaemoDevice TnyMaemoDevice; 
     40typedef struct _TnyMaemoDeviceClass TnyMaemoDeviceClass; 
    4141 
    42 struct _TnyDevice 
     42struct _TnyMaemoDevice 
    4343{ 
    4444        GObject parent; 
    4545}; 
    4646 
    47 struct _TnyDeviceClass  
     47struct _TnyMaemoDeviceClass  
    4848{ 
    4949        GObjectClass parent; 
    5050}; 
    5151 
    52 GType tny_device_get_type (void); 
     52GType tny_maemo_device_get_type (void); 
    5353 
    54 TnyDevice* tny_device_new (void); 
     54TnyDeviceIface* tny_maemo_device_new (void); 
    5555 
    5656G_END_DECLS 

  • trunk/libtinymail-maemo/tny-maemo-password-dialog.c

    r876 r877  
    2222 
    2323#include <gtk/gtk.h> 
    24 #include <tny-password-dialog.h> 
     24#include <tny-maemo-password-dialog.h> 
    2525 
    2626static GObjectClass *parent_class = NULL; 
    2727 
    28 typedef struct _TnyPasswordDialogPriv TnyPasswordDialogPriv; 
     28typedef struct _TnyMaemoPasswordDialogPriv TnyMaemoPasswordDialogPriv; 
    2929 
    30 struct _TnyPasswordDialogPriv 
     30struct _TnyMaemoPasswordDialogPriv 
    3131{ 
    3232        GtkEntry *pwd_entry; 
    …… 
    3434}; 
    3535 
    36 #define TNY_PASSWORD_DIALOG_GET_PRIVATE(o)    \ 
    37         (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_PASSWORD_DIALOG, TnyPasswordDialogPriv)) 
     36#define TNY_MAEMO_PASSWORD_DIALOG_GET_PRIVATE(o)      \ 
     37        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MAEMO_PASSWORD_DIALOG, TnyMaemoPasswordDialogPriv)) 
    3838 
    3939 
    4040/** 
    41  * tny_password_dialog_set_prompt: 
    42  * @self: A #TnyPasswordDialog object 
     41 * tny_maemo_password_dialog_set_prompt: 
     42 * @self: A #TnyMaemoPasswordDialog object 
    4343 * @prompt: The prompt to set 
    4444 *  
    4545 **/ 
    4646void 
    47 tny_password_dialog_set_prompt (TnyPasswordDialog *self, const gchar *prompt) 
     47tny_maemo_password_dialog_set_prompt (TnyMaemoPasswordDialog *self, const gchar *prompt) 
    4848{ 
    49         TnyPasswordDialogPriv *priv = TNY_PASSWORD_DIALOG_GET_PRIVATE (self); 
     49        TnyMaemoPasswordDialogPriv *priv = TNY_MAEMO_PASSWORD_DIALOG_GET_PRIVATE (self); 
    5050 
    5151        gtk_label_set_text (priv->prompt_label, prompt); 
    …… 
    5555 
    5656/** 
    57  * tny_password_dialog_get_password: 
    58  * @self: A #TnyPasswordDialog object 
     57 * tny_maemo_password_dialog_get_password: 
     58 * @self: A #TnyMaemoPasswordDialog object 
    5959 * 
    6060 * Return value: The password (read-only) as typed by the user 
    6161 **/ 
    6262const gchar* 
    63 tny_password_dialog_get_password (TnyPasswordDialog *self) 
     63tny_maemo_password_dialog_get_password (TnyMaemoPasswordDialog *self) 
    6464{ 
    65         TnyPasswordDialogPriv *priv = TNY_PASSWORD_DIALOG_GET_PRIVATE (self); 
     65        TnyMaemoPasswordDialogPriv *priv = TNY_MAEMO_PASSWORD_DIALOG_GET_PRIVATE (self); 
    6666 
    6767        return gtk_entry_get_text (priv->pwd_entry); 
    …… 
    6969 
    7070/** 
    71  * tny_password_dialog_new: 
     71 * tny_maemo_password_dialog_new: 
    7272 *  
    7373 * 
    74  * Return value: A new #TnyPasswordDialog instance implemented for Gtk+ 
     74 * Return value: A new #GtkDialog password dialog implemented for Gtk+ 
    7575 **/ 
    76 TnyPasswordDialog* 
    77 tny_password_dialog_new (void) 
     76GtkDialog* 
     77tny_maemo_password_dialog_new (void) 
    7878{ 
    79         TnyPasswordDialog *self = g_object_new (TNY_TYPE_PASSWORD_DIALOG, NULL); 
     79        TnyMaemoPasswordDialog *self = g_object_new (TNY_TYPE_MAEMO_PASSWORD_DIALOG, NULL); 
    8080 
    81         return self; 
     81        return GTK_DIALOG (self); 
    8282} 
    8383 
    8484static void 
    85 tny_password_dialog_instance_init (GTypeInstance *instance, gpointer g_class) 
     85tny_maemo_password_dialog_instance_init (GTypeInstance *instance, gpointer g_class) 
    8686{ 
    87         TnyPasswordDialog *self = (TnyPasswordDialog *)instance; 
    88         TnyPasswordDialogPriv *priv = TNY_PASSWORD_DIALOG_GET_PRIVATE (self); 
     87        TnyMaemoPasswordDialog *self = (TnyMaemoPasswordDialog *)instance; 
     88        TnyMaemoPasswordDialogPriv *priv = TNY_MAEMO_PASSWORD_DIALOG_GET_PRIVATE (self); 
    8989 
    9090        gtk_dialog_add_buttons (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK, 
    …… 
    113113 
    114114static void 
    115 tny_password_dialog_finalize (GObject *object) 
     115tny_maemo_password_dialog_finalize (GObject *object) 
    116116{ 
    117         TnyPasswordDialog *self = (TnyPasswordDialog *)object;         
     117        TnyMaemoPasswordDialog *self = (TnyMaemoPasswordDialog *)object;       
    118118         
    119119        (*parent_class->finalize) (object); 
    …… 
    124124 
    125125static void  
    126 tny_password_dialog_class_init (TnyPasswordDialogClass *class) 
     126tny_maemo_password_dialog_class_init (TnyMaemoPasswordDialogClass *class) 
    127127{ 
    128128        GObjectClass *object_class; 
    …… 
    132132        object_class = (GObjectClass*) class; 
    133133 
    134         object_class->finalize = tny_password_dialog_finalize; 
     134        object_class->finalize = tny_maemo_password_dialog_finalize; 
    135135 
    136         g_type_class_add_private (object_class, sizeof (TnyPasswordDialogPriv)); 
     136        g_type_class_add_private (object_class, sizeof (TnyMaemoPasswordDialogPriv)); 
    137137 
    138138        return; 
    …… 
    140140 
    141141GType  
    142 tny_password_dialog_get_type (void) 
     142tny_maemo_password_dialog_get_type (void) 
    143143{ 
    144144        static GType type = 0; 
    …… 
    148148                static const GTypeInfo info =  
    149149                { 
    150                   sizeof (TnyPasswordDialogClass), 
     150                  sizeof (TnyMaemoPasswordDialogClass), 
    151151                  NULL,   /* base_init */ 
    152152                  NULL,   /* base_finalize */ 
    153                   (GClassInitFunc) tny_password_dialog_class_init,   /* class_init */ 
     153                  (GClassInitFunc) tny_maemo_password_dialog_class_init,   /* class_init */ 
    154154                  NULL,   /* class_finalize */ 
    155155                  NULL,   /* class_data */ 
    156                   sizeof (TnyPasswordDialog), 
     156                  sizeof (TnyMaemoPasswordDialog), 
    157157                  0,      /* n_preallocs */ 
    158                   tny_password_dialog_instance_init    /* instance_init */ 
     158                  tny_maemo_password_dialog_instance_init    /* instance_init */ 
    159159                }; 
    160160 
    161161                type = g_type_register_static (GTK_TYPE_DIALOG, 
    162                         "TnyPasswordDialog", 
     162                        "TnyMaemoPasswordDialog", 
    163163                        &info, 0); 
    164164 

  • trunk/libtinymail-maemo/tny-maemo-password-dialog.h

    r876 r877