More warning fixes for gcc-4.6.

SVN revision: 56965

src/comms.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2009 Kim Woelders
+ * Copyright (C) 2004-2011 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -233,6 +233,7 @@ ClientHandleComms(XClientMessageEvent * ev)
 
    if (!IpcExecReply(s, ClientIpcReply, c))
      {
+#if ENABLE_DIALOGS
 	const char         *s1, *s2;
 
 	s1 = (c->clientname) ? c->clientname : "UNKNOWN";
@@ -241,6 +242,7 @@ ClientHandleComms(XClientMessageEvent * ev)
 		 _("Received Unknown Client Message.\n"
 		   "Client Name:    %s\n" "Client Version: %s\n"
 		   "Message Contents:\n\n" "%s\n"), s1, s2, s);
+#endif
 	SoundPlay(SOUND_ERROR_IPC);
      }
 

src/eobj.c

@@ -422,23 +422,28 @@ EobjResize(EObj * eo, int w, int h)
    EobjMoveResize(eo, EobjGetX(eo), EobjGetY(eo), w, h);
 }
 
+#if USE_COMPOSITE
 void
 EobjDamage(EObj * eo)
 {
-#if USE_COMPOSITE
    if (eo->cmhook)
       ECompMgrWinDamageArea(eo, 0, 0, 0, 0);
-#else
-   eo = NULL;
-#endif
 }
+#else
+void
+EobjDamage(EObj * eo __UNUSED__)
+{
+}
+#endif
 
 void
 EobjReparent(EObj * eo, EObj * dst, int x, int y)
 {
+#if USE_COMPOSITE
    int                 move;
 
    move = x != EobjGetX(eo) || y != EobjGetY(eo);
+#endif
 
    EReparentWindow(EobjGetWin(eo), EobjGetWin(dst), x, y);
    if (dst->type == EOBJ_TYPE_DESK)
@@ -536,32 +541,35 @@ EobjShapeUpdate(EObj * eo, int propagate)
 #endif
 }
 
+#if USE_COMPOSITE
 Pixmap
 EobjGetPixmap(const EObj * eo)
 {
-   Pixmap              pmap = None;
+   return ECompMgrWinGetPixmap(eo);
+}
+#else
+Pixmap
+EobjGetPixmap(const EObj * eo __UNUSED__)
+{
+   return None;
+}
+#endif
 
 #if USE_COMPOSITE
-   pmap = ECompMgrWinGetPixmap(eo);
-#else
-   eo = NULL;
-#endif
-   return pmap;
-}
-
 void
 EobjChangeOpacity(EObj * eo, unsigned int opacity)
 {
-#if USE_COMPOSITE
    if (eo->opacity == opacity)
       return;
    eo->opacity = opacity;
    ECompMgrWinChangeOpacity(eo, opacity);
-#else
-   eo = NULL;
-   opacity = 0;
-#endif
 }
+#else
+void
+EobjChangeOpacity(EObj * eo __UNUSED__, unsigned int opacity __UNUSED__)
+{
+}
+#endif
 
 #if USE_COMPOSITE
 void

src/session.c

@@ -458,15 +458,18 @@ SessionGetInfo(EWin * ewin __UNUSED__)
 #endif
 }
 
+#if USE_SM
 void
 SetSMID(const char *smid)
 {
-#if USE_SM
    sm_client_id = Estrdup(smid);
-#else
-   smid = NULL;
-#endif /* USE_SM */
 }
+#else
+void
+SetSMID(const char *smid __UNUSED__)
+{
+}
+#endif /* USE_SM */
 
 static void
 SessionSave(int shutdown)

src/x.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2010 Kim Woelders
+ * Copyright (C) 2004-2011 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -379,15 +379,11 @@ ECreateWindowVD(Win parent, int x, int y, int w, int h,
 }
 #endif
 
-#endif /* USE_COMPOSITE */
-
 Win
 ECreateObjectWindow(Win parent, int x, int y, int w, int h, int saveunder,
 		    int type, Win cwin)
 {
    Win                 win;
-
-#if USE_COMPOSITE
    int                 argb = 0;
 
    switch (type)
@@ -415,15 +411,21 @@ ECreateObjectWindow(Win parent, int x, int y, int w, int h, int saveunder,
       win = ECreateArgbWindow(parent, x, y, w, h, cwin);
    else
       win = ECreateWindow(parent, x, y, w, h, saveunder);
-#else
-   win = ECreateWindow(parent, x, y, w, h, saveunder);
-   type = 0;
-   cwin = NULL;
-#endif
 
    return win;
 }
 
+#else
+
+Win
+ECreateObjectWindow(Win parent, int x, int y, int w, int h, int saveunder,
+		    int type __UNUSED__, Win cwin __UNUSED__)
+{
+   return ECreateWindow(parent, x, y, w, h, saveunder);
+}
+
+#endif /* USE_COMPOSITE */
+
 Win
 ECreateClientWindow(Win parent, int x, int y, int w, int h)
 {