Author: sveinung Date: Wed Feb 17 14:27:14 2016 New Revision: 31957 URL: http://svn.gna.org/viewcvs/freeciv?rev=31957&view=rev Log: client API: make function name clearer.
The function close_diplomat_dialog() closes all action selection dialogs. The action selection dialog isn't limited to diplomatic actions any more. Change its name to action_selection_close(). See patch #6965 Modified: trunk/client/gui-gtk-2.0/action_dialog.c trunk/client/gui-gtk-3.0/action_dialog.c trunk/client/gui-gtk-3.x/action_dialog.c trunk/client/gui-qt/dialogs.cpp trunk/client/gui-sdl2/action_dialog.c trunk/client/gui-stub/dialogs.c trunk/client/include/dialogs_g.h trunk/client/packhand.c Modified: trunk/client/gui-gtk-2.0/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/action_dialog.c (original) +++ trunk/client/gui-gtk-2.0/action_dialog.c Wed Feb 17 14:27:14 2016 @@ -1563,9 +1563,9 @@ } /**************************************************************** - Closes the diplomat dialog + Closes the action selection dialog ****************************************************************/ -void close_diplomat_dialog(void) +void action_selection_close(void) { if (act_sel_dialog != NULL) { gtk_widget_destroy(act_sel_dialog); 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=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/action_dialog.c (original) +++ trunk/client/gui-gtk-3.0/action_dialog.c Wed Feb 17 14:27:14 2016 @@ -1573,9 +1573,9 @@ } /**************************************************************** - Closes the diplomat dialog + Closes the action selection dialog ****************************************************************/ -void close_diplomat_dialog(void) +void action_selection_close(void) { if (act_sel_dialog != NULL) { gtk_widget_destroy(act_sel_dialog); Modified: trunk/client/gui-gtk-3.x/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/action_dialog.c?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/gui-gtk-3.x/action_dialog.c (original) +++ trunk/client/gui-gtk-3.x/action_dialog.c Wed Feb 17 14:27:14 2016 @@ -1567,9 +1567,9 @@ } /**************************************************************** - Closes the diplomat dialog + Closes the action selection dialog ****************************************************************/ -void close_diplomat_dialog(void) +void action_selection_close(void) { if (act_sel_dialog != NULL) { gtk_widget_destroy(act_sel_dialog); Modified: trunk/client/gui-qt/dialogs.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/gui-qt/dialogs.cpp (original) +++ trunk/client/gui-qt/dialogs.cpp Wed Feb 17 14:27:14 2016 @@ -2510,9 +2510,9 @@ } /**************************************************************** - Closes the diplomat dialog + Closes the action selection dialog ****************************************************************/ -void close_diplomat_dialog(void) +void action_selection_close(void) { choice_dialog *cd; Modified: trunk/client/gui-sdl2/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/gui-sdl2/action_dialog.c (original) +++ trunk/client/gui-sdl2/action_dialog.c Wed Feb 17 14:27:14 2016 @@ -1388,9 +1388,9 @@ } /**************************************************************** - Closes the diplomat dialog + Closes the action selection dialog ****************************************************************/ -void close_diplomat_dialog(void) +void action_selection_close(void) { popdown_diplomat_dialog(); } Modified: trunk/client/gui-stub/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-stub/dialogs.c?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/gui-stub/dialogs.c (original) +++ trunk/client/gui-stub/dialogs.c Wed Feb 17 14:27:14 2016 @@ -262,9 +262,9 @@ } /**************************************************************** - Closes the diplomat dialog + Closes the action selection dialog ****************************************************************/ -void close_diplomat_dialog(void) +void action_selection_close(void) { /* PORTME */ } Modified: trunk/client/include/dialogs_g.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/include/dialogs_g.h?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/include/dialogs_g.h (original) +++ trunk/client/include/dialogs_g.h Wed Feb 17 14:27:14 2016 @@ -54,7 +54,7 @@ GUI_FUNC_PROTO(int, action_selection_actor_unit, void) GUI_FUNC_PROTO(int, action_selection_target_city, void) GUI_FUNC_PROTO(int, action_selection_target_unit, void) -GUI_FUNC_PROTO(void, close_diplomat_dialog, void) +GUI_FUNC_PROTO(void, action_selection_close, void) GUI_FUNC_PROTO(void, action_selection_refresh, struct unit *actor_unit, struct city *target_city, struct unit *target_unit, struct tile *target_tile, Modified: trunk/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=31957&r1=31956&r2=31957&view=diff ============================================================================== --- trunk/client/packhand.c (original) +++ trunk/client/packhand.c Wed Feb 17 14:27:14 2016 @@ -412,7 +412,7 @@ /* Close diplomat dialog if the diplomat is lost */ if (action_selection_actor_unit() == punit->id) { - close_diplomat_dialog(); + action_selection_close(); /* Open another diplomat dialog if there are other diplomats waiting */ action_decision_taken(unit_id); } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits