From d5d56aea5b1882b6fff35b8468f918306d5e34f4 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sat, 15 Dec 2007 12:36:58 +0000
Subject: [PATCH] Trivial cleanups.

SVN revision: 33151
---
 src/comms.c   | 10 ++++++----
 src/comms.h   |  6 ------
 src/session.h |  1 -
 src/x.c       |  2 +-
 src/xwin.h    |  3 ++-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/comms.c b/src/comms.c
index 90821fe0..ba38521c 100644
--- a/src/comms.c
+++ b/src/comms.c
@@ -28,7 +28,7 @@
 #include "e16-ecore_list.h"
 #include "xwin.h"
 
-struct _client
+typedef struct
 {
    char               *name;
    Window              xwin;
@@ -37,7 +37,9 @@ struct _client
    char               *version;
    char               *info;
    char                replied;
-};
+} Client;
+
+static void         CommsSend(Client * c, const char *s);
 
 static Ecore_List  *client_list = NULL;
 
@@ -343,7 +345,7 @@ CommsDoSend(Window win, const char *s)
      }
 }
 
-void
+static void
 CommsSend(Client * c, const char *s)
 {
    if (!c)
@@ -352,6 +354,7 @@ CommsSend(Client * c, const char *s)
    CommsDoSend(c->xwin, s);
 }
 
+#if 0				/* Unused */
 /*
  * When we are running in multi-head, connect to the master wm process
  * and send the message
@@ -365,7 +368,6 @@ CommsSendToMasterWM(const char *s)
    CommsDoSend(RootWindow(disp, Mode.wm.master_screen), s);
 }
 
-#if 0				/* Unused */
 /*
  * When we are running in multi-head, connect to the slave wm processes
  * and broadcast the message
diff --git a/src/comms.h b/src/comms.h
index 47c074c1..f34e19c6 100644
--- a/src/comms.h
+++ b/src/comms.h
@@ -24,12 +24,6 @@
 #ifndef _COMMS_H_
 #define _COMMS_H_
 
-typedef struct _client Client;
-
 void                CommsInit(void);
-void                CommsSend(Client * c, const char *s);
-void                CommsSendToMasterWM(const char *s);
-void                CommsBroadcast(const char *s);
-void                CommsBroadcastToSlaveWMs(const char *s);
 
 #endif /* _COMMS_H_ */
diff --git a/src/session.h b/src/session.h
index a38dcf11..0fa16efe 100644
--- a/src/session.h
+++ b/src/session.h
@@ -41,6 +41,5 @@ void                SessionInit(void);
 void                SessionExit(int mode, const char *params);
 void                SessionHelper(int when);
 void                SetSMID(const char *smid);
-void                SettingsSession(void);
 
 #endif /* _SESSION_H_ */
diff --git a/src/x.c b/src/x.c
index f4049a72..d9897ea8 100644
--- a/src/x.c
+++ b/src/x.c
@@ -1119,7 +1119,7 @@ EQueryPointer(Win win, int *px, int *py, Window * pchild, unsigned int *pmask)
 }
 
 void
-ESelectInputChange(Win win, long set, long clear)
+ESelectInputChange(Win win, unsigned long set, unsigned long clear)
 {
    XWindowAttributes   xwa;
 
diff --git a/src/xwin.h b/src/xwin.h
index 542b9e6b..b8ecb534 100644
--- a/src/xwin.h
+++ b/src/xwin.h
@@ -141,7 +141,8 @@ void                EWindowSync(Win win);
 void                EWindowSetGeometry(Win win, int x, int y, int w, int h,
 				       int bw);
 void                EWindowSetMapped(Win win, int mapped);
-void                ESelectInputChange(Win win, long set, long clear);
+void                ESelectInputChange(Win win, unsigned long set,
+				       unsigned long clear);
 
 void                EMoveWindow(Win win, int x, int y);
 void                EResizeWindow(Win win, int w, int h);