Changeset 593

Show
Ignore:
Timestamp:
07/27/06 22:13:24
Author:
pvanhoof
Message:

Updated python bindings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/tinymail-python

    • Property svn:ignore changed from Makefile.in .svnignore .deps .libs .defs Makefile tinymail.loT tinymailmodule.loT gen-tinymail.c tinymailmodule.c tinymail_camelmodule.c tinymail_camel-glue.c tinymailui.defs tinymail.defs tinymail_camel.defs tinymailui-glue.c tinymail-glue.c tinymail_camel-glue.loT to Makefile.in .svnignore .deps .libs .defs Makefile tinymail.loT tinymailmodule.loT gen-tinymail.c tinymail_camel-glue.c tinymailui.defs tinymail.defs tinymail_camel.defs tinymailui-glue.c tinymail-glue.c tinymail_camel-glue.loT tinymail-platform-glue.c tinymailui-gtk.defs tinymailui-gtk-glue.c tinymail-platform.defs platform_include.h
  • trunk/tinymail-python/.svnignore

    r592 r593  
    88tinymailmodule.loT 
    99gen-tinymail.c 
    10 tinymailmodule.c 
    11 tinymail_camelmodule.c 
    1210tinymail_camel-glue.c 
    1311tinymailui.defs 
     
    1715tinymail-glue.c 
    1816tinymail_camel-glue.loT 
     17tinymail-platform-glue.c 
     18tinymailui-gtk.defs 
     19tinymailui-gtk-glue.c 
     20tinymail-platform.defs 
     21platform_include.h 
  • trunk/tinymail-python/Makefile.am

    r590 r593  
    1 INCLUDES = $(PYTHON_INCLUDES) $(LIBTINYMAIL_CFLAGS)
    2         $(LIBTINYMAIL_CAMEL_CFLAGS) $(TINYMAIL_PYTHON_CFLAGS)
    3         -I$(top_srcdir)/libtinymail             
    4         -I$(top_srcdir)/libtinymailui           
    5         -I$(top_srcdir)/libtinymailui-gtk       
    6         -I$(top_srcdir)/libtinymail-camel       
     1INCLUDES = $(PYTHON_INCLUDES) $(LIBTINYMAIL_CFLAGS)            
     2        $(LIBTINYMAILUI_GTK_CFLAGS) $(TINYMAIL_PYTHON_CFLAGS) 
     3        -I$(top_srcdir)/libtinymail                            
     4        -I$(top_srcdir)/libtinymailui                          
     5        -I$(top_srcdir)/libtinymailui-gtk                      
     6        -I$(top_srcdir)/libtinymail-camel                      
    77        -I$(top_srcdir)/$(PLATFORMDIR) 
    88 
    99tinymaildir = $(pythondir)/tinymail 
    10 tinymail_LTLIBRARIES = tinymail.la tinymailui.la  
    11 #tinymail_camel.la 
     10tinymail_LTLIBRARIES = tinymail.la tinymailui.la tinymailui-gtk.la tinymail-platform.la 
    1211 
    1312tinymail_la_LDFLAGS = -module -avoid-version  
    1413# -export-symbols-regex inittinymail 
    15 tinymail_la_LIBADD = $(LIBTINYMAIL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la 
     14tinymail_la_LIBADD = $(LIBTINYMAIL_LIBS) $(TINYMAIL_PYTHON_LIBS)        \ 
     15        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la  
    1616tinymail_la_SOURCES = tinymailmodule.c tinymail-glue.c 
    17  
    1817 
    1918tinymailui_la_LDFLAGS = -module -avoid-version 
    2019# -export-symbols-regex inittinymail 
    21 tinymailui_la_LIBADD = $(LIBTINYMAILUI_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la 
     20tinymailui_la_LIBADD = $(LIBTINYMAILUI_LIBS) $(TINYMAIL_PYTHON_LIBS)    \ 
     21        $(LIBTINYMAIL_LIBS)                                             \ 
     22        $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la 
    2223tinymailui_la_SOURCES = tinymailuimodule.c tinymailui-glue.c 
    2324           
    24 tinymail_camel_la_LDFLAGS = -module -avoid-version  
    25 # -export-symbols-regex inittinymail_camel 
    26 tinymail_camel_la_LIBADD = $(LIBTINYMAIL_CAMEL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la 
    27 tinymail_camel_la_SOURCES = tinymail_camelmodule.c tinymail_camel-glue.c 
     25tinymailui_gtk_la_LDFLAGS = -module -avoid-version  
     26# -export-symbols-regex inittinymailui_gtk 
     27tinymailui_gtk_la_LIBADD = $(LIBTINYMAILUI_GTK_LIBS) $(LIBTINYMAILUI_LIBS)      \ 
     28        $(LIBTINYMAIL_LIBS) $(TINYMAIL_PYTHON_LIBS)                             \ 
     29        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la 
     30tinymailui_gtk_la_SOURCES = tinymailui-gtkmodule.c tinymailui-gtk-glue.c 
    2831 
    29 CLEANFILES = tinymail-glue.c tinymailui-glue.c 
    30 # tinymail_camel-glue.c 
     32tinymail_platform_la_LDFLAGS = -module -avoid-version 
     33# -export-symbols-regex inittinymail_platform 
     34tinymail_platform_la_LIBADD = $(LIBTINYMAILUI_LIBS) $(LIBTINYMAIL_LIBS) \ 
     35        $(TINYMAIL_PYTHON_LIBS)                                         \ 
     36        $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la \ 
     37        $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la 
     38tinymail_platform_la_SOURCES = tinymail-platformmodule.c tinymail-platform-glue.c 
     39 
     40CLEANFILES = tinymail-glue.c tinymailui-glue.c tinymailui-gtk-glue.c \ 
     41        tinymail-platform-glue.c platform_include.h 
    3142 
    3243EXTRA_DIST =                    \ 
     
    3445        tinymail.override       \ 
    3546        tinymailui.defs         \ 
    36         tinymailui.override 
    37  
    38 #       tinymail_camel.override 
    39 #       tinymail_camel.defs  
     47        tinymailui.override     \ 
     48        tinymailui-gtk.override \ 
     49        tinymailui-gtk.defs     \ 
     50        tinymail-platform.defs  \ 
     51        tinymail-platform.override 
    4052 
    4153# To update: 
    42 # ls DIR/*h | grep -v -priv | sed s/^/\\t\$\(top_srcdir\)\\//g | sed s/$/\\t\\\\/g 
     54# ls DIR/*h | grep -v \\-priv | sed s/^/\\t\$\(top_srcdir\)\\//g | sed s/$/\\t\\\\/g 
    4355 
    4456tinymail.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py 
     
    5971        $(top_srcdir)/libtinymail/tny-stream-iface.h            \ 
    6072        $(top_srcdir)/libtinymail/tny-transport-account-iface.h > $@ 
     73  
    6174 
    6275tinymailui.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py 
     
    7184        $(top_srcdir)/libtinymailui/tny-summary-window-iface.h > $@ 
    7285 
    73 tinymail_camel.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py 
    74         $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py                  \ 
    75         $(top_srcdir)/libtinymail-camel/tny-account.h           \ 
    76         $(top_srcdir)/libtinymail-camel/tny-camel-shared.h      \ 
    77         $(top_srcdir)/libtinymail-camel/tny-camel-stream.h      \ 
    78         $(top_srcdir)/libtinymail-camel/tny-msg-folder.h        \ 
    79         $(top_srcdir)/libtinymail-camel/tny-msg.h               \ 
    80         $(top_srcdir)/libtinymail-camel/tny-msg-header.h        \ 
    81         $(top_srcdir)/libtinymail-camel/tny-msg-mime-part.h     \ 
    82         $(top_srcdir)/libtinymail-camel/tny-session-camel.h     \ 
    83         $(top_srcdir)/libtinymail-camel/tny-store-account.h     \ 
    84         $(top_srcdir)/libtinymail-camel/tny-stream-camel.h      \ 
    85         $(top_srcdir)/libtinymail-camel/tny-transport-account.h > $@ 
     86tinymailui-gtk.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py 
     87        $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py                          \ 
     88        $(top_srcdir)/libtinymailui-gtk/tny-account-tree-model.h        \ 
     89        $(top_srcdir)/libtinymailui-gtk/tny-attach-list-model.h         \ 
     90        $(top_srcdir)/libtinymailui-gtk/tny-msg-header-list-model.h     \ 
     91        $(top_srcdir)/libtinymailui-gtk/tny-msg-header-view.h           \ 
     92        $(top_srcdir)/libtinymailui-gtk/tny-msg-view.h                  \ 
     93        $(top_srcdir)/libtinymailui-gtk/tny-msg-window.h                \ 
     94        $(top_srcdir)/libtinymailui-gtk/tny-save-strategy.h             \ 
     95        $(top_srcdir)/libtinymailui-gtk/tny-text-buffer-stream.h > $@ 
     96 
     97tinymail-platform.defs : $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py 
     98        $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py                          \ 
     99        `ls $(top_srcdir)/$(PLATFORMDIR)/*h | grep -v \\\-priv | xargs` > $@ 
    86100 
    87101tinymail-glue.c: tinymail.defs tinymail.override 
     
    91105 
    92106tinymailui-glue.c: tinymailui.defs tinymailui.override 
    93         $(PYGTK_CODEGEN) --prefix tinymail            \ 
    94         --override tinymail.override                  \ 
    95         tinymail.defs > $@ 
     107        $(PYGTK_CODEGEN) --prefix tinymailui          \ 
     108        --override tinymailui.override                        \ 
     109        tinymailui.defs > $@ 
    96110 
    97 tinymail_camel-glue.c: tinymail_camel.defs tinymail_camel.override 
    98         $(PYGTK_CODEGEN) --prefix tinymail              \ 
    99         --override tinymail_camel.override              \ 
    100         tinymail_camel.defs > $@ 
     111tinymailui-gtk-glue.c: tinymailui-gtk.defs tinymailui-gtk.override 
     112        $(PYGTK_CODEGEN) --prefix tinymailui_gtk        \ 
     113        --register $(PYGTK_DEFSDIR)/gdk-types.defs      \ 
     114        --register $(PYGTK_DEFSDIR)/gtk-types.defs      \ 
     115        --override tinymailui-gtk.override              \ 
     116        tinymailui-gtk.defs > $@ 
     117 
     118platform_include.h: 
     119        ls $(top_srcdir)/$(PLATFORMDIR)/*h | grep -v \\-priv | sed 's/^/\#include\ \"/g' | sed 's/\$/\"/g' > $@ 
     120 
     121tinymail-platform-glue.c: tinymail-platform.defs tinymail-platform.override platform_include.h 
     122        $(PYGTK_CODEGEN) --prefix tinymail_platform     \ 
     123        --override tinymail-platform.override           \ 
     124        tinymail-platform.defs > $@ 
    101125 
    102126.defs.c: 
  • trunk/tinymail-python/tinymailui-gtk.override

    r590 r593  
    77#include "pygobject.h" 
    88 
    9 #include <tny-account.h> 
    10 #include <tny-camel-shared.h> 
    11 #include <tny-camel-stream.h> 
    12 #include <tny-msg-folder.h> 
    13 #include <tny-msg.h> 
    14 #include <tny-msg-header.h> 
    15 #include <tny-msg-mime-part.h> 
    16 #include <tny-session-camel.h> 
    17 #include <tny-store-account.h> 
    18 #include <tny-stream-camel.h> 
    19 #include <tny-transport-account.h> 
     9#include <glib-object.h> 
     10 
     11#include <tny-account-tree-model.h> 
     12#include <tny-attach-list-model.h> 
     13#include <tny-msg-header-list-model.h> 
     14#include <tny-msg-header-view.h> 
     15#include <tny-msg-view.h> 
     16#include <tny-msg-window.h> 
     17#include <tny-save-strategy.h> 
     18#include <tny-text-buffer-stream.h> 
     19 
     20extern PyTypeObject PyGtkTextBuffer_Type; 
     21extern PyTypeObject PyGtkTextBuffer_Type; 
     22extern PyTypeObject PyGtkListStore_Type; 
     23extern PyTypeObject PyGtkTable_Type; 
     24extern PyTypeObject PyGtkScrolledWindow_Type; 
     25extern PyTypeObject PyGtkWindow_Type; 
     26 
    2027 
    2128static PyTypeObject *PyGObject_Type=NULL;