Author: sveinung
Date: Wed Feb 17 14:45:42 2016
New Revision: 31959
URL: http://svn.gna.org/viewcvs/freeciv?rev=31959&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:
branches/S2_6/client/gui-gtk-2.0/action_dialog.c
branches/S2_6/client/gui-gtk-3.0/action_dialog.c
branches/S2_6/client/gui-qt/dialogs.cpp
branches/S2_6/client/gui-sdl/action_dialog.c
branches/S2_6/client/gui-sdl2/action_dialog.c
branches/S2_6/client/gui-stub/dialogs.c
branches/S2_6/client/gui-xaw/action_dialog.c
branches/S2_6/client/include/dialogs_g.h
branches/S2_6/client/packhand.c
Modified: branches/S2_6/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/action_dialog.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/action_dialog.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/action_dialog.c Wed Feb 17 14:45:42 2016
@@ -1309,9 +1309,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: branches/S2_6/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/action_dialog.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/action_dialog.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/action_dialog.c Wed Feb 17 14:45:42 2016
@@ -1319,9 +1319,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: branches/S2_6/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/dialogs.cpp?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/dialogs.cpp (original)
+++ branches/S2_6/client/gui-qt/dialogs.cpp Wed Feb 17 14:45:42 2016
@@ -2230,9 +2230,9 @@
}
/****************************************************************
- Closes the diplomat dialog
+ Closes the action selection dialog
****************************************************************/
-void close_diplomat_dialog(void)
+void action_selection_close(void)
{
choice_dialog *cd;
Modified: branches/S2_6/client/gui-sdl/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/action_dialog.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl/action_dialog.c Wed Feb 17 14:45:42 2016
@@ -1064,9 +1064,9 @@
}
/****************************************************************
- Closes the diplomat dialog
+ Closes the action selection dialog
****************************************************************/
-void close_diplomat_dialog(void)
+void action_selection_close(void)
{
popdown_diplomat_dialog();
}
Modified: branches/S2_6/client/gui-sdl2/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/action_dialog.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl2/action_dialog.c Wed Feb 17 14:45:42 2016
@@ -1067,9 +1067,9 @@
}
/****************************************************************
- Closes the diplomat dialog
+ Closes the action selection dialog
****************************************************************/
-void close_diplomat_dialog(void)
+void action_selection_close(void)
{
popdown_diplomat_dialog();
}
Modified: branches/S2_6/client/gui-stub/dialogs.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-stub/dialogs.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-stub/dialogs.c (original)
+++ branches/S2_6/client/gui-stub/dialogs.c Wed Feb 17 14:45:42 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: branches/S2_6/client/gui-xaw/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/action_dialog.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/gui-xaw/action_dialog.c (original)
+++ branches/S2_6/client/gui-xaw/action_dialog.c Wed Feb 17 14:45:42 2016
@@ -1030,9 +1030,9 @@
}
/**************************************************************************
- Closes the diplomat dialog
-**************************************************************************/
-void close_diplomat_dialog(void)
+ Closes the action selection dialog
+**************************************************************************/
+void action_selection_close(void)
{
if (diplomat_dialog != NULL) {
XtDestroyWidget(diplomat_dialog);
Modified: branches/S2_6/client/include/dialogs_g.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/include/dialogs_g.h?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/include/dialogs_g.h (original)
+++ branches/S2_6/client/include/dialogs_g.h Wed Feb 17 14:45:42 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: branches/S2_6/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=31959&r1=31958&r2=31959&view=diff
==============================================================================
--- branches/S2_6/client/packhand.c (original)
+++ branches/S2_6/client/packhand.c Wed Feb 17 14:45:42 2016
@@ -407,7 +407,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
