diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /dcop/dcopc.c | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/dcopc.c')
-rw-r--r-- | dcop/dcopc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dcop/dcopc.c b/dcop/dcopc.c index 06cf8aaba..9667eb624 100644 --- a/dcop/dcopc.c +++ b/dcop/dcopc.c @@ -182,7 +182,7 @@ dcop_process_message( ) { struct DCOPMsg * pMsg = 0L; - tqStatus status = False; + Status status = False; char * buf = 0L; char * senderId = 0L; @@ -390,7 +390,7 @@ dcop_send_signal( free(header); - if (IceConnectiontqStatus(dcop_ice_conn) != IceConnectAccepted) + if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted) return False; return True; @@ -412,7 +412,7 @@ dcop_call( ) { IceReplyWaitInfo waitInfo; - IceProcessMessagestqStatus status; + IceProcessMessagesStatus status; struct dcop_reply_struct replyStruct; char * pos = 0L; @@ -472,7 +472,7 @@ dcop_call( free(outputData); outputData = NULL; - if (IceConnectiontqStatus(dcop_ice_conn) != IceConnectAccepted) { + if (IceConnectionStatus(dcop_ice_conn) != IceConnectAccepted) { fprintf(stderr, "dcop_call(): Connection not accepted\n"); return False; } @@ -544,7 +544,7 @@ dcop_register(const char * app_name, Bool add_pid) char * data = 0L; char * pos = 0L; int dataLength = 0; - Bool calltqStatus = False; + Bool callStatus = False; fprintf(stderr, "dcop_register(`%s')\n", app_name); @@ -558,9 +558,9 @@ dcop_register(const char * app_name, Bool add_pid) fprintf(stderr, "dcop_init(): Reregistering as `%s'\n", app_name); - calltqStatus = dcop_detach(); + callStatus = dcop_detach(); - if (False == calltqStatus) { + if (False == callStatus) { fprintf(stderr, "dcop_init(): Could not detach before reregistering\n"); return 0L; } @@ -584,7 +584,7 @@ dcop_register(const char * app_name, Bool add_pid) pos = dcop_write_string(pos, dcop_requested_name); dataLength = pos - data; - calltqStatus = + callStatus = dcop_call( dcop_requested_name, "DCOPServer", @@ -600,7 +600,7 @@ dcop_register(const char * app_name, Bool add_pid) free(dcop_requested_name); free(data); - if (False == calltqStatus) { + if (False == callStatus) { fprintf(stderr, "dcop_register(): dcop_call() failed\n"); return 0L; } @@ -769,7 +769,7 @@ dcop_protocol_setup() return ( (status == IceProtocolSetupSuccess) && - (IceConnectiontqStatus(dcop_ice_conn) == IceConnectAccepted) + (IceConnectionStatus(dcop_ice_conn) == IceConnectAccepted) ); } |