Changeset 285 for trunk

Show
Ignore:
Timestamp:
03/08/09 12:55:40 (3 years ago)
Author:
ath
bzr:committer:
Alberto Botti <alberto.botti@gmail.com>
bzr:file-ids:

fm_gui/src/marlin-window-menu.c 255@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Fmarlin-window-menu.c
fm_server/src/main.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Fmain.c
rgc/Makefile.am 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2FMakefile.am
rgc/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2FMakefile.in
rgc/aclocal.m4 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Faclocal.m4
rgc/bindings bindings-20090304125849-94t07i1rdeqfbiz4-1
rgc/bindings/Makefile.am makefile.am-20090304125849-94t07i1rdeqfbiz4-2
rgc/bindings/Makefile.in makefile.in-20090304125849-94t07i1rdeqfbiz4-3
rgc/bindings/libpy_rgc_client.la libpy_rgc_client.la-20090304125849-94t07i1rdeqfbiz4-4
rgc/bindings/python python-20090304125849-94t07i1rdeqfbiz4-5
rgc/bindings/rgcclient_protocol.c rgcclient_protocol.c-20090304125849-94t07i1rdeqfbiz4-6
rgc/bindings/rgcclient_protocol.h rgcclient_protocol.h-20090304125849-94t07i1rdeqfbiz4-7
rgc/bindings/rgcclientmodule.c rgcclientmodule.c-20090304125849-94t07i1rdeqfbiz4-8
rgc/bindings/works works-20090304125849-94t07i1rdeqfbiz4-9
rgc/bindings/works/Makefile.am makefile.am-20090304125849-94t07i1rdeqfbiz4-10
rgc/bindings/works/rgcclient_protocol.c rgcclient_protocol.c-20090304125849-94t07i1rdeqfbiz4-11
rgc/bindings/works/rgcclient_protocol.h rgcclient_protocol.h-20090304125849-94t07i1rdeqfbiz4-12
rgc/bindings/works/rgcclientmodule.c rgcclientmodule.c-20090304125849-94t07i1rdeqfbiz4-13
rgc/configure 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfigure
rgc/configure.ac 215@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfigure.ac
rgc/include/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2FMakefile.in
rgc/include/client/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2FMakefile.in
rgc/include/client/rgc_query.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2Frgc_query.h
rgc/include/common/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fcommon%2FMakefile.in
rgc/include/connection/Makefile.am 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2FMakefile.am
rgc/include/connection/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2FMakefile.in
rgc/include/connection/rbp/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frbp%2FMakefile.in
rgc/include/connection/rgc_protocol_server.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frgc_protocol_server.h
rgc/include/rgc_server.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Frgc_server.h
rgc/include/server/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fserver%2FMakefile.in
rgc/src/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2FMakefile.in
rgc/src/client/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2FMakefile.in
rgc/src/client/rgc_query.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_query.c
rgc/src/common/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fcommon%2FMakefile.in
rgc/src/connection/Makefile.am 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2FMakefile.am
rgc/src/connection/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2FMakefile.in
rgc/src/connection/rbp/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2FMakefile.in
rgc/src/connection/rbp/rbp_message.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message.c
rgc/src/connection/rbp/rbp_message_execute_server.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message_execute_server.c
rgc/src/connection/rbp/rbp_message_lowlevel.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message_lowlevel.c
rgc/src/connection/rbp/rgc_protocol_rbp_client.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frgc_protocol_rbp_client.c
rgc/src/connection/rbp/rgc_protocol_rbp_server.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frgc_protocol_rbp_server.c
rgc/src/connection/rgc_connection_client.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_client.c
rgc/src/connection/rgc_connection_server.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_server.c
rgc/src/connection/rgc_connection_server.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_server.h
rgc/src/connection/rgc_protocol_server.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_protocol_server.c
rgc/src/connection/rgc_protocol_server.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_protocol_server.h
rgc/src/server/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2FMakefile.in
rgc/src/server/rgc_object.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2Frgc_object.c
rgc/test/Makefile.am 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2FMakefile.am
rgc/test/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2FMakefile.in
rgc/test/new_server.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2Fnew_server.c
bzr:merge:

alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
bzr:revno:
77
bzr:revprop:branch-nick:
trunk
bzr:root:
trunk
bzr:text-parents:

fm_gui/src/marlin-window-menu.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
fm_server/src/main.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/aclocal.m4 alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/libpy_rgc_client.la alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/python alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/rgcclient_protocol.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/rgcclient_protocol.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/rgcclientmodule.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/works alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/works/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/works/rgcclient_protocol.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/works/rgcclient_protocol.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/bindings/works/rgcclientmodule.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/configure alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/configure.ac alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/client/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/client/rgc_query.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/common/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/connection/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/connection/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/connection/rbp/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/connection/rgc_protocol_server.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/rgc_server.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/include/server/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/client/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/client/rgc_query.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/common/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/rbp_message.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/rbp_message_execute_server.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/rbp_message_lowlevel.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/rgc_protocol_rbp_client.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/rgc_protocol_rbp_server.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rgc_connection_client.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rgc_connection_server.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rgc_connection_server.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rgc_protocol_server.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rgc_protocol_server.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/server/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/server/rgc_object.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/test/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/test/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/test/new_server.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
bzr:timestamp:
2009-03-08 12:54:26.543999910 +0100
Message:

First rework of RgcConnection?.

