Changeset 289 for trunk/rgc/src/connection/rbp/rgc_protocol_rbp_server.c
- Timestamp:
- 05/25/09 21:56:42 (3 years ago)
- bzr:base-revision:
- alberto.botti@gmail.com-20090521192404-ptvzvmhm87oq7etr
- bzr:committer:
- Alberto Botti <alberto.botti@gmail.com>
- bzr:file-ids:
rgc/include/client/rgc_client.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2Frgc_client.h
rgc/include/client/rgc_remote_object.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fclient%2Frgc_remote_object.h
rgc/include/connection/rgc_protocol_client.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frgc_protocol_client.h
rgc/include/connection/rgc_protocol_server.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Finclude%2Fconnection%2Frgc_protocol_server.h
rgc/src/client/rgc_client_cmd.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_client_cmd.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_signal.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_remote_signal.c
rgc/src/client/rgc_remote_signal.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fclient%2Frgc_remote_signal.h
rgc/src/common/rgc_utils.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fcommon%2Frgc_utils.h
rgc/src/connection/dbus/rgc_protocol_dbus_server.c rgc_protocol_dbus_se-20090309124819-kmj94w5bsr24cefl-4
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.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message.h
rgc/src/connection/rbp/rbp_message_execute_client.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message_execute_client.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/rbp_message_string.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frbp%2Frbp_message_string.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_client.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_connection_client.h
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_client.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_protocol_client.c
rgc/src/connection/rgc_protocol_client.h 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fconnection%2Frgc_protocol_client.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/rgc_signal.c 210@45ad373b-3914-0410-8193-a61cc481f39f:trunk:rgc%2Fsrc%2Fserver%2Frgc_signal.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/check_query.c check_query.c-20090309124827-7ebnk01c4gfihigv-1
rgc/test/check_rbp.c check_rbp.c-20090522130120-ul6epb7z8me1cerb-1
rgc/test/check_remote_obj.c check_remote_obj.c-20090309124832-uxme781mpafyryoo-1- bzr:mapping-version:
- v4
- bzr:merge:
alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p- bzr:repository-uuid:
- 45ad373b-3914-0410-8193-a61cc481f39f
- bzr:revision-id:
- alberto.botti@gmail.com-20090525195410-45j88awlynnup3b1
- bzr:revno:
- 81
- bzr:revprop:branch-nick:
- trunk
- bzr:root:
- trunk
- bzr:text-parents:
rgc/include/client/rgc_client.h alberto.botti@gmail.com-20090204203706-s4k8dta7qo2zk9xr
rgc/include/client/rgc_remote_object.h alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/include/connection/rgc_protocol_client.h alberto.botti@gmail.com-20090523141639-btaidciozs00n72k
rgc/include/connection/rgc_protocol_server.h alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/client/rgc_client_cmd.c alberto.botti@gmail.com-20090523141639-btaidciozs00n72k
rgc/src/client/rgc_info.c alberto.botti@gmail.com-20090522085825-x7p3tnbyznz5h32l
rgc/src/client/rgc_info.h alberto.botti@gmail.com-20090522085825-x7p3tnbyznz5h32l
rgc/src/client/rgc_query.c alberto.botti@gmail.com-20090522225944-idvciojo63rw7wgz
rgc/src/client/rgc_remote_object.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/client/rgc_remote_signal.c svn-v3-trunk0:45ad373b-3914-0410-8193-a61cc481f39f:trunk:210
rgc/src/client/rgc_remote_signal.h svn-v3-trunk0:45ad373b-3914-0410-8193-a61cc481f39f:trunk:210
rgc/src/common/rgc_utils.h alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/src/connection/dbus/rgc_protocol_dbus_server.c alberto.botti@gmail.com-20090309124852-c9237byuwhf5xhtb
rgc/src/connection/rbp/rbp_message.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rbp/rbp_message.h alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rbp/rbp_message_execute_client.c alberto.botti@gmail.com-20090522085825-x7p3tnbyznz5h32l
rgc/src/connection/rbp/rbp_message_execute_server.c alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/connection/rbp/rbp_message_lowlevel.c alberto.botti@gmail.com-20090304130000-1a9z78agyveb0x12
rgc/src/connection/rbp/rbp_message_string.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rbp/rgc_protocol_rbp_client.c alberto.botti@gmail.com-20090523141639-btaidciozs00n72k
rgc/src/connection/rbp/rgc_protocol_rbp_server.c alberto.botti@gmail.com-20090522225944-idvciojo63rw7wgz
rgc/src/connection/rgc_connection_client.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rgc_connection_client.h alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rgc_connection_server.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rgc_connection_server.h alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rgc_protocol_client.c alberto.botti@gmail.com-20090523141639-btaidciozs00n72k
rgc/src/connection/rgc_protocol_client.h alberto.botti@gmail.com-20090523141639-btaidciozs00n72k
rgc/src/connection/rgc_protocol_server.c alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/connection/rgc_protocol_server.h alberto.botti@gmail.com-20090306143652-vce6aj4qhdsnato6
rgc/src/server/rgc_signal.c alberto.botti@gmail.com-20090204203706-s4k8dta7qo2zk9xr
rgc/test/Makefile.am alberto.botti@gmail.com-20090523135405-4zsipgk3oj869376
rgc/test/Makefile.in alberto.botti@gmail.com-20090523135405-4zsipgk3oj869376
rgc/test/check_query.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c
rgc/test/check_rbp.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/test/check_remote_obj.c alberto.botti@gmail.com-20090309202859-cexjc99k235vxl9c- bzr:text-revisions:
rgc/include/client/rgc_client.h alberto.botti@gmail.com-20090522085825-x7p3tnbyznz5h32l
rgc/include/client/rgc_remote_object.h alberto.botti@gmail.com-20090523141639-btaidciozs00n72k
rgc/include/connection/rgc_protocol_client.h alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/include/connection/rgc_protocol_server.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/client/rgc_client_cmd.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/client/rgc_info.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/client/rgc_info.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/client/rgc_query.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/client/rgc_remote_object.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/client/rgc_remote_signal.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/client/rgc_remote_signal.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/common/rgc_utils.h alberto.botti@gmail.com-20090522130348-njo1fsfpichievhw
rgc/src/connection/dbus/rgc_protocol_dbus_server.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rbp/rbp_message.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rbp/rbp_message.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rbp/rbp_message_execute_client.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rbp/rbp_message_execute_server.c alberto.botti@gmail.com-20090522085825-x7p3tnbyznz5h32l
rgc/src/connection/rbp/rbp_message_lowlevel.c alberto.botti@gmail.com-20090522225944-idvciojo63rw7wgz
rgc/src/connection/rbp/rbp_message_string.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rbp/rgc_protocol_rbp_client.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rbp/rgc_protocol_rbp_server.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rgc_connection_client.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rgc_connection_client.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rgc_connection_server.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rgc_connection_server.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rgc_protocol_client.c alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rgc_protocol_client.h alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/src/connection/rgc_protocol_server.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/connection/rgc_protocol_server.h alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/src/server/rgc_signal.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/test/Makefile.am alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/test/Makefile.in alberto.botti@gmail.com-20090524203640-94hhlog30bihb0j8
rgc/test/check_query.c alberto.botti@gmail.com-20090522225944-idvciojo63rw7wgz
rgc/test/check_rbp.c alberto.botti@gmail.com-20090525195143-anhz3032v51q4h5p
rgc/test/check_remote_obj.c alberto.botti@gmail.com-20090522085825-x7p3tnbyznz5h32l- bzr:timestamp:
- 2009-05-25 21:54:10.654000044 +0200
- bzr:user-agent:
- bzr1.13.1+bzr-svn0.5.3
- svn:original-date:
- 2009-05-25T19:54:10.654000Z
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/rgc/src/connection/rbp/rgc_protocol_rbp_server.c
r286 r289 23 23 #include "../../../include/connection/rbp/rgc_protocol_rbp_server.h" 24 24 #include "../../../include/common/rgc_utils.h" 25 #include "../../common/rgc_utils.h" 25 26 #include "../rgc_protocol_server.h" 26 27 #include "rbp_message.h" 28 #include "rbp_message_string.h" 27 29 #include "rbp_message_execute_server.h" 28 30 #include "rgc_protocol_rbp_common.h" … … 82 84 const gchar *signal_name, 83 85 guint parameters_n, 84 GValue Array*values);86 GValue **values); 85 87 86 88 static void … … 95 97 const gchar *info_type, 96 98 guint n_values, 97 GValue Array*values);99 GValue **values); 98 100 99 101 static void … … 206 208 rgc_protocol_rbp_server_dispose (GObject *object) 207 209 { 208 g_print ("### rgc_protocol_rbp_server_dispose\n"); 210 g_print ("### rgc_protocol_rbp_server_dispose\n"); // FIXME: we sometimes get a segfault here (?????) 209 211 } 210 212 … … 356 358 priv->channels_cb_data = g_list_remove (priv->channels_cb_data, cb_data); 357 359 358 g_free (cb_data);360 // g_free (cb_data); // client->client_socket, already freed in rgc_protocol_rbp_server_stop() 359 361 } 360 362 … … 453 455 GIOStatus status; 454 456 457 g_print ("\033[31mSERVER OUT >>> %s\033[00m\n", rbp_message_to_string (mess)); 458 455 459 rbp_message_write(mess, &mem, &size); 460 //rgc_dump_binary (mem, size); 456 461 457 462 GList *temp = priv->channels_cb_data; … … 486 491 const gchar *signal_name, 487 492 guint parameters_n, 488 GValue Array*values)493 GValue **values) 489 494 { 490 495 RbpMessage *mess = (RbpMessage *) rbp_message_cb_create (obj_name, signal_name, … … 504 509 GValue *value) 505 510 { 506 GValueArray *array = g_value_array_new (2);507 GValue *val1 = g_value_init_string (g_strdup (property_name));508 array = g_value_array_append(array, val1); 509 array = g_value_array_append(array, value);510 511 RbpMessage *mess = (RbpMessage *) rbp_message_info_create (obj_name, "_NOTIFY", 2, array);511 // GValue *array = g_value_array_new (1); 512 /* GValue *val1 = g_value_init_string (g_strdup (property_name)); 513 array = g_value_array_append(array, val1);*/ 514 // array = g_value_array_append(array, value); 515 516 RbpMessage *mess = (RbpMessage *) rbp_message_info_create (obj_name, "_NOTIFY", property_name, 1, &value); 512 517 513 518 g_debug("server_property_changed... "); … … 523 528 const gchar *info_type, 524 529 guint n_values, 525 GValue Array*values)526 { 527 RbpMessage *mess = (RbpMessage *) rbp_message_info_create (obj_name, info_type, 530 GValue **values) 531 { 532 RbpMessage *mess = (RbpMessage *) rbp_message_info_create (obj_name, info_type, "", 528 533 n_values, values); 529 534 … … 540 545 const gchar *requested_name) 541 546 { 542 GValue Array *array = g_value_array_new(3);543 GValue *val1 = g_value_init_string (obj_name);544 GValue *val2 = g_value_init_string (class_name);545 GValue *val3 = g_value_init_string (requested_name);546 array = g_value_array_append(array, val1);547 array = g_value_array_append(array, val2);548 array = g_value_array_append(array, val3);549 550 RbpMessage *mess = (RbpMessage *) rbp_message_info_create ("_RGC_OBJECTS", "object_created", 3, array);547 GValue **values = g_new0 (GValue *, 3); 548 GValue *val1 = g_value_init_string (obj_name); 549 GValue *val2 = g_value_init_string (class_name); 550 GValue *val3 = g_value_init_string (requested_name); 551 values[0] = val1; 552 values[1] = val2; 553 values[2] = val3; 554 555 RbpMessage *mess = (RbpMessage *) rbp_message_info_create ("_RGC_OBJECTS", "object_created", "", 3, values); 551 556 rgc_protocol_rbp_server_send_message(RGC_PROTOCOL_RBP_SERVER(prot), mess); 552 557 rbp_message_destroy(mess); 553 558 554 /* g_value_array_free(array);555 g_free(val1); 556 g_free(val2);557 g_free(val3);*/ 559 guint i; 560 for (i = 0; i < 3; i++) 561 g_value_destroy (values[i]); 562 g_free (values); 558 563 } 559 564
