From 93fe6f1b0d68c8ce85c85564f04073019c678405 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Wed, 2 Sep 2009 13:44:44 +0000
Subject: [PATCH] minor format changes + add missing xwid id to client register
request.
---
src/zmapControl/zmapControlRemoteReceive.c | 33 +++++++++++-----------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/zmapControl/zmapControlRemoteReceive.c b/src/zmapControl/zmapControlRemoteReceive.c
index 7f1640ad4..763be65b3 100755
--- a/src/zmapControl/zmapControlRemoteReceive.c
+++ b/src/zmapControl/zmapControlRemoteReceive.c
@@ -28,9 +28,9 @@
* Exported functions: See zmapControl_P.h
*
* HISTORY:
- * Last edited: Aug 13 17:26 2009 (edgrif)
+ * Last edited: Sep 1 14:44 2009 (edgrif)
* Created: Thu Jul 12 14:54:30 2007 (rds)
- * CVS info: $Id: zmapControlRemoteReceive.c,v 1.5 2009-08-14 09:55:20 edgrif Exp $
+ * CVS info: $Id: zmapControlRemoteReceive.c,v 1.6 2009-09-02 13:44:44 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -358,32 +358,33 @@ static void createClient(ZMap zmap, ZMapXRemoteParseCommandData input_data, Resp
{
ZMapXRemoteObj client;
ClientParameters client_params = &(input_data->common.client_params);
- char *format_response = "<client created=\"%d\" exists=\"%d\" />";
+ char *format_response = "<client xwid=\"0x%lx\" created=\"%d\" exists=\"%d\" />";
int created, exists;
- if(!(zmap->xremote_client) && (client = zMapXRemoteNew()) != NULL)
+ if (!(zmap->xremote_client) && (client = zMapXRemoteNew()) != NULL)
{
- zMapXRemoteInitClient(client, client_params->xid);
- zMapXRemoteSetRequestAtomName(client, (char *)g_quark_to_string(client_params->request));
- zMapXRemoteSetResponseAtomName(client, (char *)g_quark_to_string(client_params->response));
+ zMapXRemoteInitClient(client, client_params->xid) ;
+ zMapXRemoteSetRequestAtomName(client, (char *)g_quark_to_string(client_params->request)) ;
+ zMapXRemoteSetResponseAtomName(client, (char *)g_quark_to_string(client_params->response)) ;
- zmap->xremote_client = client;
- created = exists = 1;
+ zmap->xremote_client = client ;
+ created = exists = 1 ;
}
- else if(zmap->xremote_client)
+ else if (zmap->xremote_client)
{
- created = 0;
- exists = 1;
+ created = 0 ;
+ exists = 1 ;
}
else
{
- created = exists = 0;
+ created = exists = 0 ;
}
- g_string_append_printf(output_data->messages, format_response, created, exists);
- output_data->code = ZMAPXREMOTE_OK;
+ g_string_append_printf(output_data->messages, format_response,
+ zMapXRemoteWidgetGetXID(zmap->toplevel), created, exists) ;
+ output_data->code = ZMAPXREMOTE_OK ;
- return;
+ return ;
}
--
GitLab