Location:
trunk
Files:
13 added
40 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:ancestry:v3-trunk0

      •  

        old new  
        22alberto.botti@gmail.com-20090112160735-4gn3z63hezacfu23 
        33alberto.botti@gmail.com-20090204203706-s4k8dta7qo2zk9xr 
         4alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
    • Property bzr:file-ids

      •  

        old new  
        1 Makefile.in     216@45ad373b-3914-0410-8193-a61cc481f39f:trunk:Makefile.in 
        2 aclocal.m4      216@45ad373b-3914-0410-8193-a61cc481f39f:trunk:aclocal.m4 
        3 configure       216@45ad373b-3914-0410-8193-a61cc481f39f:trunk:configure 
        4 configure.ac    218@45ad373b-3914-0410-8193-a61cc481f39f:trunk:configure.ac 
        5 fm_gui/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2FMakefile.in 
        6 fm_gui/aclocal.m4       210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Faclocal.m4 
        7 fm_gui/config.h.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fconfig.h.in 
        8 fm_gui/configure        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fconfigure 
        9 fm_gui/data/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fdata%2FMakefile.in 
        10 fm_gui/data/icons/Makefile.in   210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fdata%2Ficons%2FMakefile.in 
        11 fm_gui/ltmain.sh        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fltmain.sh 
        12 fm_gui/m4/libtool.m4    libtool.m4-20090206151840-bg99halbd330eo1r-1 
        13 fm_gui/m4/ltoptions.m4  ltoptions.m4-20090206151840-bg99halbd330eo1r-2 
        14 fm_gui/m4/ltsugar.m4    ltsugar.m4-20090206151840-bg99halbd330eo1r-3 
        15 fm_gui/m4/ltversion.m4  ltversion.m4-20090206151840-bg99halbd330eo1r-4 
        16 fm_gui/m4/lt%7Eobsolete.m4      ltobsolete.m4-20090206151840-bg99halbd330eo1r-5 
        17 fm_gui/src/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2FMakefile.in 
        18 fm_gui/src/marlin/Makefile.in   247@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Fmarlin%2FMakefile.in 
        19 fm_gui/src/marlin/cursors/Makefile.in   261@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Fmarlin%2Fcursors%2FMakefile.in 
        20 fm_gui/src/tx_widgets/Makefile.in       210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Ftx_widgets%2FMakefile.in 
        21 fm_gui/src/tx_widgets/icons/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Ftx_widgets%2Ficons%2FMakefile.in 
        22 rgc/rgc_client.pc.in    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Frgc_client.pc.in 
        23 rgc/rgc_server.pc.in    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Frgc_server.pc.in 
         1fm_gui/src/marlin-window-menu.c 255@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_gui%2Fsrc%2Fmarlin-window-menu.c 
         2fm_server/src/main.c    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:fm_server%2Fsrc%2Fmain.c 
         3rgc/Makefile.am 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2FMakefile.am 
         4rgc/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2FMakefile.in 
         5rgc/aclocal.m4  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Faclocal.m4 
         6rgc/bindings    bindings-20090304125849-94t07i1rdeqfbiz4-1 
         7rgc/bindings/Makefile.am        makefile.am-20090304125849-94t07i1rdeqfbiz4-2 
         8rgc/bindings/Makefile.in        makefile.in-20090304125849-94t07i1rdeqfbiz4-3 
         9rgc/bindings/libpy_rgc_client.la        libpy_rgc_client.la-20090304125849-94t07i1rdeqfbiz4-4 
         10rgc/bindings/python     python-20090304125849-94t07i1rdeqfbiz4-5 
         11rgc/bindings/rgcclient_protocol.c       rgcclient_protocol.c-20090304125849-94t07i1rdeqfbiz4-6 
         12rgc/bindings/rgcclient_protocol.h       rgcclient_protocol.h-20090304125849-94t07i1rdeqfbiz4-7 
         13rgc/bindings/rgcclientmodule.c  rgcclientmodule.c-20090304125849-94t07i1rdeqfbiz4-8 
         14rgc/bindings/works      works-20090304125849-94t07i1rdeqfbiz4-9 
         15rgc/bindings/works/Makefile.am  makefile.am-20090304125849-94t07i1rdeqfbiz4-10 
         16rgc/bindings/works/rgcclient_protocol.c rgcclient_protocol.c-20090304125849-94t07i1rdeqfbiz4-11 
         17rgc/bindings/works/rgcclient_protocol.h rgcclient_protocol.h-20090304125849-94t07i1rdeqfbiz4-12 
         18rgc/bindings/works/rgcclientmodule.c    rgcclientmodule.c-20090304125849-94t07i1rdeqfbiz4-13 
         19rgc/configure   210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfigure 
         20rgc/configure.ac        215@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fconfigure.ac 
         21rgc/include/Makefile.in 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2FMakefile.in 
         22rgc/include/client/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2FMakefile.in 
         23rgc/include/client/rgc_query.h  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2Frgc_query.h 
         24rgc/include/common/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fcommon%2FMakefile.in 
         25rgc/include/connection/Makefile.am      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2FMakefile.am 
         26rgc/include/connection/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2FMakefile.in 
         27rgc/include/connection/rbp/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frbp%2FMakefile.in 
         28rgc/include/connection/rgc_protocol_server.h    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frgc_protocol_server.h 
         29rgc/include/rgc_server.h        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Frgc_server.h 
         30rgc/include/server/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fserver%2FMakefile.in 
         31rgc/src/Makefile.in     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2FMakefile.in 
         32rgc/src/client/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2FMakefile.in 
         33rgc/src/client/rgc_query.c      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_query.c 
         34rgc/src/common/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fcommon%2FMakefile.in 
         35rgc/src/connection/Makefile.am  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2FMakefile.am 
         36rgc/src/connection/Makefile.in  210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2FMakefile.in 
         37rgc/src/connection/rbp/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2FMakefile.in 
         38rgc/src/connection/rbp/rbp_message.c    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message.c 
         39rgc/src/connection/rbp/rbp_message_execute_server.c     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message_execute_server.c 
         40rgc/src/connection/rbp/rbp_message_lowlevel.c   210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message_lowlevel.c 
         41rgc/src/connection/rbp/rgc_protocol_rbp_client.c        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frgc_protocol_rbp_client.c 
         42rgc/src/connection/rbp/rgc_protocol_rbp_server.c        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frgc_protocol_rbp_server.c 
         43rgc/src/connection/rgc_connection_client.c      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_client.c 
         44rgc/src/connection/rgc_connection_server.c      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_server.c 
         45rgc/src/connection/rgc_connection_server.h      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_server.h 
         46rgc/src/connection/rgc_protocol_server.c        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_protocol_server.c 
         47rgc/src/connection/rgc_protocol_server.h        210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_protocol_server.h 
         48rgc/src/server/Makefile.in      210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2FMakefile.in 
         49rgc/src/server/rgc_object.c     210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2Frgc_object.c 
         50rgc/test/Makefile.am    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2FMakefile.am 
         51rgc/test/Makefile.in    210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2FMakefile.in 
         52rgc/test/new_server.c   210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Ftest%2Fnew_server.c 
    • Property bzr:revision-id:v3-trunk0

      •  

        old new  
        3375 alberto.botti@gmail.com-20090204203922-ivrlinsay1r403b9 
        4476 alberto.botti@gmail.com-20090218123806-qufqpor0got1ukjt 
         577 alberto.botti@gmail.com-20090308115426-ejgls1qm379mhy0n 
    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2009-02-18 13:38:06.279999971 +0100 
         1timestamp: 2009-03-08 12:54:26.543999910 +0100 
        22committer: Alberto Botti <alberto.botti@gmail.com> 
        33properties:  
    • Property bzr:text-parents

      •  

        old new  
         1fm_gui/src/marlin-window-menu.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         2fm_server/src/main.c    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         3rgc/Makefile.am alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         4rgc/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         5rgc/aclocal.m4  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         6rgc/bindings    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         7rgc/bindings/Makefile.am        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         8rgc/bindings/Makefile.in        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         9rgc/bindings/libpy_rgc_client.la        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         10rgc/bindings/python     alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         11rgc/bindings/rgcclient_protocol.c       alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         12rgc/bindings/rgcclient_protocol.h       alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         13rgc/bindings/rgcclientmodule.c  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         14rgc/bindings/works      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         15rgc/bindings/works/Makefile.am  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         16rgc/bindings/works/rgcclient_protocol.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         17rgc/bindings/works/rgcclient_protocol.h alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         18rgc/bindings/works/rgcclientmodule.c    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         19rgc/configure   alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         20rgc/configure.ac        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         21rgc/include/Makefile.in alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         22rgc/include/client/Makefile.in  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         23rgc/include/client/rgc_query.h  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         24rgc/include/common/Makefile.in  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         25rgc/include/connection/Makefile.am      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         26rgc/include/connection/Makefile.in      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         27rgc/include/connection/rbp/Makefile.in  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         28rgc/include/connection/rgc_protocol_server.h    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         29rgc/include/rgc_server.h        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         30rgc/include/server/Makefile.in  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         31rgc/src/Makefile.in     alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         32rgc/src/client/Makefile.in      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         33rgc/src/client/rgc_query.c      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         34rgc/src/common/Makefile.in      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         35rgc/src/connection/Makefile.am  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         36rgc/src/connection/Makefile.in  alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         37rgc/src/connection/rbp/Makefile.in      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         38rgc/src/connection/rbp/rbp_message.c    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         39rgc/src/connection/rbp/rbp_message_execute_server.c     alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         40rgc/src/connection/rbp/rbp_message_lowlevel.c   alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         41rgc/src/connection/rbp/rgc_protocol_rbp_client.c        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         42rgc/src/connection/rbp/rgc_protocol_rbp_server.c        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         43rgc/src/connection/rgc_connection_client.c      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         44rgc/src/connection/rgc_connection_server.c      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         45rgc/src/connection/rgc_connection_server.h      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         46rgc/src/connection/rgc_protocol_server.c        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         47rgc/src/connection/rgc_protocol_server.h        alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         48rgc/src/server/Makefile.in      alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         49rgc/src/server/rgc_object.c     alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         50rgc/test/Makefile.am    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         51rgc/test/Makefile.in    alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 
         52rgc/test/new_server.c   alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12 

  • trunk/fm_gui/src/marlin-window-menu.c

    r282 r285  
    218218} 
    219219 
    220 static void 
     220/*static void 
    221221media_repeat (GtkAction *action, 
    222222              gpointer data) 
    … …  
    226226        window = MARLIN_WINDOW (data); 
    227227        marlin_window_play_sample (window, TRUE); 
    228 } 
     228}*/ 
    229229 
    230230static void 

  • trunk/fm_server/src/main.c

    r269 r285  
    118118        rgc_connection_server_add_protocol(prot_rbp); 
    119119 
     120        /* Don't forget DBUS */ 
     121        RgcProtocolServer *prot_dbus = rgc_protocol_dbus_server_new(); 
     122        rgc_connection_server_add_protocol(prot_dbus); 
     123 
    120124        fm_element_class_register(); 
    121125        fm_input_class_register(); 

  • trunk/rgc/Makefile.am

    r214 r285  
    1 SUBDIRS = po include src test 
     1SUBDIRS = po include src bindings test 
    22 
    33librgcdocdir = ${prefix}/doc/rgc 

  • trunk/rgc/Makefile.in

    r283 r285  
    4949        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    5050        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    51         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     51        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     52        $(top_srcdir)/configure.ac 
    5253am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    5354        $(ACLOCAL_M4) 
    … …  
    109110CPPFLAGS = @CPPFLAGS@ 
    110111CYGPATH_W = @CYGPATH_W@ 
     112DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     113DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    111114DEFS = @DEFS@ 
    112115DEPDIR = @DEPDIR@ 
    … …  
    175178PKG_CONFIG = @PKG_CONFIG@ 
    176179POSUB = @POSUB@ 
     180PYTHON = @PYTHON@ 
     181PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     182PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     183PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     184PYTHON_PREFIX = @PYTHON_PREFIX@ 
     185PYTHON_VERSION = @PYTHON_VERSION@ 
    177186RANLIB = @RANLIB@ 
    178187RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    232241oldincludedir = @oldincludedir@ 
    233242pdfdir = @pdfdir@ 
     243pkgpyexecdir = @pkgpyexecdir@ 
     244pkgpythondir = @pkgpythondir@ 
    234245prefix = @prefix@ 
    235246program_transform_name = @program_transform_name@ 
    236247psdir = @psdir@ 
     248pyexecdir = @pyexecdir@ 
     249pythondir = @pythondir@ 
    237250sbindir = @sbindir@ 
    238251sharedstatedir = @sharedstatedir@ 
    … …  
    242255top_builddir = @top_builddir@ 
    243256top_srcdir = @top_srcdir@ 
    244 SUBDIRS = po include src test 
     257SUBDIRS = po include src bindings test 
    245258librgcdocdir = ${prefix}/doc/rgc 
    246259librgcdoc_DATA = \ 

  • trunk/rgc/aclocal.m4

    r283 r285  
    678678AC_DEFUN([_AM_IF_OPTION], 
    679679[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) 
     680 
     681# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 
     682# Free Software Foundation, Inc. 
     683# 
     684# This file is free software; the Free Software Foundation 
     685# gives unlimited permission to copy and/or distribute it, 
     686# with or without modifications, as long as this notice is preserved. 
     687 
     688# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 
     689# --------------------------------------------------------------------------- 
     690# Adds support for distributing Python modules and packages.  To 
     691# install modules, copy them to $(pythondir), using the python_PYTHON 
     692# automake variable.  To install a package with the same name as the 
     693# automake package, install to $(pkgpythondir), or use the 
     694# pkgpython_PYTHON automake variable. 
     695# 
     696# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as 
     697# locations to install python extension modules (shared libraries). 
     698# Another macro is required to find the appropriate flags to compile 
     699# extension modules. 
     700# 
     701# If your package is configured with a different prefix to python, 
     702# users will have to add the install directory to the PYTHONPATH 
     703# environment variable, or create a .pth file (see the python 
     704# documentation for details). 
     705# 
     706# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will 
     707# cause an error if the version of python installed on the system 
     708# doesn't meet the requirement.  MINIMUM-VERSION should consist of 
     709# numbers and dots only. 
     710AC_DEFUN([AM_PATH_PYTHON], 
     711 [ 
     712  dnl Find a Python interpreter.  Python versions prior to 1.5 are not 
     713  dnl supported because the default installation locations changed from 
     714  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages 
     715  dnl in 1.5. 
     716  m4_define_default([_AM_PYTHON_INTERPRETER_LIST], 
     717                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl 
     718python2.1 python2.0 python1.6 python1.5]) 
     719 
     720  m4_if([$1],[],[ 
     721    dnl No version check is needed. 
     722    # Find any Python interpreter. 
     723    if test -z "$PYTHON"; then 
     724      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) 
     725    fi 
     726    am_display_PYTHON=python 
     727  ], [ 
     728    dnl A version check is needed. 
     729    if test -n "$PYTHON"; then 
     730      # If the user set $PYTHON, use it and don't search something else. 
     731      AC_MSG_CHECKING([whether $PYTHON version >= $1]) 
     732      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], 
     733                              [AC_MSG_RESULT(yes)], 
     734                              [AC_MSG_ERROR(too old)]) 
     735      am_display_PYTHON=$PYTHON 
     736    else 
     737      # Otherwise, try each interpreter until we find one that satisfies 
     738      # VERSION. 
     739      AC_CACHE_CHECK([for a Python interpreter with version >= $1], 
     740        [am_cv_pathless_PYTHON],[ 
     741        for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do 
     742          test "$am_cv_pathless_PYTHON" = none && break 
     743          AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) 
     744        done]) 
     745      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. 
     746      if test "$am_cv_pathless_PYTHON" = none; then 
     747        PYTHON=: 
     748      else 
     749        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) 
     750      fi 
     751      am_display_PYTHON=$am_cv_pathless_PYTHON 
     752    fi 
     753  ]) 
     754 
     755  if test "$PYTHON" = :; then 
     756  dnl Run any user-specified action, or abort. 
     757    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) 
     758  else 
     759 
     760  dnl Query Python for its version number.  Getting [:3] seems to be 
     761  dnl the best way to do this; it's what "site.py" does in the standard 
     762  dnl library. 
     763 
     764  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], 
     765    [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`]) 
     766  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) 
     767 
     768  dnl Use the values of $prefix and $exec_prefix for the corresponding 
     769  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made 
     770  dnl distinct variables so they can be overridden if need be.  However, 
     771  dnl general consensus is that you shouldn't need this ability. 
     772 
     773  AC_SUBST([PYTHON_PREFIX], ['${prefix}']) 
     774  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) 
     775 
     776  dnl At times (like when building shared libraries) you may want 
     777  dnl to know which OS platform Python thinks this is. 
     778 
     779  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], 
     780    [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`]) 
     781  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) 
     782 
     783 
     784  dnl Set up 4 directories: 
     785 
     786  dnl pythondir -- where to install python scripts.  This is the 
     787  dnl   site-packages directory, not the python standard library 
     788  dnl   directory like in previous automake betas.  This behavior 
     789  dnl   is more consistent with lispdir.m4 for example. 
     790  dnl Query distutils for this directory.  distutils does not exist in 
     791  dnl Python 1.5, so we fall back to the hardcoded directory if it 
     792  dnl doesn't work. 
     793  AC_CACHE_CHECK([for $am_display_PYTHON script directory], 
     794    [am_cv_python_pythondir], 
     795    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || 
     796     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) 
     797  AC_SUBST([pythondir], [$am_cv_python_pythondir]) 
     798 
     799  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was 
     800  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is 
     801  dnl   more consistent with the rest of automake. 
     802 
     803  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) 
     804 
     805  dnl pyexecdir -- directory for installing python extension modules 
     806  dnl   (shared libraries) 
     807  dnl Query distutils for this directory.  distutils does not exist in 
     808  dnl Python 1.5, so we fall back to the hardcoded directory if it 
     809  dnl doesn't work. 
     810  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], 
     811    [am_cv_python_pyexecdir], 
     812    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || 
     813     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`]) 
     814  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) 
     815 
     816  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) 
     817 
     818  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) 
     819 
     820  dnl Run any user-specified action. 
     821  $2 
     822  fi 
     823 
     824]) 
     825 
     826 
     827# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) 
     828# --------------------------------------------------------------------------- 
     829# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. 
     830# Run ACTION-IF-FALSE otherwise. 
     831# This test uses sys.hexversion instead of the string equivalent (first 
     832# word of sys.version), in order to cope with versions such as 2.2c1. 
     833# hexversion has been introduced in Python 1.5.2; it's probably not 
     834# worth to support older versions (1.5.1 was released on October 31, 1998). 
     835AC_DEFUN([AM_PYTHON_CHECK_VERSION], 
     836 [prog="import sys, string 
     837# split strings by '.' and convert to numeric.  Append some zeros 
     838# because we need at least 4 digits for the hex conversion. 
     839minver = map(int, string.split('$2', '.')) + [[0, 0, 0]] 
     840minverhex = 0 
     841for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]] 
     842sys.exit(sys.hexversion < minverhex)" 
     843  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) 
     844 
     845# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc. 
     846# 
     847# This file is free software; the Free Software Foundation 
     848# gives unlimited permission to copy and/or distribute it, 
     849# with or without modifications, as long as this notice is preserved. 
     850 
     851# AM_RUN_LOG(COMMAND) 
     852# ------------------- 
     853# Run COMMAND, save the exit status in ac_status, and log it. 
     854# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) 
     855AC_DEFUN([AM_RUN_LOG], 
     856[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD 
     857   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD 
     858   ac_status=$? 
     859   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 
     860   (exit $ac_status); }]) 
    680861 
    681862# Check to make sure that the build environment is sane.    -*- Autoconf -*- 
    … …  
    8821063m4_include([m4/po.m4]) 
    8831064m4_include([m4/progtest.m4]) 
     1065m4_include([m4/python.m4]) 
    8841066m4_include([acinclude.m4]) 

  • trunk/rgc/configure

    r283 r285  
    895895CHECK_CFLAGS 
    896896CHECK_LIBS 
     897DBUS_GLIB_CFLAGS 
     898DBUS_GLIB_LIBS 
     899PYTHON 
     900PYTHON_VERSION 
     901PYTHON_PREFIX 
     902PYTHON_EXEC_PREFIX 
     903PYTHON_PLATFORM 
     904pythondir 
     905pkgpythondir 
     906pyexecdir 
     907pkgpyexecdir 
     908PYTHON_INCLUDES 
    897909RGC_SRC_LIBS 
    898910RGC_SRC_CFLAGS 
    … …  
    929941GNET_LIBS 
    930942CHECK_CFLAGS 
    931 CHECK_LIBS' 
     943CHECK_LIBS 
     944DBUS_GLIB_CFLAGS 
     945DBUS_GLIB_LIBS' 
    932946 
    933947 
    … …  
    15501564              C compiler flags for CHECK, overriding pkg-config 
    15511565  CHECK_LIBS  linker flags for CHECK, overriding pkg-config 
     1566  DBUS_GLIB_CFLAGS 
     1567              C compiler flags for DBUS_GLIB, overriding pkg-config 
     1568  DBUS_GLIB_LIBS 
     1569              linker flags for DBUS_GLIB, overriding pkg-config 
    15521570 
    15531571Use these variables to override the choices made by `configure' or to help 
    … …  
    46364654  lt_cv_nm_interface="BSD nm" 
    46374655  echo "int some_variable = 0;" > conftest.$ac_ext 
    4638   (eval echo "\"\$as_me:4638: $ac_compile\"" >&5) 
     4656  (eval echo "\"\$as_me:4656: $ac_compile\"" >&5) 
    46394657  (eval "$ac_compile" 2>conftest.err) 
    46404658  cat conftest.err >&5 
    4641   (eval echo "\"\$as_me:4641: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 
     4659  (eval echo "\"\$as_me:4659: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 
    46424660  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 
    46434661  cat conftest.err >&5 
    4644   (eval echo "\"\$as_me:4644: output\"" >&5) 
     4662  (eval echo "\"\$as_me:4662: output\"" >&5) 
    46454663  cat conftest.out >&5 
    46464664  if $GREP 'External.*some_variable' conftest.out > /dev/null; then 
    … …  
    57535771*-*-irix6*) 
    57545772  # Find out which ABI we are using. 
    5755   echo '#line 5755 "configure"' > conftest.$ac_ext 
     5773  echo '#line 5773 "configure"' > conftest.$ac_ext 
    57565774  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 
    57575775  (eval $ac_compile) 2>&5 
    … …  
    76027620   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    76037621   -e 's:$: $lt_compiler_flag:'` 
    7604    (eval echo "\"\$as_me:7604: $lt_compile\"" >&5) 
     7622   (eval echo "\"\$as_me:7622: $lt_compile\"" >&5) 
    76057623   (eval "$lt_compile" 2>conftest.err) 
    76067624   ac_status=$? 
    76077625   cat conftest.err >&5 
    7608    echo "$as_me:7608: \$? = $ac_status" >&5 
     7626   echo "$as_me:7626: \$? = $ac_status" >&5 
    76097627   if (exit $ac_status) && test -s "$ac_outfile"; then 
    76107628     # The compiler can only warn and ignore the option if not recognized 
    … …  
    79267944   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    79277945   -e 's:$: $lt_compiler_flag:'` 
    7928    (eval echo "\"\$as_me:7928: $lt_compile\"" >&5) 
     7946   (eval echo "\"\$as_me:7946: $lt_compile\"" >&5) 
    79297947   (eval "$lt_compile" 2>conftest.err) 
    79307948   ac_status=$? 
    79317949   cat conftest.err >&5 
    7932    echo "$as_me:7932: \$? = $ac_status" >&5 
     7950   echo "$as_me:7950: \$? = $ac_status" >&5 
    79337951   if (exit $ac_status) && test -s "$ac_outfile"; then 
    79347952     # The compiler can only warn and ignore the option if not recognized 
    … …  
    80318049   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    80328050   -e 's:$: $lt_compiler_flag:'` 
    8033    (eval echo "\"\$as_me:8033: $lt_compile\"" >&5) 
     8051   (eval echo "\"\$as_me:8051: $lt_compile\"" >&5) 
    80348052   (eval "$lt_compile" 2>out/conftest.err) 
    80358053   ac_status=$? 
    80368054   cat out/conftest.err >&5 
    8037    echo "$as_me:8037: \$? = $ac_status" >&5 
     8055   echo "$as_me:8055: \$? = $ac_status" >&5 
    80388056   if (exit $ac_status) && test -s out/conftest2.$ac_objext 
    80398057   then 
    … …  
    80868104   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 
    80878105   -e 's:$: $lt_compiler_flag:'` 
    8088    (eval echo "\"\$as_me:8088: $lt_compile\"" >&5) 
     8106   (eval echo "\"\$as_me:8106: $lt_compile\"" >&5) 
    80898107   (eval "$lt_compile" 2>out/conftest.err) 
    80908108   ac_status=$? 
    80918109   cat out/conftest.err >&5 
    8092    echo "$as_me:8092: \$? = $ac_status" >&5 
     8110   echo "$as_me:8110: \$? = $ac_status" >&5 
    80938111   if (exit $ac_status) && test -s out/conftest2.$ac_objext 
    80948112   then 
    … …  
    1084710865  lt_status=$lt_dlunknown 
    1084810866  cat > conftest.$ac_ext <<_LT_EOF 
    10849 #line 10849 "configure" 
     10867#line 10867 "configure" 
    1085010868#include "confdefs.h" 
    1085110869 
    … …  
    1094710965  lt_status=$lt_dlunknown 
    1094810966  cat > conftest.$ac_ext <<_LT_EOF 
    10949 #line 10949 "configure" 
     10967#line 10967 "configure" 
    1095010968#include "confdefs.h" 
    1095110969 
    … …  
    1551015528fi 
    1551115529 
     15530 
     15531pkg_failed=no 
     15532{ echo "$as_me:$LINENO: checking for DBUS_GLIB" >&5 
     15533echo $ECHO_N "checking for DBUS_GLIB... $ECHO_C" >&6; } 
     15534 
     15535if test -n "$PKG_CONFIG"; then 
     15536    if test -n "$DBUS_GLIB_CFLAGS"; then 
     15537        pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS" 
     15538    else 
     15539        if test -n "$PKG_CONFIG" && \ 
     15540    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5 
     15541  ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 
     15542  ac_status=$? 
     15543  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     15544  (exit $ac_status); }; then 
     15545  pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1" 2>/dev/null` 
     15546else 
     15547  pkg_failed=yes 
     15548fi 
     15549    fi 
     15550else 
     15551        pkg_failed=untried 
     15552fi 
     15553if test -n "$PKG_CONFIG"; then 
     15554    if test -n "$DBUS_GLIB_LIBS"; then 
     15555        pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS" 
     15556    else 
     15557        if test -n "$PKG_CONFIG" && \ 
     15558    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5 
     15559  ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 
     15560  ac_status=$? 
     15561  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     15562  (exit $ac_status); }; then 
     15563  pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1" 2>/dev/null` 
     15564else 
     15565  pkg_failed=yes 
     15566fi 
     15567    fi 
     15568else 
     15569        pkg_failed=untried 
     15570fi 
     15571 
     15572 
     15573 
     15574if test $pkg_failed = yes; then 
     15575 
     15576if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 
     15577        _pkg_short_errors_supported=yes 
     15578else 
     15579        _pkg_short_errors_supported=no 
     15580fi 
     15581        if test $_pkg_short_errors_supported = yes; then 
     15582                DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1"` 
     15583        else 
     15584                DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` 
     15585        fi 
     15586        # Put the nasty error message in config.log where it belongs 
     15587        echo "$DBUS_GLIB_PKG_ERRORS" >&5 
     15588 
     15589        { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1) were not met: 
     15590 
     15591$DBUS_GLIB_PKG_ERRORS 
     15592 
     15593Consider adjusting the PKG_CONFIG_PATH environment variable if you 
     15594installed software in a non-standard prefix. 
     15595 
     15596Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS 
     15597and DBUS_GLIB_LIBS to avoid the need to call pkg-config. 
     15598See the pkg-config man page for more details. 
     15599" >&5 
     15600echo "$as_me: error: Package requirements (dbus-glib-1) were not met: 
     15601 
     15602$DBUS_GLIB_PKG_ERRORS 
     15603 
     15604Consider adjusting the PKG_CONFIG_PATH environment variable if you 
     15605installed software in a non-standard prefix. 
     15606 
     15607Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS 
     15608and DBUS_GLIB_LIBS to avoid the need to call pkg-config. 
     15609See the pkg-config man page for more details. 
     15610" >&2;} 
     15611   { (exit 1); exit 1; }; } 
     15612elif test $pkg_failed = untried; then 
     15613        { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it 
     15614is in your PATH or set the PKG_CONFIG environment variable to the full 
     15615path to pkg-config. 
     15616 
     15617Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS 
     15618and DBUS_GLIB_LIBS to avoid the need to call pkg-config. 
     15619See the pkg-config man page for more details. 
     15620 
     15621To get pkg-config, see <http://pkg-config.freedesktop.org/>. 
     15622See \`config.log' for more details." >&5 
     15623echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it 
     15624is in your PATH or set the PKG_CONFIG environment variable to the full 
     15625path to pkg-config. 
     15626 
     15627Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS 
     15628and DBUS_GLIB_LIBS to avoid the need to call pkg-config. 
     15629See the pkg-config man page for more details. 
     15630 
     15631To get pkg-config, see <http://pkg-config.freedesktop.org/>. 
     15632See \`config.log' for more details." >&2;} 
     15633   { (exit 1); exit 1; }; } 
     15634else 
     15635        DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS 
     15636        DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS 
     15637        { echo "$as_me:$LINENO: result: yes" >&5 
     15638echo "${ECHO_T}yes" >&6; } 
     15639        : 
     15640fi 
     15641 
     15642 
     15643 
     15644 
     15645 
     15646        if test -n "$PYTHON"; then 
     15647      # If the user set $PYTHON, use it and don't search something else. 
     15648      { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 
     15649echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6; } 
     15650      prog="import sys, string 
     15651# split strings by '.' and convert to numeric.  Append some zeros 
     15652# because we need at least 4 digits for the hex conversion. 
     15653minver = map(int, string.split('2.2', '.')) + [0, 0, 0] 
     15654minverhex = 0 
     15655for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] 
     15656sys.exit(sys.hexversion < minverhex)" 
     15657  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 
     15658   ($PYTHON -c "$prog") >&5 2>&5 
     15659   ac_status=$? 
     15660   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     15661   (exit $ac_status); }; then 
     15662  { echo "$as_me:$LINENO: result: yes" >&5 
     15663echo "${ECHO_T}yes" >&6; } 
     15664else 
     15665  { { echo "$as_me:$LINENO: error: too old" >&5 
     15666echo "$as_me: error: too old" >&2;} 
     15667   { (exit 1); exit 1; }; } 
     15668fi 
     15669 
     15670      am_display_PYTHON=$PYTHON 
     15671    else 
     15672      # Otherwise, try each interpreter until we find one that satisfies 
     15673      # VERSION. 
     15674      { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 
     15675echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6; } 
     15676if test "${am_cv_pathless_PYTHON+set}" = set; then 
     15677  echo $ECHO_N "(cached) $ECHO_C" >&6 
     15678else 
     15679 
     15680        for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do 
     15681          test "$am_cv_pathless_PYTHON" = none && break 
     15682          prog="import sys, string 
     15683# split strings by '.' and convert to numeric.  Append some zeros 
     15684# because we need at least 4 digits for the hex conversion. 
     15685minver = map(int, string.split('2.2', '.')) + [0, 0, 0] 
     15686minverhex = 0 
     15687for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] 
     15688sys.exit(sys.hexversion < minverhex)" 
     15689  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 
     15690   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 
     15691   ac_status=$? 
     15692   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     15693   (exit $ac_status); }; then 
     15694  break 
     15695fi 
     15696 
     15697        done 
     15698fi 
     15699{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 
     15700echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; } 
     15701      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. 
     15702      if test "$am_cv_pathless_PYTHON" = none; then 
     15703        PYTHON=: 
     15704      else 
     15705        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. 
     15706set dummy $am_cv_pathless_PYTHON; ac_word=$2 
     15707{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     15708echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     15709if test "${ac_cv_path_PYTHON+set}" = set; then 
     15710  echo $ECHO_N "(cached) $ECHO_C" >&6 
     15711else 
     15712  case $PYTHON in 
     15713  [\\/]* | ?:[\\/]*) 
     15714  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. 
     15715  ;; 
     15716  *) 
     15717  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     15718for as_dir in $PATH 
     15719do 
     15720  IFS=$as_save_IFS 
     15721  test -z "$as_dir" && as_dir=. 
     15722  for ac_exec_ext in '' $ac_executable_extensions; do 
     15723  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     15724    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" 
     15725    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     15726    break 2 
     15727  fi 
     15728done 
     15729done 
     15730IFS=$as_save_IFS 
     15731 
     15732  ;; 
     15733esac 
     15734fi 
     15735PYTHON=$ac_cv_path_PYTHON 
     15736if test -n "$PYTHON"; then 
     15737  { echo "$as_me:$LINENO: result: $PYTHON" >&5 
     15738echo "${ECHO_T}$PYTHON" >&6; } 
     15739else 
     15740  { echo "$as_me:$LINENO: result: no" >&5 
     15741echo "${ECHO_T}no" >&6; } 
     15742fi 
     15743 
     15744 
     15745      fi 
     15746      am_display_PYTHON=$am_cv_pathless_PYTHON 
     15747    fi 
     15748 
     15749 
     15750  if test "$PYTHON" = :; then 
     15751      { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 
     15752echo "$as_me: error: no suitable Python interpreter found" >&2;} 
     15753   { (exit 1); exit 1; }; } 
     15754  else 
     15755 
     15756 
     15757  { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 
     15758echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; } 
     15759if test "${am_cv_python_version+set}" = set; then 
     15760  echo $ECHO_N "(cached) $ECHO_C" >&6 
     15761else 
     15762  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` 
     15763fi 
     15764{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 
     15765echo "${ECHO_T}$am_cv_python_version" >&6; } 
     15766  PYTHON_VERSION=$am_cv_python_version 
     15767 
     15768 
     15769 
     15770  PYTHON_PREFIX='${prefix}' 
     15771 
     15772  PYTHON_EXEC_PREFIX='${exec_prefix}' 
     15773 
     15774 
     15775 
     15776  { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 
     15777echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; } 
     15778if test "${am_cv_python_platform+set}" = set; then 
     15779  echo $ECHO_N "(cached) $ECHO_C" >&6 
     15780else 
     15781  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` 
     15782fi 
     15783{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 
     15784echo "${ECHO_T}$am_cv_python_platform" >&6; } 
     15785  PYTHON_PLATFORM=$am_cv_python_platform 
     15786 
     15787 
     15788 
     15789 
     15790                { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 
     15791echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; } 
     15792if test "${am_cv_python_pythondir+set}" = set; then 
     15793  echo $ECHO_N "(cached) $ECHO_C" >&6 
     15794else 
     15795  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || 
     15796     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` 
     15797fi 
     15798{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 
     15799echo "${ECHO_T}$am_cv_python_pythondir" >&6; } 
     15800  pythondir=$am_cv_python_pythondir 
     15801 
     15802 
     15803 
     15804  pkgpythondir=\${pythondir}/$PACKAGE 
     15805 
     15806 
     15807            { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 
     15808echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; } 
     15809if test "${am_cv_python_pyexecdir+set}" = set; then 
     15810  echo $ECHO_N "(cached) $ECHO_C" >&6 
     15811else 
     15812  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || 
     15813     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` 
     15814fi 
     15815{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 
     15816echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } 
     15817  pyexecdir=$am_cv_python_pyexecdir 
     15818 
     15819 
     15820 
     15821  pkgpyexecdir=\${pyexecdir}/$PACKAGE 
     15822 
     15823 
     15824 
     15825  fi 
     15826 
     15827 
     15828 
     15829{ echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 
     15830echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } 
     15831py_prefix=`$PYTHON -c "import sys; print sys.prefix"` 
     15832py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` 
     15833PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" 
     15834if test "$py_prefix" != "$py_exec_prefix"; then 
     15835  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" 
     15836fi 
     15837 
     15838save_CPPFLAGS="$CPPFLAGS" 
     15839CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" 
     15840cat >conftest.$ac_ext <<_ACEOF 
     15841/* confdefs.h.  */ 
     15842_ACEOF 
     15843cat confdefs.h >>conftest.$ac_ext 
     15844cat >>conftest.$ac_ext <<_ACEOF 
     15845/* end confdefs.h.  */ 
     15846#include <Python.h> 
     15847_ACEOF 
     15848if { (ac_try="$ac_cpp conftest.$ac_ext" 
     15849case "(($ac_try" in 
     15850  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
     15851  *) ac_try_echo=$ac_try;; 
     15852esac 
     15853eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 
     15854  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 
     15855  ac_status=$? 
     15856  grep -v '^ *+' conftest.er1 >conftest.err 
     15857  rm -f conftest.er1 
     15858  cat conftest.err >&5 
     15859  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     15860  (exit $ac_status); } >/dev/null && { 
     15861         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 
     15862         test ! -s conftest.err 
     15863       }; then 
     15864  { echo "$as_me:$LINENO: result: found" >&5 
     15865echo "${ECHO_T}found" >&6; } 
     15866 
     15867else 
     15868  echo "$as_me: failed program was:" >&5 
     15869sed 's/^/| /' conftest.$ac_ext >&5 
     15870 
     15871  { echo "$as_me:$LINENO: result: not found" >&5 
     15872echo "${ECHO_T}not found" >&6; } 
     15873{ { echo "$as_me:$LINENO: error: could not find Python headers" >&5 
     15874echo "$as_me: error: could not find Python headers" >&2;} 
     15875   { (exit 1); exit 1; }; } 
     15876fi 
     15877 
     15878rm -f conftest.err conftest.$ac_ext 
     15879CPPFLAGS="$save_CPPFLAGS" 
     15880 
     15881 
    1551215882{ echo "$as_me:$LINENO: checking for mingw32" >&5 
    1551315883echo $ECHO_N "checking for mingw32... $ECHO_C" >&6; } 
    … …  
    1570016070 
    1570116071 
    15702 ac_config_files="$ac_config_files Makefile rgc_server.pc rgc_client.pc po/Makefile.in include/Makefile include/client/Makefile include/common/Makefile include/connection/Makefile include/connection/rbp/Makefile include/server/Makefile src/Makefile src/client/Makefile src/common/Makefile src/connection/Makefile src/connection/rbp/Makefile src/server/Makefile test/Makefile" 
     16072ac_config_files="$ac_config_files Makefile rgc_server.pc rgc_client.pc po/Makefile.in include/Makefile include/client/Makefile include/common/Makefile include/connection/Makefile include/connection/rbp/Makefile include/connection/dbus/Makefile include/server/Makefile src/Makefile src/client/Makefile src/common/Makefile src/connection/Makefile src/connection/rbp/Makefile src/connection/dbus/Makefile src/server/Makefile bindings/Makefile test/Makefile" 
    1570316073 
    1570416074cat >confcache <<\_ACEOF 
    … …  
    1656916939    "include/connection/Makefile") CONFIG_FILES="$CONFIG_FILES include/connection/Makefile" ;; 
    1657016940    "include/connection/rbp/Makefile") CONFIG_FILES="$CONFIG_FILES include/connection/rbp/Makefile" ;; 
     16941    "include/connection/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES include/connection/dbus/Makefile" ;; 
    1657116942    "include/server/Makefile") CONFIG_FILES="$CONFIG_FILES include/server/Makefile" ;; 
    1657216943    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; 
    … …  
    1657516946    "src/connection/Makefile") CONFIG_FILES="$CONFIG_FILES src/connection/Makefile" ;; 
    1657616947    "src/connection/rbp/Makefile") CONFIG_FILES="$CONFIG_FILES src/connection/rbp/Makefile" ;; 
     16948    "src/connection/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES src/connection/dbus/Makefile" ;; 
    1657716949    "src/server/Makefile") CONFIG_FILES="$CONFIG_FILES src/server/Makefile" ;; 
     16950    "bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;; 
    1657816951    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; 
    1657916952 
    … …  
    1680917182CHECK_CFLAGS!$CHECK_CFLAGS$ac_delim 
    1681017183CHECK_LIBS!$CHECK_LIBS$ac_delim 
     17184DBUS_GLIB_CFLAGS!$DBUS_GLIB_CFLAGS$ac_delim 
     17185DBUS_GLIB_LIBS!$DBUS_GLIB_LIBS$ac_delim 
     17186PYTHON!$PYTHON$ac_delim 
     17187PYTHON_VERSION!$PYTHON_VERSION$ac_delim 
     17188PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim 
     17189PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim 
     17190PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim 
     17191pythondir!$pythondir$ac_delim 
     17192pkgpythondir!$pkgpythondir$ac_delim 
     17193pyexecdir!$pyexecdir$ac_delim 
     17194pkgpyexecdir!$pkgpyexecdir$ac_delim 
     17195PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim 
    1681117196RGC_SRC_LIBS!$RGC_SRC_LIBS$ac_delim 
    1681217197RGC_SRC_CFLAGS!$RGC_SRC_CFLAGS$ac_delim 
    … …  
    1682917214_ACEOF 
    1683017215 
    16831   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then 
     17216  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then 
    1683217217    break 
    1683317218  elif $ac_last_try; then 

  • trunk/rgc/configure.ac

    r283 r285  
    4242PKG_CHECK_MODULES(GNET, gnet-2.0) 
    4343PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) 
     44 
     45PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1) 
     46 
     47AM_PATH_PYTHON(2.2) 
     48AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])  
    4449 
    4550AC_CACHE_CHECK( 
    … …  
    159164                 include/connection/Makefile 
    160165                 include/connection/rbp/Makefile 
     166                 include/connection/dbus/Makefile 
    161167                 include/server/Makefile 
    162168                 src/Makefile 
    … …  
    165171                 src/connection/Makefile 
    166172                 src/connection/rbp/Makefile 
     173                 src/connection/dbus/Makefile 
    167174                 src/server/Makefile 
     175                 bindings/Makefile 
    168176                 test/Makefile]) 
    169177AC_OUTPUT 

  • trunk/rgc/include/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    9091CPPFLAGS = @CPPFLAGS@ 
    9192CYGPATH_W = @CYGPATH_W@ 
     93DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     94DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    9295DEFS = @DEFS@ 
    9396DEPDIR = @DEPDIR@ 
    … …  
    156159PKG_CONFIG = @PKG_CONFIG@ 
    157160POSUB = @POSUB@ 
     161PYTHON = @PYTHON@ 
     162PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     163PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     164PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     165PYTHON_PREFIX = @PYTHON_PREFIX@ 
     166PYTHON_VERSION = @PYTHON_VERSION@ 
    158167RANLIB = @RANLIB@ 
    159168RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    213222oldincludedir = @oldincludedir@ 
    214223pdfdir = @pdfdir@ 
     224pkgpyexecdir = @pkgpyexecdir@ 
     225pkgpythondir = @pkgpythondir@ 
    215226prefix = @prefix@ 
    216227program_transform_name = @program_transform_name@ 
    217228psdir = @psdir@ 
     229pyexecdir = @pyexecdir@ 
     230pythondir = @pythondir@ 
    218231sbindir = @sbindir@ 
    219232sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/include/client/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    7879CPPFLAGS = @CPPFLAGS@ 
    7980CYGPATH_W = @CYGPATH_W@ 
     81DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     82DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    8083DEFS = @DEFS@ 
    8184DEPDIR = @DEPDIR@ 
    … …  
    144147PKG_CONFIG = @PKG_CONFIG@ 
    145148POSUB = @POSUB@ 
     149PYTHON = @PYTHON@ 
     150PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     151PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     152PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     153PYTHON_PREFIX = @PYTHON_PREFIX@ 
     154PYTHON_VERSION = @PYTHON_VERSION@ 
    146155RANLIB = @RANLIB@ 
    147156RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    201210oldincludedir = @oldincludedir@ 
    202211pdfdir = @pdfdir@ 
     212pkgpyexecdir = @pkgpyexecdir@ 
     213pkgpythondir = @pkgpythondir@ 
    203214prefix = @prefix@ 
    204215program_transform_name = @program_transform_name@ 
    205216psdir = @psdir@ 
     217pyexecdir = @pyexecdir@ 
     218pythondir = @pythondir@ 
    206219sbindir = @sbindir@ 
    207220sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/include/client/rgc_query.h

    r3 r285  
    1 typedef void (*RgcQueryServerInfoCb)    (gchar          *server_name, 
    2                                          gchar          *server_desc, 
     1typedef void (*RgcQueryServerInfoCb)    (const gchar    *server_name, 
     2                                         const gchar    *server_desc, 
    33                                         gpointer       data); 
    44 
    … …  
    4545 
    4646void 
    47 rgc_query_server_info                   (RgcQueryServerInfoCb *cb, 
     47rgc_query_server_info                   (RgcQueryServerInfoCb cb, 
    4848                                         gpointer       data); 
    4949 

  • trunk/rgc/include/common/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    7879CPPFLAGS = @CPPFLAGS@ 
    7980CYGPATH_W = @CYGPATH_W@ 
     81DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     82DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    8083DEFS = @DEFS@ 
    8184DEPDIR = @DEPDIR@ 
    … …  
    144147PKG_CONFIG = @PKG_CONFIG@ 
    145148POSUB = @POSUB@ 
     149PYTHON = @PYTHON@ 
     150PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     151PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     152PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     153PYTHON_PREFIX = @PYTHON_PREFIX@ 
     154PYTHON_VERSION = @PYTHON_VERSION@ 
    146155RANLIB = @RANLIB@ 
    147156RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    201210oldincludedir = @oldincludedir@ 
    202211pdfdir = @pdfdir@ 
     212pkgpyexecdir = @pkgpyexecdir@ 
     213pkgpythondir = @pkgpythondir@ 
    203214prefix = @prefix@ 
    204215program_transform_name = @program_transform_name@ 
    205216psdir = @psdir@ 
     217pyexecdir = @pyexecdir@ 
     218pythondir = @pythondir@ 
    206219sbindir = @sbindir@ 
    207220sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/include/connection/Makefile.am

    r3 r285  
    1 SUBDIRS = rbp 
     1SUBDIRS = rbp dbus 
    22 
    33librgc_include_connectiondir = $(pkgincludedir)/connection 

  • trunk/rgc/include/connection/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    9091CPPFLAGS = @CPPFLAGS@ 
    9192CYGPATH_W = @CYGPATH_W@ 
     93DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     94DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    9295DEFS = @DEFS@ 
    9396DEPDIR = @DEPDIR@ 
    … …  
    156159PKG_CONFIG = @PKG_CONFIG@ 
    157160POSUB = @POSUB@ 
     161PYTHON = @PYTHON@ 
     162PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     163PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     164PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     165PYTHON_PREFIX = @PYTHON_PREFIX@ 
     166PYTHON_VERSION = @PYTHON_VERSION@ 
    158167RANLIB = @RANLIB@ 
    159168RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    213222oldincludedir = @oldincludedir@ 
    214223pdfdir = @pdfdir@ 
     224pkgpyexecdir = @pkgpyexecdir@ 
     225pkgpythondir = @pkgpythondir@ 
    215226prefix = @prefix@ 
    216227program_transform_name = @program_transform_name@ 
    217228psdir = @psdir@ 
     229pyexecdir = @pyexecdir@ 
     230pythondir = @pythondir@ 
    218231sbindir = @sbindir@ 
    219232sharedstatedir = @sharedstatedir@ 
    … …  
    223236top_builddir = @top_builddir@ 
    224237top_srcdir = @top_srcdir@ 
    225 SUBDIRS = rbp 
     238SUBDIRS = rbp dbus 
    226239librgc_include_connectiondir = $(pkgincludedir)/connection 
    227240librgc_include_connection_DATA = \ 

  • trunk/rgc/include/connection/rbp/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    7879CPPFLAGS = @CPPFLAGS@ 
    7980CYGPATH_W = @CYGPATH_W@ 
     81DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     82DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    8083DEFS = @DEFS@ 
    8184DEPDIR = @DEPDIR@ 
    … …  
    144147PKG_CONFIG = @PKG_CONFIG@ 
    145148POSUB = @POSUB@ 
     149PYTHON = @PYTHON@ 
     150PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     151PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     152PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     153PYTHON_PREFIX = @PYTHON_PREFIX@ 
     154PYTHON_VERSION = @PYTHON_VERSION@ 
    146155RANLIB = @RANLIB@ 
    147156RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    201210oldincludedir = @oldincludedir@ 
    202211pdfdir = @pdfdir@ 
     212pkgpyexecdir = @pkgpyexecdir@ 
     213pkgpythondir = @pkgpythondir@ 
    203214prefix = @prefix@ 
    204215program_transform_name = @program_transform_name@ 
    205216psdir = @psdir@ 
     217pyexecdir = @pyexecdir@ 
     218pythondir = @pythondir@ 
    206219sbindir = @sbindir@ 
    207220sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/include/connection/rgc_protocol_server.h

    r4 r285  
    3838                                                 
    3939        void (*register_object)         (RgcProtocolServer *prot, 
     40                                         GObject        *obj, 
    4041                                         const gchar    *obj_name, 
    4142                                         const gchar    *class_name, 

  • trunk/rgc/include/rgc_server.h

    r139 r285  
    44#include "connection/rgc_connection_server.h" 
    55#include "connection/rbp/rgc_protocol_rbp_server.h" 
     6#include "connection/dbus/rgc_protocol_dbus_server.h" 
    67 
    78#include "server/rgc_class.h" 

  • trunk/rgc/include/server/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    7879CPPFLAGS = @CPPFLAGS@ 
    7980CYGPATH_W = @CYGPATH_W@ 
     81DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     82DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    8083DEFS = @DEFS@ 
    8184DEPDIR = @DEPDIR@ 
    … …  
    144147PKG_CONFIG = @PKG_CONFIG@ 
    145148POSUB = @POSUB@ 
     149PYTHON = @PYTHON@ 
     150PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     151PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     152PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     153PYTHON_PREFIX = @PYTHON_PREFIX@ 
     154PYTHON_VERSION = @PYTHON_VERSION@ 
    146155RANLIB = @RANLIB@ 
    147156RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    201210oldincludedir = @oldincludedir@ 
    202211pdfdir = @pdfdir@ 
     212pkgpyexecdir = @pkgpyexecdir@ 
     213pkgpythondir = @pkgpythondir@ 
    203214prefix = @prefix@ 
    204215program_transform_name = @program_transform_name@ 
    205216psdir = @psdir@ 
     217pyexecdir = @pyexecdir@ 
     218pythondir = @pythondir@ 
    206219sbindir = @sbindir@ 
    207220sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/src/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    116117CPPFLAGS = @CPPFLAGS@ 
    117118CYGPATH_W = @CYGPATH_W@ 
     119DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     120DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    118121DEFS = @DEFS@ 
    119122DEPDIR = @DEPDIR@ 
    … …  
    182185PKG_CONFIG = @PKG_CONFIG@ 
    183186POSUB = @POSUB@ 
     187PYTHON = @PYTHON@ 
     188PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     189PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     190PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     191PYTHON_PREFIX = @PYTHON_PREFIX@ 
     192PYTHON_VERSION = @PYTHON_VERSION@ 
    184193RANLIB = @RANLIB@ 
    185194RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    239248oldincludedir = @oldincludedir@ 
    240249pdfdir = @pdfdir@ 
     250pkgpyexecdir = @pkgpyexecdir@ 
     251pkgpythondir = @pkgpythondir@ 
    241252prefix = @prefix@ 
    242253program_transform_name = @program_transform_name@ 
    243254psdir = @psdir@ 
     255pyexecdir = @pyexecdir@ 
     256pythondir = @pythondir@ 
    244257sbindir = @sbindir@ 
    245258sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/src/client/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    8990CPPFLAGS = @CPPFLAGS@ 
    9091CYGPATH_W = @CYGPATH_W@ 
     92DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     93DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    9194DEFS = @DEFS@ 
    9295DEPDIR = @DEPDIR@ 
    … …  
    155158PKG_CONFIG = @PKG_CONFIG@ 
    156159POSUB = @POSUB@ 
     160PYTHON = @PYTHON@ 
     161PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     162PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     163PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     164PYTHON_PREFIX = @PYTHON_PREFIX@ 
     165PYTHON_VERSION = @PYTHON_VERSION@ 
    157166RANLIB = @RANLIB@ 
    158167RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    212221oldincludedir = @oldincludedir@ 
    213222pdfdir = @pdfdir@ 
     223pkgpyexecdir = @pkgpyexecdir@ 
     224pkgpythondir = @pkgpythondir@ 
    214225prefix = @prefix@ 
    215226program_transform_name = @program_transform_name@ 
    216227psdir = @psdir@ 
     228pyexecdir = @pyexecdir@ 
     229pythondir = @pythondir@ 
    217230sbindir = @sbindir@ 
    218231sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/src/client/rgc_query.c

    r4 r285  
    1313 
    1414 
     15extern RgcRemoteObject *_rgc_internal; 
     16 
     17 
     18 
     19static void 
     20rgc_query_server_info_cb                (RgcRemoteObject *obj, 
     21                                         GValueArray    *array, 
     22                                         gpointer       cb_data, 
     23                                         RgcCbMarshal   c_marshaller, 
     24                                         GCallback      callback, 
     25                                         gpointer       user_data) 
     26{ 
     27        RgcQueryServerInfoCb cb = (RgcQueryServerInfoCb) cb_data;    // ehm... 
     28 
     29        const gchar *server_name = g_value_get_string (g_value_array_get_nth (array, 0)); 
     30        const gchar *server_desc = g_value_get_string (g_value_array_get_nth (array, 1)); 
     31 
     32        (*cb) (server_name, server_desc, user_data); 
     33} 
     34 
     35 
     36 
    1537 
    1638 
    1739void 
    18 rgc_query_server_info                   (RgcQueryServerInfoCb *cb, 
     40rgc_query_server_info                   (RgcQueryServerInfoCb cb, 
    1941                                         gpointer       data) 
    2042{ 
    21         /*event_append(RGC_PENDING_EVENT_QUERY_SERVER_INFO, G_CALLBACK(cb), data, 
    22                      "_RGC_INTERNAL", NULL); 
     43        /*event_append (RGC_PENDING_EVENT_QUERY_SERVER_INFO, G_CALLBACK(cb), data, 
     44                     "_RGC_INTERNAL", NULL);*/ 
     45        rgc_info_append_cb (_rgc_internal, "QUERY_SERVER_INFO", rgc_query_server_info_cb, cb, NULL, NULL, data); 
    2346 
    24         rgc_connection_client_query("_RGC_INTERNAL", "QUERY_SERVER_INFO", NULL);*/ 
     47        rgc_connection_client_query ("_RGC_INTERNAL", "QUERY_SERVER_INFO", ""); 
    2548} 
    2649 
    … …  
    3558                           NULL /*marshal*/, (GCallback) cb, data); 
    3659 
    37         rgc_connection_client_query(OBJ_NAME(_rgc_objects), "objects_list", NULL); 
     60        rgc_connection_client_query(OBJ_NAME(_rgc_objects), "objects_list", ""); 
    3861} 
    3962 

  • trunk/rgc/src/common/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    8788CPPFLAGS = @CPPFLAGS@ 
    8889CYGPATH_W = @CYGPATH_W@ 
     90DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     91DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    8992DEFS = @DEFS@ 
    9093DEPDIR = @DEPDIR@ 
    … …  
    153156PKG_CONFIG = @PKG_CONFIG@ 
    154157POSUB = @POSUB@ 
     158PYTHON = @PYTHON@ 
     159PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     160PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     161PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     162PYTHON_PREFIX = @PYTHON_PREFIX@ 
     163PYTHON_VERSION = @PYTHON_VERSION@ 
    155164RANLIB = @RANLIB@ 
    156165RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    210219oldincludedir = @oldincludedir@ 
    211220pdfdir = @pdfdir@ 
     221pkgpyexecdir = @pkgpyexecdir@ 
     222pkgpythondir = @pkgpythondir@ 
    212223prefix = @prefix@ 
    213224program_transform_name = @program_transform_name@ 
    214225psdir = @psdir@ 
     226pyexecdir = @pyexecdir@ 
     227pythondir = @pythondir@ 
    215228sbindir = @sbindir@ 
    216229sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/src/connection/Makefile.am

    r283 r285  
    1 SUBDIRS = rbp 
     1SUBDIRS = rbp dbus 
    22 
    33 
    … …  
    2525 
    2626librgc_connection_server_la_LIBADD =  \ 
    27         rbp/librgc_protocol_rbp_server.la 
     27        rbp/librgc_protocol_rbp_server.la \ 
     28        dbus/librgc_protocol_dbus_server.la 
    2829        @RGC_SRC_LIBS@ 
    2930 

  • trunk/rgc/src/connection/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    5859        $(am_librgc_connection_client_la_OBJECTS) 
    5960librgc_connection_server_la_DEPENDENCIES =  \ 
    60         rbp/librgc_protocol_rbp_server.la 
     61        rbp/librgc_protocol_rbp_server.la \ 
     62        dbus/librgc_protocol_dbus_server.la 
    6163am_librgc_connection_server_la_OBJECTS = rgc_connection_server.lo \ 
    6264        rgc_protocol_server.lo 
    … …  
    108110CPPFLAGS = @CPPFLAGS@ 
    109111CYGPATH_W = @CYGPATH_W@ 
     112DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     113DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    110114DEFS = @DEFS@ 
    111115DEPDIR = @DEPDIR@ 
    … …  
    174178PKG_CONFIG = @PKG_CONFIG@ 
    175179POSUB = @POSUB@ 
     180PYTHON = @PYTHON@ 
     181PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     182PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     183PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     184PYTHON_PREFIX = @PYTHON_PREFIX@ 
     185PYTHON_VERSION = @PYTHON_VERSION@ 
    176186RANLIB = @RANLIB@ 
    177187RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    231241oldincludedir = @oldincludedir@ 
    232242pdfdir = @pdfdir@ 
     243pkgpyexecdir = @pkgpyexecdir@ 
     244pkgpythondir = @pkgpythondir@ 
    233245prefix = @prefix@ 
    234246program_transform_name = @program_transform_name@ 
    235247psdir = @psdir@ 
     248pyexecdir = @pyexecdir@ 
     249pythondir = @pythondir@ 
    236250sbindir = @sbindir@ 
    237251sharedstatedir = @sharedstatedir@ 
    … …  
    241255top_builddir = @top_builddir@ 
    242256top_srcdir = @top_srcdir@ 
    243 SUBDIRS = rbp 
     257SUBDIRS = rbp dbus 
    244258AM_CFLAGS = @RGC_SRC_CFLAGS@ @GNET_CFLAGS@ 
    245259AM_CPPFLAGS = -DG_LOG_DOMAIN=\"RGC_connection\" 
    … …  
    258272 
    259273librgc_connection_server_la_LIBADD = \ 
    260         rbp/librgc_protocol_rbp_server.la 
     274        rbp/librgc_protocol_rbp_server.la \ 
     275        dbus/librgc_protocol_dbus_server.la 
    261276 
    262277librgc_connection_client_la_LIBADD = \ 

  • trunk/rgc/src/connection/rbp/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    100101CPPFLAGS = @CPPFLAGS@ 
    101102CYGPATH_W = @CYGPATH_W@ 
     103DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     104DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    102105DEFS = @DEFS@ 
    103106DEPDIR = @DEPDIR@ 
    … …  
    166169PKG_CONFIG = @PKG_CONFIG@ 
    167170POSUB = @POSUB@ 
     171PYTHON = @PYTHON@ 
     172PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     173PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     174PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     175PYTHON_PREFIX = @PYTHON_PREFIX@ 
     176PYTHON_VERSION = @PYTHON_VERSION@ 
    168177RANLIB = @RANLIB@ 
    169178RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    223232oldincludedir = @oldincludedir@ 
    224233pdfdir = @pdfdir@ 
     234pkgpyexecdir = @pkgpyexecdir@ 
     235pkgpythondir = @pkgpythondir@ 
    225236prefix = @prefix@ 
    226237program_transform_name = @program_transform_name@ 
    227238psdir = @psdir@ 
     239pyexecdir = @pyexecdir@ 
     240pythondir = @pythondir@ 
    228241sbindir = @sbindir@ 
    229242sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/src/connection/rbp/rbp_message.c

    r152 r285  
    9595{ 
    9696        RbpMessageQuery *mess; 
    97         mess = g_new0(RbpMessageQuery, 1); 
     97        mess = g_new0 (RbpMessageQuery, 1); 
    9898         
    9999        mess->message.type = RBP_QUERY; 
    100         mess->message.obj_name = g_strdup(obj_name); 
     100        mess->message.obj_name = g_strdup (obj_name); 
    101101                 
    102         mess->query_type = g_strdup(query_type); 
    103         mess->about = g_strdup(about); 
    104          
    105         return (mess); 
     102        mess->query_type = g_strdup (query_type); 
     103        mess->about = g_strdup (about); 
     104         
     105        return mess; 
    106106} 
    107107 

  • trunk/rgc/src/connection/rbp/rbp_message_execute_server.c

    r283 r285  
    6868                case RBP_CALL_METHOD: { 
    6969                        RbpMessageCall *mess_call = (RbpMessageCall *) mess; 
    70                         rgc_connection_server_call_method(mess->obj_name, 
     70                        rgc_connection_server_call_method (mess->obj_name, 
    7171                                                          mess_call->method_name, 
    7272                                                          mess_call->n_parameters, 
    … …  
    7575                } 
    7676                case RBP_QUERY: { 
    77                         //RbpMessageQuery *mess_query = (RbpMessageQuery *) mess; 
    78                         // 
     77                        RbpMessageQuery *mess_query = (RbpMessageQuery *) mess; 
     78                        rgc_connection_server_query (mess->obj_name, 
     79                                                     mess_query->query_type, 
     80                                                     mess_query->about); 
     81                        break; 
    7982                } 
    8083                default: 

  • trunk/rgc/src/connection/rbp/rbp_message_lowlevel.c

    r166 r285  
    7272 
    7373/* ... */ 
     74/* FIXME: check ptr == NULL */ 
    7475inline gsize 
    7576write_string_to_binary                  (gchar          *ptr, 

  • trunk/rgc/src/connection/rbp/rgc_protocol_rbp_client.c

    r283 r285  
    292292        RgcProtocolRbpClient *client = RGC_PROTOCOL_RBP_CLIENT (prot); 
    293293        RgcProtocolRbpClientPrivate *priv = RGC_PROTOCOL_RBP_CLIENT_GET_PRIVATE (client); 
    294         //GError *error = NULL; 
    295         /*gint res; 
    296         GError *error = NULL; 
    297  
    298         // Create a socket 
    299         client->socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); 
    300         g_assert (client->socket > 0); 
    301          
    302          
    303         // Bind it the socket to a port  
    304         struct sockaddr_in addr; 
    305         memset (&addr, 0, sizeof (addr)); 
    306         addr.sin_family = AF_INET; 
    307         res = bind (client->socket, 
    308                     (struct sockaddr *) &addr, 
    309                     sizeof (struct sockaddr_in)); 
    310         g_assert (res == 0); 
    311  
    312                      
    313         // Get info about the server's socket 
    314         g_print("Trying to connect to %s %d\n", client->server_name, client->port_number); 
    315         struct hostent *server_info = gethostbyname (client->server_name); 
    316         g_assert (server_info); 
    317          
    318         struct sockaddr_in dest; 
    319         memset (&dest, 0, sizeof (dest)); 
    320         dest.sin_family = AF_INET; 
    321         dest.sin_port = htons (client->port_number); 
    322         memcpy (&(dest.sin_addr), server_info->h_addr_list[0], server_info->h_length); 
    323          
    324          
    325         // Connect to the server's socket  
    326         res = connect (client->socket, 
    327                     (struct sockaddr *) &dest, 
    328                     sizeof (struct sockaddr_in)); 
    329         if (res != 0) { 
    330                 g_warning ("connect failed: %s\n", strerror (errno)); 
    331                 g_assert_not_reached (); 
    332         } 
    333          
    334         g_print ("Connected to %s on port %d\n", client->server_name, client->port_number); 
    335  
    336         client->iochann = g_io_channel_unix_new (client->socket); 
    337         g_return_if_fail(client->iochann); 
    338         g_io_channel_set_encoding (client->iochann, NULL, &error); 
    339         if (error) 
    340                 g_warning("g_io_channel_set_encoding failed: %s", error->message);*/ 
    341294 
    342295        GInetAddr *addr = gnet_inetaddr_new (priv->server_name, priv->port_number); 
    … …  
    361314        priv->channel = gnet_tcp_socket_get_io_channel (priv->socket); 
    362315 
    363  
    364316        g_io_channel_set_buffered (priv->channel, FALSE); 
    365         /*g_io_channel_set_encoding (client->channel, NULL, &error); 
    366         if (error) 
    367                 g_warning ("g_io_channel_set_encoding failed: %s", error->message);*/ 
    368317 
    369318        // Set up RGC's callback 
    … …  
    389338 
    390339        g_source_remove (priv->source); 
    391  
    392         /*GError *err = NULL; 
    393         g_io_channel_shutdown (client->channel, TRUE, &err); 
    394         if (err) 
    395                 g_warning ("g_io_channel_shutdown: %d (%s)\n", err->code, err->message); 
    396  
    397         g_source_remove (client->source); 
    398  
    399         gnet_tcp_socket_delete (client->socket);*/ 
    400340} 
    401341 
    … …  
    412352        GIOStatus status; 
    413353 
    414         rbp_message_write(mess, &mem, &size); 
     354        rbp_message_write (mess, &mem, &size); 
    415355         
    416356        status = g_io_channel_write_chars (priv->channel, mem, size, &written, &error); 
    … …  
    449389 
    450390 
    451 /*static void 
    452 rgc_protocol_rbp_client_destroy_object  (RgcProtocolClient *prot, 
    453                                          const gchar    *obj_name) 
    454 { 
    455         RbpMessage *mess = (RbpMessage *) rbp_message_destroy_create(obj_name); 
     391static void 
     392rgc_protocol_rbp_client_ref             (RgcProtocolClient *prot, 
     393                                         const gchar    *obj_name, 
     394                                         gboolean       increase) 
     395{ 
     396        RbpMessage *mess = (RbpMessage *) rbp_message_ref_create(obj_name, increase); 
    456397         
    457398        rgc_protocol_rbp_client_send_message(RGC_PROTOCOL_RBP_CLIENT(prot), mess); 
    458399        rbp_message_destroy(mess); 
    459 }*/ 
    460  
    461  
    462 static void 
    463 rgc_protocol_rbp_client_ref             (RgcProtocolClient *prot, 
    464                                          const gchar    *obj_name, 
    465                                          gboolean       increase) 
    466 { 
    467         RbpMessage *mess = (RbpMessage *) rbp_message_ref_create(obj_name, increase); 
     400} 
     401 
     402 
     403static void 
     404rgc_protocol_rbp_client_call_method     (RgcProtocolClient *prot, 
     405                                         const gchar    *obj_name, 
     406                                         const gchar    *method_name, 
     407                                         guint          parameters_n, 
     408                                         GValueArray    *values) 
     409{ 
     410        RbpMessage *mess = (RbpMessage *) rbp_message_call_create(obj_name, method_name, 
     411                                                                  parameters_n, values); 
    468412         
    469413        rgc_protocol_rbp_client_send_message(RGC_PROTOCOL_RBP_CLIENT(prot), mess); 
    … …  
    473417 
    474418static void 
    475 rgc_protocol_rbp_client_call_method     (RgcProtocolClient *prot, 
    476                                          const gchar    *obj_name, 
    477                                          const gchar    *method_name, 
    478                                          guint          parameters_n, 
     419rgc_protocol_rbp_client_set_data        (RgcProtocolClient *prot, 
     420                                         const gchar    *obj_name, 
     421                                         guint          parameters_n, 
     422                                         gchar          **parameters, 
    479423                                         GValueArray    *values) 
    480424{ 
    481         RbpMessage *mess = (RbpMessage *) rbp_message_call_create(obj_name, method_name, 
    482                                                                   parameters_n, values); 
     425        RbpMessage *mess = (RbpMessage *) rbp_message_data_create(obj_name, parameters_n, 
     426                                                                  parameters, values); 
    483427         
    484428        rgc_protocol_rbp_client_send_message(RGC_PROTOCOL_RBP_CLIENT(prot), mess); 
    … …  
    488432 
    489433static void 
    490 rgc_protocol_rbp_client_set_data        (RgcProtocolClient *prot, 
    491                                          const gchar    *obj_name, 
    492                                          guint          parameters_n, 
    493                                          gchar          **parameters, 
    494                                          GValueArray    *values) 
    495 { 
    496         RbpMessage *mess = (RbpMessage *) rbp_message_data_create(obj_name, parameters_n, 
    497                                                                   parameters, values); 
    498          
    499         rgc_protocol_rbp_client_send_message(RGC_PROTOCOL_RBP_CLIENT(prot), mess); 
    500         rbp_message_destroy(mess); 
    501 } 
    502  
    503  
    504 static void 
    505434rgc_protocol_rbp_client_query           (RgcProtocolClient *prot, 
    506435                                         const gchar    *obj_name, 
    … …  
    508437                                         const gchar    *about) 
    509438{ 
    510         g_assert_not_reached(); 
    511  
    512         RbpMessage *mess = (RbpMessage *) rbp_message_query_create(obj_name, 
     439        RbpMessage *mess = (RbpMessage *) rbp_message_query_create (obj_name, 
    513440                                                query_type, about); 
    514441         
    515         rgc_protocol_rbp_client_send_message(RGC_PROTOCOL_RBP_CLIENT(prot), mess); 
    516         rbp_message_destroy(mess); 
    517 } 
     442        rgc_protocol_rbp_client_send_message (RGC_PROTOCOL_RBP_CLIENT (prot), mess); 
     443        rbp_message_destroy (mess); 
     444} 

  • trunk/rgc/src/connection/rbp/rgc_protocol_rbp_server.c

    r283 r285  
    9393static void 
    9494rgc_protocol_rbp_server_register_object (RgcProtocolServer *prot, 
     95                                         GObject        *obj, 
    9596                                         const gchar    *obj_name, 
    9697                                         const gchar    *class_name, 
    … …  
    234235        cb_data->execute_callback = rbp_messsage_execute_server; 
    235236 
    236         g_assert (priv->channels_cb_data == NULL); 
     237//      g_assert (priv->channels_cb_data == NULL); 
    237238//      g_print ("new channel base %p data %p\n", cb_data, chann); 
    238239 
    … …  
    251252        priv->socket = gnet_tcp_socket_server_new_with_port (priv->port_number); 
    252253        if (priv->socket) 
    253                 g_print ("Created socket on port %d\n", priv->port_number); 
     254                g_print ("RBP server initialized on port %d\n", priv->port_number); 
    254255        else { 
    255256                g_warning ("Failed to create server socket, aborting...\n"); 
    … …  
    258259 
    259260        gnet_tcp_socket_server_accept_async (priv->socket, _socket_accept, server); 
    260         g_print ("Listening on new socket\n"); 
    261261} 
    262262 
    … …  
    343343{ 
    344344        g_print ("SERVER CHANNEL DESTROY NOTIFY!\n"); 
    345         /*InputCallbackData *cb_data = (InputCallbackData *) data; 
     345        InputCallbackData *cb_data = (InputCallbackData *) data; 
    346346        RgcProtocolRbpServer *server = RGC_PROTOCOL_RBP_SERVER(cb_data->data); 
    347         GError *error = NULL; 
    348          
    349         // we definitely need a mutex here 
    350  
    351         server->channels = g_list_remove(server->channels, cb_data->channel); 
    352         g_io_channel_shutdown(cb_data->channel, FALSE, &error); 
    353          
    354         g_io_channel_unref(cb_data->channel); 
    355         g_free(data);*/ 
     347        RgcProtocolRbpServerPrivate *priv = RGC_PROTOCOL_RBP_SERVER_GET_PRIVATE (server); 
     348         
     349        priv->channels_cb_data = g_list_remove (priv->channels_cb_data, cb_data); 
     350 
     351        g_free (cb_data); 
    356352} 
    357353 
    … …  
    512508static void 
    513509rgc_protocol_rbp_server_register_object (RgcProtocolServer *prot, 
     510                                         GObject        *obj, 
    514511                                         const gchar    *obj_name, 
    515512                                         const gchar    *class_name, 

  • trunk/rgc/src/connection/rgc_connection_client.c

    r283 r285  
    119119                                         const gchar    *about) 
    120120{ 
    121         g_return_if_fail(protocol_client); 
    122         g_return_if_fail(RGC_IS_PROTOCOL_CLIENT(protocol_client)); 
     121        g_return_if_fail (protocol_client); 
     122        g_return_if_fail (RGC_IS_PROTOCOL_CLIENT (protocol_client)); 
    123123         
    124         rgc_protocol_client_query(protocol_client, obj_name, query_type, about); 
     124        rgc_protocol_client_query (protocol_client, obj_name, query_type, about); 
    125125} 
    126126 

  • trunk/rgc/src/connection/rgc_connection_server.c

    r283 r285  
    6060        protocol_list = g_list_append (protocol_list, prot); 
    6161 
    62         g_print ("rgc_connection_server_register_add_protocol %p\n", prot); 
     62        //g_print ("rgc_connection_server_register_add_protocol %p\n", prot); 
    6363         
    6464        rgc_protocol_server_start (prot); 
    … …  
    9696 
    9797void 
    98 rgc_connection_server_register_object   (const gchar    *obj_name, 
     98rgc_connection_server_register_object   (GObject        *obj, 
     99                                         const gchar    *obj_name, 
    99100                                         const gchar    *class_name, 
    100101                                         const gchar    *requested_name) 
    … …  
    103104        RgcProtocolServer *prot; 
    104105 
     106        RgcClass *klass = rgc_class_get_from_itype (G_OBJECT_TYPE (obj)); 
     107        g_assert (klass); 
     108 
     109         
     110 
    105111        while (temp) { 
    106112                prot = RGC_PROTOCOL_SERVER(temp->data); 
    107                 rgc_protocol_server_register_object(prot, obj_name, class_name, requested_name); 
     113                rgc_protocol_server_register_object(prot, obj, obj_name, class_name, requested_name); 
    108114                temp = g_list_next(temp); 
    109115        } 
    … …  
    272278 
    273279 
    274 // possible optimization: strip the QUERY_ at the beginning of strings 
    275280void 
    276281rgc_connection_server_query             (const gchar    *obj_name, 
    … …  
    284289        if (strcmp(obj_name, "_RGC_INTERNAL") == 0) { 
    285290                if (strcmp(query_type, "QUERY_SERVER_INFO") == 0) { 
     291                        g_print ("SERVER INFO!!!\n"); 
    286292                        //rgc_info_server_info() // ????????????? 
    287293 
     294                        GValue *name = g_value_init_string ("SERVER_NAME!"); 
     295                        GValue *desc = g_value_init_string ("SERVER_DESC!"); 
     296                        GValueArray *arr = g_value_array_new (2); 
     297                        arr = g_value_array_append (arr, name); 
     298                        arr = g_value_array_append (arr, desc); 
     299 
     300                        rgc_connection_server_send_info ("_RGC_INTERNAL", "QUERY_SERVER_INFO",  
     301                                         arr->n_values, arr); 
     302                         
    288303 
    289304                } else if (strcmp(query_type, "QUERY_OBJECT_LIST") == 0) { 

  • trunk/rgc/src/connection/rgc_connection_server.h

    r283 r285  
    66 
    77void 
    8 rgc_connection_server_register_object   (const gchar    *obj_name, 
     8rgc_connection_server_register_object   (GObject        *obj, 
     9                                         const gchar    *obj_name, 
    910                                         const gchar    *class_name, 
    1011                                         const gchar    *requested_name); 
    … …  
    6465                                         gchar          **parameters, 
    6566                                         GValueArray    *values); 
     67 
     68void 
     69rgc_connection_server_query             (const gchar    *obj_name, 
     70                                         const gchar    *query_type, 
     71                                         const gchar    *about); 
     72 
     73 
     74/*struct _RgcConnectionObjectMethod { 
     75        const gchar     *name; 
     76        GType           type; 
     77} 
     78 
     79struct _RgcConnectionObjectProperty { 
     80        const gchar     *name; 
     81        GType           type; 
     82} 
     83 
     84struct _RgcConnectionObjectSignal { 
     85        const gchar     *name; 
     86        GType           type; 
     87} 
     88 
     89 
     90struct _RgcConnectionObjectDesc { 
     91        const gchar     *name; 
     92        GList           *methods; 
     93        GList           *properties; 
     94        GList           *signals; 
     95}*/ 

  • trunk/rgc/src/connection/rgc_protocol_server.c

    r188 r285  
    127127void 
    128128rgc_protocol_server_register_object     (RgcProtocolServer *prot, 
     129                                         GObject        *obj, 
    129130                                         const gchar    *obj_name, 
    130131                                         const gchar    *class_name, 
    … …  
    135136         
    136137        if (klass->register_object) 
    137                 (*klass->register_object) (prot, obj_name, class_name, requested_name); 
     138                (*klass->register_object) (prot, obj, obj_name, class_name, requested_name); 
    138139        else 
    139140                g_warning("class->register_object undefined!"); 

  • trunk/rgc/src/connection/rgc_protocol_server.h

    r4 r285  
    2727void 
    2828rgc_protocol_server_register_object     (RgcProtocolServer *prot, 
     29                                         GObject        *obj, 
    2930                                         const gchar    *obj_name, 
    3031                                         const gchar    *class_name, 

  • trunk/rgc/src/server/Makefile.in

    r283 r285  
    4444        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4545        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    46         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     46        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     47        $(top_srcdir)/configure.ac 
    4748am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4849        $(ACLOCAL_M4) 
    … …  
    8990CPPFLAGS = @CPPFLAGS@ 
    9091CYGPATH_W = @CYGPATH_W@ 
     92DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     93DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    9194DEFS = @DEFS@ 
    9295DEPDIR = @DEPDIR@ 
    … …  
    155158PKG_CONFIG = @PKG_CONFIG@ 
    156159POSUB = @POSUB@ 
     160PYTHON = @PYTHON@ 
     161PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     162PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     163PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     164PYTHON_PREFIX = @PYTHON_PREFIX@ 
     165PYTHON_VERSION = @PYTHON_VERSION@ 
    157166RANLIB = @RANLIB@ 
    158167RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    212221oldincludedir = @oldincludedir@ 
    213222pdfdir = @pdfdir@ 
     223pkgpyexecdir = @pkgpyexecdir@ 
     224pkgpythondir = @pkgpythondir@ 
    214225prefix = @prefix@ 
    215226program_transform_name = @program_transform_name@ 
    216227psdir = @psdir@ 
     228pyexecdir = @pyexecdir@ 
     229pythondir = @pythondir@ 
    217230sbindir = @sbindir@ 
    218231sharedstatedir = @sharedstatedir@ 

  • trunk/rgc/src/server/rgc_object.c

    r283 r285  
    422422         
    423423        // TODO: check return value 
    424         rgc_connection_server_register_object (obj_name, class_name, requested_name); 
     424        rgc_connection_server_register_object (obj, obj_name, class_name, requested_name); 
    425425         
    426426        GList *temp = klass->methods; 

  • trunk/rgc/test/Makefile.am

    r283 r285  
    66        new_client_async \ 
    77        perf_test \ 
     8        client_query \ 
    89        check_init 
    910 
    … …  
    3536        @RGC_TEST_LIBS@ \ 
    3637        @GNET_LIBS@ 
     38         
     39         
     40client_query_SOURCES = \ 
     41        client_query.c 
     42 
     43client_query_LDADD =  \ 
     44        ../src/librgc_client.la \ 
     45        @RGC_TEST_LIBS@ \ 
     46        @GNET_LIBS@ 
    3747 
    3848 

  • trunk/rgc/test/Makefile.in

    r283 r285  
    3434host_triplet = @host@ 
    3535noinst_PROGRAMS = new_server$(EXEEXT) new_client_async$(EXEEXT) \ 
    36         perf_test$(EXEEXT) check_init$(EXEEXT) 
     36        perf_test$(EXEEXT) client_query$(EXEEXT) check_init$(EXEEXT) 
    3737TESTS = check_init$(EXEEXT) 
    3838subdir = test 
    … …  
    4747        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ 
    4848        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ 
    49         $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac 
     49        $(top_srcdir)/m4/python.m4 $(top_srcdir)/acinclude.m4 \ 
     50        $(top_srcdir)/configure.ac 
    5051am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    5152        $(ACLOCAL_M4) 
    … …  
    5859check_init_DEPENDENCIES = ../src/librgc_server.la \ 
    5960        ../src/librgc_client.la 
     61am_client_query_OBJECTS = client_query.$(OBJEXT) 
     62client_query_OBJECTS = $(am_client_query_OBJECTS) 
     63client_query_DEPENDENCIES = ../src/librgc_client.la 
    6064am_new_client_async_OBJECTS = new_client_async.$(OBJEXT) 
    6165new_client_async_OBJECTS = $(am_new_client_async_OBJECTS) 
    … …  
    7983        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 
    8084        $(LDFLAGS) -o $@ 
    81 SOURCES = $(check_init_SOURCES) $(new_client_async_SOURCES) \ 
    82         $(new_server_SOURCES) $(perf_test_SOURCES) 
    83 DIST_SOURCES = $(check_init_SOURCES) $(new_client_async_SOURCES) \ 
    84         $(new_server_SOURCES) $(perf_test_SOURCES) 
     85SOURCES = $(check_init_SOURCES) $(client_query_SOURCES) \ 
     86        $(new_client_async_SOURCES) $(new_server_SOURCES) \ 
     87        $(perf_test_SOURCES) 
     88DIST_SOURCES = $(check_init_SOURCES) $(client_query_SOURCES) \ 
     89        $(new_client_async_SOURCES) $(new_server_SOURCES) \ 
     90        $(perf_test_SOURCES) 
    8591ETAGS = etags 
    8692CTAGS = ctags 
    … …  
    102108CPPFLAGS = @CPPFLAGS@ 
    103109CYGPATH_W = @CYGPATH_W@ 
     110DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ 
     111DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ 
    104112DEFS = @DEFS@ 
    105113DEPDIR = @DEPDIR@ 
    … …  
    168176PKG_CONFIG = @PKG_CONFIG@ 
    169177POSUB = @POSUB@ 
     178PYTHON = @PYTHON@ 
     179PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 
     180PYTHON_INCLUDES = @PYTHON_INCLUDES@ 
     181PYTHON_PLATFORM = @PYTHON_PLATFORM@ 
     182PYTHON_PREFIX = @PYTHON_PREFIX@ 
     183PYTHON_VERSION = @PYTHON_VERSION@ 
    170184RANLIB = @RANLIB@ 
    171185RGC_BASE_CFLAGS = @RGC_BASE_CFLAGS@ 
    … …  
    225239oldincludedir = @oldincludedir@ 
    226240pdfdir = @pdfdir@ 
     241pkgpyexecdir = @pkgpyexecdir@ 
     242pkgpythondir = @pkgpythondir@ 
    227243prefix = @prefix@ 
    228244program_transform_name = @program_transform_name@ 
    229245psdir = @psdir@ 
     246pyexecdir = @pyexecdir@ 
     247pythondir = @pythondir@ 
    230248sbindir = @sbindir@ 
    231249sharedstatedir = @sharedstatedir@ 
    … …  
    258276 
    259277perf_test_LDADD = \ 
     278        ../src/librgc_client.la \ 
     279        @RGC_TEST_LIBS@ \ 
     280        @GNET_LIBS@ 
     281 
     282client_query_SOURCES = \ 
     283        client_query.c 
     284 
     285client_query_LDADD = \ 
    260286        ../src/librgc_client.la \ 
    261287        @RGC_TEST_LIBS@ \ 
    … …  
    323349        @rm -f check_init$(EXEEXT) 
    324350        $(LINK) $(check_init_OBJECTS) $(check_init_LDADD) $(LIBS) 
     351client_query$(EXEEXT): $(client_query_OBJECTS) $(client_query_DEPENDENCIES)  
     352        @rm -f client_query$(EXEEXT) 
     353        $(LINK) $(client_query_OBJECTS) $(client_query_LDADD) $(LIBS) 
    325354new_client_async$(EXEEXT): $(new_client_async_OBJECTS) $(new_client_async_DEPENDENCIES)  
    326355        @rm -f new_client_async$(EXEEXT) 
    … …  
    340369 
    341370@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_init.Po@am__quote@ 
     371@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_query.Po@am__quote@ 
    342372@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/new_client_async.Po@am__quote@ 
    343373@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/new_server.Po@am__quote@ 

  • trunk/rgc/test/new_server.c

    r283 r285  
    2828        RgcProtocolServer *prot_rbp = rgc_protocol_rbp_server_new(7784); 
    2929        rgc_connection_server_add_protocol(prot_rbp); 
    30 //      RgcProtocolServer *prot_osc = rgc_protocol_osc_server_new(1275); 
    31 //      rgc_connection_server_add_protocol(prot_osc); 
     30        RgcProtocolServer *prot_dbus = rgc_protocol_dbus_server_new(); 
     31        rgc_connection_server_add_protocol(prot_dbus); 
    3232         
    3333        object1_class_register ();