X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fdockapp.h;h=44458c9444ca4a0eddab49aa6f97155c91f28cd5;hb=5446b5da57e7cefa4b297caa21d7664ebff65333;hp=32c44ae8b4567d2fc355075f64c7e94db933b3e9;hpb=e7ab42f84cca40feb87898e461b2e04df76484ed;p=dockapps%2Fwmnotify.git

diff --git a/src/dockapp.h b/src/dockapp.h
index 32c44ae..44458c9 100644
--- a/src/dockapp.h
+++ b/src/dockapp.h
@@ -3,19 +3,7 @@
  *
  * Copyright (C) 2003 Hugo Villeneuve <hugo@hugovil.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This file is released under the GPLv2
  */
 
 #ifndef DOCKAPP_H
@@ -23,36 +11,33 @@
 
 #include <X11/xpm.h>
 
-typedef struct XpmIcon
-{
-  XpmAttributes attributes;
-  Pixmap shapemask;
-  Pixmap image;
-} XpmIcon;
-
-typedef struct dockapp_t
-{
-  Display *display;
-  Window  root_win;
-  int     screen;
-  int     d_depth;
-  Pixel   back_pix;
-  Pixel   fore_pix;
-  Window  iconwin;
-  Window  win;
-  GC      NormalGC;
-  XpmIcon xpm_icon;
-} dockapp_t;
+struct XpmIcon {
+	XpmAttributes attributes;
+	Pixmap shapemask;
+	Pixmap image;
+};
+
+struct dockapp_t {
+	Display *display;
+	Window root_win;
+	Window win;
+	Window iconwin;
+	int screen;
+	int d_depth;
+	Pixel back_pix;
+	Pixel fore_pix;
+	GC NormalGC;
+	struct XpmIcon xpm_icon;
+};
 
 void
-InitDockAppWindow( int argc, char *argv[], char *pixmap_data[],
-		   char *display_arg, char *geometry_arg );
+InitDockAppWindow(int argc, char *argv[], char *pixmap_data[]);
 
-void
-RedrawWindow( void );
+void RedrawWindow(void);
 
 void
-copyXPMArea( int x, int y, unsigned int sx, unsigned int sy, int dx, int dy );
+copyXPMArea(int x, int y, unsigned int sx, unsigned int sy, int dx,
+	    int dy);
 
 /* Exported variables */
 #undef _SCOPE_
@@ -62,6 +47,6 @@ copyXPMArea( int x, int y, unsigned int sx, unsigned int sy, int dx, int dy );
 #define _SCOPE_ extern
 #endif
 
-_SCOPE_ dockapp_t dockapp;
+_SCOPE_ struct dockapp_t dockapp;
 
-#endif /* DOCKAPP_H */
+#endif				/* DOCKAPP_H */