Changeset 336

Show
Ignore:
Timestamp:
05/18/06 00:40:41
Author:
pvanhoof
Message:

Major refactoring

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile.am

    r335 r336  
    88MOZEMBEDDIR = libtinymailui-mozembed 
    99endif 
    10 SUBDIRS = m4 libtinymail libtinymailui libtinymail-gnomevfs libtinymailui-gtk $(MOZEMBEDDIR) $(PLATFORMDIR) libtinymail-camel tinymail docs $(UNITTESTDIR) $(PYTINYMAILDIR) 
     10if BUILD_GNOME 
     11TNYVFSDIR=libtinymail-gnomevfs 
     12endif 
     13SUBDIRS = m4 libtinymail libtinymailui $(TNYVFSDIR) libtinymailui-gtk $(MOZEMBEDDIR) $(PLATFORMDIR) libtinymail-camel tinymail docs $(UNITTESTDIR) $(PYTINYMAILDIR) 

  • trunk/libtinymail-gnomevfs

    • Property svn:ignore changed from Makefile.in .svnignore config.h libtinymail-gnomevfs-1.0.pc stamp-h4 libtinymail-gnomevfs.pc .libs .deps Makefile to tny-vfs-stream.loT Makefile.in .svnignore config.h libtinymail-gnomevfs-1.0.pc stamp-h4 libtinymail-gnomevfs.pc .libs .deps Makefile

  • trunk/libtinymail-gnomevfs/.svnignore

    r309 r336  
     1tny-vfs-stream.loT 
    12Makefile.in 
    23.svnignore 

  • trunk/libtinymailui-gtk/Makefile.am

    r334 r336  
    22        $(LIBTINYMAILUI_GTK_CFLAGS)            \ 
    33        -I$(top_srcdir)/libtinymail            \ 
    4         -I$(top_srcdir)/libtinymail-gnomevfs   \ 
    54        -I$(top_srcdir)/libtinymailui  
    65 
    76if BUILD_GNOME 
    8 INCLUDES += -DGNOME 
     7INCLUDES += -I$(top_srcdir)/libtinymail-gnomevfs -DGNOME 
    98endif 
    109 
    …… 
    3231        $(LIBTINYMAILUI_GTK_LIBS)       \ 
    3332        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la                   \ 
    34         $(top_builddir)/libtinymail-gnomevfs/libtinymail-gnomevfs-$(API_VERSION).la \ 
    3533        $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la 
     34 
     35if BUILD_GNOME 
     36libtinymailui_gtk_1_0_la_LIBADD += $(top_builddir)/libtinymail-gnomevfs/libtinymail-gnomevfs-$(API_VERSION).la 
     37endif 
    3638 
    3739libtinymailuigtkincludedir = $(includedir)/libtinymailui-gtk-$(API_VERSION) 

  • trunk/libtinymailui-gtk/tny-msg-view.c

    r335 r336  
    2323#include <tny-text-buffer-stream.h> 
    2424#include <tny-attach-list-model.h> 
     25 
     26#ifdef GNOME 
    2527#include <tny-vfs-stream.h> 
    26  
    27 #ifdef GNOME 
    2828#include <libgnomevfs/gnome-vfs.h> 
    2929#include <libgnomevfs/gnome-vfs-utils.h> 
    …… 
    177177{ 
    178178        g_print ("UNIMPLEMENTED: save_to_file for non-gnome-vfs platforms\n"); 
    179         return result; 
     179        return; 
    180180} 
    181181#endif 

  • trunk/libtinymailui-mozembed/Makefile.am

    r335 r336  
    44        -I$(top_srcdir)/libtinymailui            \ 
    55        -I$(top_srcdir)/libtinymailui-gtk        \ 
    6         -I$(top_srcdir)/libtinymail-camel        \ 
    7         -I$(top_srcdir)/libtinymail-gnomevfs  
     6        -I$(top_srcdir)/libtinymail-camel 
    87 
    98if BUILD_GNOME 
    10 INCLUDES += -DGNOME 
     9INCLUDES += -I$(top_srcdir)/libtinymail-gnomevfs -DGNOME 
    1110endif 
    1211 
    …… 
    2827        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la 
    2928 
     29if BUILD_GNOME 
     30libtinymailui_mozembed_1_0_la_LIBADD +=  $(top_builddir)/libtinymail-gnomevfs/libtinymail-gnomevfs-$(API_VERSION).la 
     31endif 
     32 
    3033libtinymailuimozembedincludedir = $(includedir)/libtinymailui-mozembed-$(API_VERSION) 
    3134libtinymailuimozembedinclude_HEADERS = $(libtinymailui_mozembed_1_0_headers) 

  • trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c

    r335 r336  
    2323#include <tny-moz-embed-stream.h> 
    2424#include <tny-attach-list-model.h> 
     25 
     26#ifdef GNOME 
    2527#include <tny-vfs-stream.h> 
    26  
    27 #ifdef GNOME 
    2828#include <libgnomevfs/gnome-vfs.h> 
    2929#include <libgnomevfs/gnome-vfs-utils.h> 
    …… 
    233233{ 
    234234        g_print ("UNIMPLEMENTED: save_to_file for non-gnome-vfs platforms\n"); 
    235         return result; 
     235        return; 
    236236} 
    237237#endif 

  • trunk/tinymail/Makefile.am

    r327 r336  
    77        -I$(top_srcdir)/libtinymail-gnome-desktop                       \ 
    88        -DASYNC_HEADERS 
     9 
     10if BUILD_GNOME 
     11INCLUDES += -DGNOME 
     12endif 
    913 
    1014bin_PROGRAMS = tinymail 

  • trunk/tinymail/tny-main.c

    r291 r336  
    2525#include <tny-platform-factory.h> 
    2626 
     27#ifdef GNOME 
    2728#include <libgnomevfs/gnome-vfs.h> 
    2829#include <libgnomevfs/gnome-vfs-utils.h> 
     30#endif 
    2931 
    3032 
    …… 
    4749        g_thread_init (NULL); 
    4850        gdk_threads_init (); 
     51 
     52#ifdef GNOME 
    4953        gnome_vfs_init (); 
     54#endif 
    5055 
    5156        platfact = TNY_PLATFORM_FACTORY_IFACE