Show
Ignore:
Timestamp:
05/21/09 21:25:25 (3 years ago)
Author:
ath
bzr:base-revision:
alberto.botti@gmail.com-20090520204117-720d94nsd67ssr26
bzr:committer:
Alberto Botti <alberto.botti@gmail.com>
bzr:file-ids:

rgc/include/connection/rgc_connection_client.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frgc_connection_client.h
rgc/src/client/rgc_callback.c rgc_callback.c-20090309124812-al9t3gcqn9mvzizb-1
rgc/src/client/rgc_callback.h rgc_callback.h-20090309124812-al9t3gcqn9mvzizb-2
rgc/src/client/rgc_client.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_client.c
rgc/src/client/rgc_info.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_info.c
rgc/src/client/rgc_info.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_info.h
rgc/src/client/rgc_query.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_query.c
rgc/src/client/rgc_remote_object.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_remote_object.c
rgc/src/client/rgc_remote_object.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_remote_object.h
rgc/src/common/rgc_utils.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fcommon%2Frgc_utils.c
rgc/src/common/rgc_utils.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fcommon%2Frgc_utils.h
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.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_server.h
rgc/test/check_init.c check_init.c-20090204203613-m3ngse0c6gqkaqk9-1
rgc/test/check_query.c check_query.c-20090309124827-7ebnk01c4gfihigv-1
rgc/test/check_remote_obj.c check_remote_obj.c-20090309124832-uxme781mpafyryoo-1
rgc/test/client_query.c client_query.c-20090309124843-p05fbd5jg3mrq963-1
bzr:mapping-version:
v4
bzr:merge:

alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
bzr:repository-uuid:
45ad373b-3914-0410-8193-a61cc481f39f
bzr:revision-id:
alberto.botti@gmail.com-20090521192404-ptvzvmhm87oq7etr
bzr:revno:
80
bzr:revprop:branch-nick:
trunk
bzr:root:
trunk
bzr:text-parents:

rgc/include/connection/rgc_connection_client.h alberto.botti@gmail.com-20090204203706-s4k8dta7qo2zk9xr
rgc/src/client/rgc_callback.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/src/client/rgc_callback.h alberto.botti@gmail.com-20090309124852-c9237byuwhf5xhtb
rgc/src/client/rgc_client.c alberto.botti@gmail.com-20090204203706-s4k8dta7qo2zk9xr
rgc/src/client/rgc_info.c svn-v3-trunk0:45ad373b-3914-0410-8193-a61cc481f39f:trunk:210
rgc/src/client/rgc_info.h svn-v3-trunk0:45ad373b-3914-0410-8193-a61cc481f39f:trunk:210
rgc/src/client/rgc_query.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/client/rgc_remote_object.c alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/client/rgc_remote_object.h svn-v3-trunk0:45ad373b-3914-0410-8193-a61cc481f39f:trunk:210
rgc/src/common/rgc_utils.c alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/common/rgc_utils.h alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/connection/rgc_connection_client.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rgc_connection_server.h alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/test/check_init.c alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/test/check_query.c alberto.botti@gmail.com-20090309124852-c9237byuwhf5xhtb
rgc/test/check_remote_obj.c alberto.botti@gmail.com-20090309124852-c9237byuwhf5xhtb
rgc/test/client_query.c alberto.botti@gmail.com-20090309124852-c9237byuwhf5xhtb
bzr:text-revisions:

rgc/include/connection/rgc_connection_client.h alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/src/client/rgc_callback.c alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_callback.h alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_client.c alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_info.c alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_info.h alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_query.c alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_remote_object.c alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/client/rgc_remote_object.h alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/common/rgc_utils.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/src/common/rgc_utils.h alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/src/connection/rgc_connection_client.c alberto.botti@gmail.com-20090520203704-74w5npkqcp08o4ig
rgc/src/connection/rgc_connection_server.h alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/test/check_init.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/test/check_query.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/test/check_remote_obj.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/test/client_query.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
bzr:timestamp:
2009-05-21 21:24:04.798000097 +0200
bzr:user-agent:
bzr1.13.1+bzr-svn0.5.3
svn:original-date:
2009-05-21T19:24:04.798000Z
Message:

Merge from the newrgc branch.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/rgc/src/client/rgc_query.c

    r285 r288  
    1717 
    1818 
    19 static void 
     19/*static void 
    2020rgc_query_server_info_cb                (RgcRemoteObject *obj, 
    2121                                         GValueArray    *array, 
     
    3131 
    3232        (*cb) (server_name, server_desc, user_data); 
    33 } 
     33}*/ 
    3434 
    3535 
     
    4343        /*event_append (RGC_PENDING_EVENT_QUERY_SERVER_INFO, G_CALLBACK(cb), data, 
    4444                     "_RGC_INTERNAL", NULL);*/ 
    45         rgc_info_append_cb (_rgc_internal, "QUERY_SERVER_INFO", rgc_query_server_info_cb, cb, NULL, NULL, data); 
     45        //rgc_info_append_cb (_rgc_internal, "QUERY_SERVER_INFO", rgc_query_server_info_cb, cb, NULL, NULL, data); 
     46        g_print ("STUB: rgc_query_server_info\n"); 
    4647 
    4748        rgc_connection_client_query ("_RGC_INTERNAL", "QUERY_SERVER_INFO", ""); 
     
    5556        /*rgc_waiting_info_set_cb(_rgc_objects, "objects_list", NULL marshal 
    5657                                         rgc_info_object_list_cb, data);*/ 
    57         rgc_info_append_cb(_rgc_objects, "objects_list", rgc_info_obj_list_cb, NULL /* hander data */ , 
    58                            NULL /*marshal*/, (GCallback) cb, data); 
     58//      rgc_info_append_cb(_rgc_objects, "objects_list", rgc_info_obj_list_cb, NULL /* hander data */ , 
     59//                         NULL /*marshal*/, (GCallback) cb, data); 
     60        g_print ("STUB: rgc_query_object_list\n"); 
    5961 
    6062        rgc_connection_client_query(OBJ_NAME(_rgc_objects), "objects_list", "");