Author: jtn
Date: Fri Dec 18 21:02:09 2015
New Revision: 31074

URL: http://svn.gna.org/viewcvs/freeciv?rev=31074&view=rev
Log:
Remove mnemonic underscore from Gtk3 action menu items, now that our
Gtk3 build doesn't support mnemonics any more.

See gna bug #24192.

Modified:
    trunk/client/gui-gtk-3.0/action_dialog.c
    trunk/client/gui-gtk-3.0/menu.c

Modified: trunk/client/gui-gtk-3.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=31074&r1=31073&r2=31074&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/action_dialog.c    (original)
+++ trunk/client/gui-gtk-3.0/action_dialog.c    Fri Dec 18 21:02:09 2015
@@ -1205,7 +1205,7 @@
     return;
   }
 
-  label = action_prepare_ui_name(action_id, "_",
+  label = action_prepare_ui_name(action_id, "",
                                  action_probabilities[action_id],
                                  custom);
 
@@ -1236,7 +1236,7 @@
       action_prob_possible(act_prob[action_id]));
 
   /* The probability may have changed. */
-  label = action_prepare_ui_name(action_id, "_",
+  label = action_prepare_ui_name(action_id, "",
                                  act_prob[action_id], custom);
 
   tooltip = action_get_tool_tip(action_id,

Modified: trunk/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=31074&r1=31073&r2=31074&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c     (original)
+++ trunk/client/gui-gtk-3.0/menu.c     Fri Dec 18 21:02:09 2015
@@ -2312,7 +2312,7 @@
   if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
     menus_rename("BUILD_CITY",
                  action_prepare_ui_name(ACTION_HELP_WONDER,
-                                        "_", ACTPROB_NA, NULL));
+                                        "", ACTPROB_NA, NULL));
   } else {
     bool city_on_tile = FALSE;
 
@@ -2329,19 +2329,19 @@
                                             TRUE)) {
       menus_rename("BUILD_CITY",
                    action_prepare_ui_name(ACTION_JOIN_CITY,
-                                          "_", ACTPROB_NA, NULL));
+                                          "", ACTPROB_NA, NULL));
     } else {
       /* refresh default order */
       menus_rename("BUILD_CITY",
                    action_prepare_ui_name(ACTION_FOUND_CITY,
-                                          "_", ACTPROB_NA, NULL));
+                                          "", ACTPROB_NA, NULL));
     }
   }
 
   if (units_can_do_action(punits, ACTION_TRADE_ROUTE, TRUE)) {
     menus_rename("BUILD_ROAD",
                  action_prepare_ui_name(ACTION_TRADE_ROUTE,
-                                        "_", ACTPROB_NA, NULL));
+                                        "", ACTPROB_NA, NULL));
   } else if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) {
     char road_item[500];
     struct extra_type *pextra = NULL;


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

Reply via email to