Pedantic fixes to the client, where I alphabetized all of the include

statements, as well as removing the new skill dialog, which we do not, 
nor will we use (if we do, it'd be a new one that we'd make).

WARNING!!! This, and all other previous builds have a linker error for 
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is 
also the case for other users of this library as well. I'm currently 
assuming that there's a bug in the compiler itself, and will look into 
reporting this, but in the mean time, it doesn't build for these users, 
unfortunately. Sorry about this.

1 files changed, 15 insertions, 18 deletions

diff --git a/src/main.cpp b/src/main.cpp
index db7b16d4..42a504fe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,50 +17,51 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: main.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
-#include "main.h"
-
 #include <getopt.h>
 #include <iostream>
 #include <physfs.h>
+#include <SDL_image.h>
 #include <unistd.h>
 #include <vector>
-#include <SDL_image.h>
 
 #include <guichan/actionlistener.hpp>
+
 #include <guichan/sdl/sdlinput.hpp>
+
 #include <guichan/widgets/label.hpp>
 
 #include <libxml/parser.h>
 
-#ifndef WIN32
-#include <cerrno>
-#include <sys/stat.h>
+#ifdef __APPLE__
+#include <CoreFoundation/CFBundle.h>
 #endif
 #ifdef __MINGW32__
 #include <windows.h>
 #define usleep(usec) (Sleep ((usec) / 1000), 0)
 #endif
-#if defined __APPLE__
-#include <CoreFoundation/CFBundle.h>
+#ifdef WIN32
+#include <SDL_syswm.h>
+#else
+#include <cerrno>
+#include <sys/stat.h>
 #endif
 
 #include "configuration.h"
-#include "keyboardconfig.h"
-#include "player_relations.h"
 #include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
-#include "lockedarray.h"
+#include "keyboardconfig.h"
 #include "localplayer.h"
+#include "lockedarray.h"
 #include "log.h"
 #include "logindata.h"
+#include "main.h"
 #ifdef USE_OPENGL
 #include "openglgraphics.h"
 #endif
+#include "player_relations.h"
 #include "serverinfo.h"
 #include "sound.h"
 
@@ -72,8 +73,8 @@
 #include "gui/ok_dialog.h"
 #include "gui/progressbar.h"
 #include "gui/register.h"
-#include "gui/updatewindow.h"
 #include "gui/textfield.h"
+#include "gui/updatewindow.h"
 
 #include "net/charserverhandler.h"
 #include "net/loginhandler.h"
@@ -91,10 +92,6 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
-#ifdef WIN32
-#include <SDL_syswm.h>
-#endif
-
 // Account infos
 char n_server, n_character;