cleanup

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@18 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 5 insertions, 10 deletions

diff --git a/src/client.h b/src/client.h
index 8d9e519c..556b5fb3 100644
--- a/src/client.h
+++ b/src/client.h
@@ -4,15 +4,15 @@
 #include "core.h"
 
 struct client {
-    char *name;
     uint32_t index;
-    
+
+    char *name;
+    struct core *core;
     const char *protocol_name;
 
-    void *kill_userdata;
-    void (*kill)(struct client *c, void *userdata);
+    void (*kill)(struct client *c);
 
-    struct core *core;
+    void *userdata;
 };
 
 struct client *client_new(struct core *c, const char *protocol_name, char *name);
@@ -20,11 +20,6 @@ struct client *client_new(struct core *c, const char *protocol_name, char *name)
 /* This function should be called only by the code that created the client */
 void client_free(struct client *c);
 
-/* The registrant of the client should call this function to set a
- * callback function which is called when destruction of the client is
- * requested */
-void client_set_kill_callback(struct client *c, void (*kill)(struct client *c, void *userdata), void *userdata);
-
 /* Code that didn't create the client should call this function to
  * request destruction of the client */
 void client_kill(struct client *c);