Author: cazfi
Date: Mon Jan 25 01:04:53 2016
New Revision: 31579

URL: http://svn.gna.org/viewcvs/freeciv?rev=31579&view=rev
Log:
Do not claim that 'Copying' information is available from the Help Menu in
the Welcome message if the gui does not have Help Menu.

See bug #24337

Modified:
    branches/S2_5/client/chatline_common.c
    branches/S2_5/client/chatline_common.h
    branches/S2_5/client/gui-gtk-2.0/gui_main.c
    branches/S2_5/client/gui-gtk-3.0/gui_main.c
    branches/S2_5/client/gui-qt/fc_client.cpp
    branches/S2_5/client/gui-sdl/pages.c

Modified: branches/S2_5/client/chatline_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/chatline_common.c?rev=31579&r1=31578&r2=31579&view=diff
==============================================================================
--- branches/S2_5/client/chatline_common.c      (original)
+++ branches/S2_5/client/chatline_common.c      Mon Jan 25 01:04:53 2016
@@ -174,13 +174,18 @@
 /****************************************************************************
   Standard welcome message.
 ****************************************************************************/
-void chat_welcome_message(void)
+void chat_welcome_message(bool gui_has_copying_mitem)
 {
   output_window_append(ftc_any, _("Freeciv is free software and you are "
                                   "welcome to distribute copies of it "
                                   "under certain conditions;"));
-  output_window_append(ftc_any, _("See the \"Copying\" item on the "
-                                  "Help menu."));
+  if (gui_has_copying_mitem) {
+    output_window_append(ftc_any, _("See the \"Copying\" item on the "
+                                    "Help menu."));
+  } else {
+    output_window_append(ftc_any, _("See COPYING file distributed with "
+                                    "this program."));
+  }
   output_window_append(ftc_any, _("Now ... Go give 'em hell!"));
 }
 

Modified: branches/S2_5/client/chatline_common.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/chatline_common.h?rev=31579&r1=31578&r2=31579&view=diff
==============================================================================
--- branches/S2_5/client/chatline_common.h      (original)
+++ branches/S2_5/client/chatline_common.h      Mon Jan 25 01:04:53 2016
@@ -37,7 +37,7 @@
 void output_window_event(const char *plain_text,
                          const struct text_tag_list *tags, int conn_id);
 
-void chat_welcome_message(void);
+void chat_welcome_message(bool gui_has_copying_mitem);
 void write_chatline_content(const char *txt);
 
 void fc_allocate_ow_mutex(void);

Modified: branches/S2_5/client/gui-gtk-2.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/gui_main.c?rev=31579&r1=31578&r2=31579&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/gui_main.c Mon Jan 25 01:04:53 2016
@@ -1474,7 +1474,7 @@
 
   main_message_area = GTK_TEXT_VIEW(text);
 
-  chat_welcome_message();
+  chat_welcome_message(TRUE);
 
   /* the chat line */
   view = inputline_toolkit_view_new();

Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=31579&r1=31578&r2=31579&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/gui_main.c Mon Jan 25 01:04:53 2016
@@ -1500,7 +1500,7 @@
 
   main_message_area = GTK_TEXT_VIEW(text);
 
-  chat_welcome_message();
+  chat_welcome_message(TRUE);
 
   /* the chat line */
   view = inputline_toolkit_view_new();

Modified: branches/S2_5/client/gui-qt/fc_client.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/fc_client.cpp?rev=31579&r1=31578&r2=31579&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/fc_client.cpp   (original)
+++ branches/S2_5/client/gui-qt/fc_client.cpp   Mon Jan 25 01:04:53 2016
@@ -197,13 +197,12 @@
 ****************************************************************************/
 void fc_client::main(QApplication *qapp)
 {
-
   qRegisterMetaType<QTextCursor>("QTextCursor");
   qRegisterMetaType<QTextBlock>("QTextBlock");
   fc_allocate_ow_mutex();
   real_output_window_append(_("This is Qt-client for Freeciv."), NULL, -1);
   fc_release_ow_mutex();
-  chat_welcome_message();
+  chat_welcome_message(true);
 
   set_client_state(C_S_DISCONNECTED);
 

Modified: branches/S2_5/client/gui-sdl/pages.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/pages.c?rev=31579&r1=31578&r2=31579&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/pages.c        (original)
+++ branches/S2_5/client/gui-sdl/pages.c        Mon Jan 25 01:04:53 2016
@@ -334,7 +334,7 @@
     set_output_window_text(buffer);
   }
 
-  chat_welcome_message();
+  chat_welcome_message(FALSE);
 
   meswin_dialog_popup(TRUE);
 


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

Reply via email to