Author: cazfi
Date: Mon Jul 25 14:18:51 2016
New Revision: 33322

URL: http://svn.gna.org/viewcvs/freeciv?rev=33322&view=rev
Log:
Added beta version message for sdl-clients.

See patch #7494

Modified:
    trunk/client/gui-sdl2/chatline.h
    trunk/client/gui-sdl2/messagewin.c
    trunk/client/gui-sdl2/pages.c

Modified: trunk/client/gui-sdl2/chatline.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/chatline.h?rev=33322&r1=33321&r2=33322&view=diff
==============================================================================
--- trunk/client/gui-sdl2/chatline.h    (original)
+++ trunk/client/gui-sdl2/chatline.h    Mon Jul 25 14:18:51 2016
@@ -1,4 +1,4 @@
-/********************************************************************** 
+/***********************************************************************
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
    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
@@ -11,13 +11,13 @@
    GNU General Public License for more details.
 ***********************************************************************/
 
-/**********************************************************************
+/***********************************************************************
                           chatline.h  -  description
                              -------------------
     begin                : Sun Jun 30 2002
     copyright            : (C) 2002 by Rafał Bursig
     email                : Rafał Bursig <bur...@poczta.fm>
- **********************************************************************/
+***********************************************************************/
 
 #ifndef FC__CHATLINE_H
 #define FC__CHATLINE_H
@@ -28,7 +28,7 @@
 bool popdown_conn_list_dialog(void);
 void popdown_load_game_dialog(void);
 
-#define set_output_window_text( pString )      \
-  output_window_append( ftc_any, pString )
+#define set_output_window_text(_pstr_) \
+  output_window_append(ftc_any, _pstr_)
 
 #endif /* FC__CHATLINE_H */

Modified: trunk/client/gui-sdl2/messagewin.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/messagewin.c?rev=33322&r1=33321&r2=33322&view=diff
==============================================================================
--- trunk/client/gui-sdl2/messagewin.c  (original)
+++ trunk/client/gui-sdl2/messagewin.c  Mon Jul 25 14:18:51 2016
@@ -181,7 +181,7 @@
             if (create) {
               add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf, 
pWindow, FALSE,
                                                         area.x, area.y);
-               create = FALSE;
+              create = FALSE;
             } else {
               add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
                                                         
pMsg_Dlg->pBeginActiveWidgetList,
@@ -221,7 +221,7 @@
             add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
                                                       pWindow, FALSE,
                                                       area.x, area.y);
-             create = FALSE;
+            create = FALSE;
           } else {
             add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
                                                       
pMsg_Dlg->pBeginActiveWidgetList,
@@ -266,8 +266,6 @@
   pMsg_Dlg->pEndWidgetList = pWindow;
   pMsg_Dlg->pBeginWidgetList = pWindow;
 
-/*  area = pWindow->area;*/
-
   /* create scrollbar */
   create_vertical_scrollbar(pMsg_Dlg, 1, N_MSG_VIEW, TRUE, TRUE);
 

Modified: trunk/client/gui-sdl2/pages.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/pages.c?rev=33322&r1=33321&r2=33322&view=diff
==============================================================================
--- trunk/client/gui-sdl2/pages.c       (original)
+++ trunk/client/gui-sdl2/pages.c       Mon Jul 25 14:18:51 2016
@@ -1,4 +1,4 @@
-/********************************************************************** 
+/***********************************************************************
  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
@@ -337,6 +337,10 @@
 
   set_output_window_text(_("SDL2-client welcomes you..."));
 
+#if IS_BETA_VERSION
+  set_output_window_text(beta_message());
+#endif /* IS_BETA_VERSION */
+
   rev_ver = fc_git_revision();
   if (rev_ver != NULL) {
     char buffer[512];


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to