[Freeciv-Dev] (PR#10638) Removal of connection dialog broke win32 client
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://rt.freeciv.org/Ticket/Display.html?id=10638 >
> [use_less - Wed Oct 20 09:45:10 2004]:
>
> Before I implement the page functionality in gui-win32, here's a stopgap
> patch that gets gui-win32 compiling again.
In fact it broke all clients!!!!
This patch fixes it. I will apply immediately.
jason
Index: client/gui-ftwl/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-ftwl/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- client/gui-ftwl/Makefile.am 15 Sep 2004 01:28:14 -0000 1.5
+++ client/gui-ftwl/Makefile.am 20 Oct 2004 17:00:06 -0000
@@ -46,6 +46,8 @@
messagedlg.h \
messagewin.c \
messagewin.h \
+ pages.c \
+ pages.h \
plrdlg.c \
plrdlg.h \
ratesdlg.c \
Index: client/gui-ftwl/pages.c
===================================================================
RCS file: client/gui-ftwl/pages.c
diff -N client/gui-ftwl/pages.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-ftwl/pages.c 20 Oct 2004 17:00:06 -0000
@@ -0,0 +1,28 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "pages.h"
+
+/**************************************************************************
+ Sets the "page" that the client should show. See documentation in
+ pages_g.h.
+**************************************************************************/
+void set_client_page(enum client_pages page)
+{
+ /* PORTME */
+}
+
Index: client/gui-ftwl/pages.h
===================================================================
RCS file: client/gui-ftwl/pages.h
diff -N client/gui-ftwl/pages.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-ftwl/pages.h 20 Oct 2004 17:00:06 -0000
@@ -0,0 +1,18 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+#ifndef FC__PAGES_H
+#define FC__PAGES_H
+
+#include "pages_g.h"
+
+#endif /* FC__PAGES_H */
Index: client/gui-gtk/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- client/gui-gtk/Makefile.am 18 Aug 2004 05:24:45 -0000 1.19
+++ client/gui-gtk/Makefile.am 20 Oct 2004 17:00:06 -0000
@@ -70,6 +70,8 @@
messagewin.c \
messagewin.h \
optiondlg.h \
+ pages.c \
+ pages.h \
plrdlg.c \
plrdlg.h \
ratesdlg.h \
Index: client/gui-gtk/pages.c
===================================================================
RCS file: client/gui-gtk/pages.c
diff -N client/gui-gtk/pages.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-gtk/pages.c 20 Oct 2004 17:00:06 -0000
@@ -0,0 +1,28 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "pages.h"
+
+/**************************************************************************
+ Sets the "page" that the client should show. See documentation in
+ pages_g.h.
+**************************************************************************/
+void set_client_page(enum client_pages page)
+{
+ /* PORTME */
+}
+
Index: client/gui-gtk/pages.h
===================================================================
RCS file: client/gui-gtk/pages.h
diff -N client/gui-gtk/pages.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-gtk/pages.h 20 Oct 2004 17:00:06 -0000
@@ -0,0 +1,18 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+#ifndef FC__PAGES_H
+#define FC__PAGES_H
+
+#include "pages_g.h"
+
+#endif /* FC__PAGES_H */
Index: client/gui-sdl/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- client/gui-sdl/Makefile.am 18 Aug 2004 19:43:32 -0000 1.9
+++ client/gui-sdl/Makefile.am 20 Oct 2004 17:00:06 -0000
@@ -70,6 +70,8 @@
messagewin.h \
optiondlg.h \
optiondlg.c \
+ pages.c \
+ pages.h \
plrdlg.c \
plrdlg.h \
ratesdlg.h \
Index: client/gui-sdl/pages.c
===================================================================
RCS file: client/gui-sdl/pages.c
diff -N client/gui-sdl/pages.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-sdl/pages.c 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,28 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "pages.h"
+
+/**************************************************************************
+ Sets the "page" that the client should show. See documentation in
+ pages_g.h.
+**************************************************************************/
+void set_client_page(enum client_pages page)
+{
+ /* PORTME */
+}
+
Index: client/gui-sdl/pages.h
===================================================================
RCS file: client/gui-sdl/pages.h
diff -N client/gui-sdl/pages.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-sdl/pages.h 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,18 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+#ifndef FC__PAGES_H
+#define FC__PAGES_H
+
+#include "pages_g.h"
+
+#endif /* FC__PAGES_H */
Index: client/gui-stub/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-stub/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- client/gui-stub/Makefile.am 18 Aug 2004 05:24:45 -0000 1.5
+++ client/gui-stub/Makefile.am 20 Oct 2004 17:00:07 -0000
@@ -42,6 +42,8 @@
messagedlg.h \
messagewin.c \
messagewin.h \
+ pages.c \
+ pages.h \
plrdlg.c \
plrdlg.h \
ratesdlg.c \
Index: client/gui-stub/pages.c
===================================================================
RCS file: client/gui-stub/pages.c
diff -N client/gui-stub/pages.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-stub/pages.c 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,28 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "pages.h"
+
+/**************************************************************************
+ Sets the "page" that the client should show. See documentation in
+ pages_g.h.
+**************************************************************************/
+void set_client_page(enum client_pages page)
+{
+ /* PORTME */
+}
+
Index: client/gui-stub/pages.h
===================================================================
RCS file: client/gui-stub/pages.h
diff -N client/gui-stub/pages.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-stub/pages.h 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,18 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+#ifndef FC__PAGES_H
+#define FC__PAGES_H
+
+#include "pages_g.h"
+
+#endif /* FC__PAGES_H */
Index: client/gui-win32/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- client/gui-win32/Makefile.am 18 Aug 2004 05:24:45 -0000 1.11
+++ client/gui-win32/Makefile.am 20 Oct 2004 17:00:07 -0000
@@ -53,6 +53,8 @@
messagewin.h \
optiondlg.h \
optiondlg.c \
+ pages.c \
+ pages.h \
plrdlg.c \
plrdlg.h \
ratesdlg.c \
Index: client/gui-win32/pages.c
===================================================================
RCS file: client/gui-win32/pages.c
diff -N client/gui-win32/pages.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-win32/pages.c 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,28 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "pages.h"
+
+/**************************************************************************
+ Sets the "page" that the client should show. See documentation in
+ pages_g.h.
+**************************************************************************/
+void set_client_page(enum client_pages page)
+{
+ /* PORTME */
+}
+
Index: client/gui-win32/pages.h
===================================================================
RCS file: client/gui-win32/pages.h
diff -N client/gui-win32/pages.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-win32/pages.h 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,18 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+#ifndef FC__PAGES_H
+#define FC__PAGES_H
+
+#include "pages_g.h"
+
+#endif /* FC__PAGES_H */
Index: client/gui-xaw/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- client/gui-xaw/Makefile.am 4 Oct 2004 17:33:08 -0000 1.17
+++ client/gui-xaw/Makefile.am 20 Oct 2004 17:00:07 -0000
@@ -71,6 +71,8 @@
messagewin.h \
optiondlg.c \
optiondlg.h \
+ pages.c \
+ pages.h \
pixcomm.c \
pixcomm.h \
pixcommp.h \
Index: client/gui-xaw/pages.c
===================================================================
RCS file: client/gui-xaw/pages.c
diff -N client/gui-xaw/pages.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-xaw/pages.c 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,28 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "pages.h"
+
+/**************************************************************************
+ Sets the "page" that the client should show. See documentation in
+ pages_g.h.
+**************************************************************************/
+void set_client_page(enum client_pages page)
+{
+ /* PORTME */
+}
+
Index: client/gui-xaw/pages.h
===================================================================
RCS file: client/gui-xaw/pages.h
diff -N client/gui-xaw/pages.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ client/gui-xaw/pages.h 20 Oct 2004 17:00:07 -0000
@@ -0,0 +1,18 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
+ 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, 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.
+***********************************************************************/
+#ifndef FC__PAGES_H
+#define FC__PAGES_H
+
+#include "pages_g.h"
+
+#endif /* FC__PAGES_H */
|
|
