[iagno] Avoid a function name clash.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [iagno] Avoid a function name clash.
- Date: Thu, 5 Dec 2019 23:03:38 +0000 (UTC)
commit 7cb074ef938d964caab691e1885bf3fe33de4850
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Fri Dec 6 00:01:31 2019 +0100
Avoid a function name clash.
src/game-window.vala | 2 +-
src/iagno.vala | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/game-window.vala b/src/game-window.vala
index a357cc5..714619e 100644
--- a/src/game-window.vala
+++ b/src/game-window.vala
@@ -264,7 +264,7 @@ private class GameWindow : BaseWindow, AdaptativeWidget
headerbar.set_history_button_label (player);
}
- internal void set_title (string game_name)
+ internal void update_title (string game_name)
{
headerbar.update_title (game_name);
}
diff --git a/src/iagno.vala b/src/iagno.vala
index 756aca3..12c7522 100644
--- a/src/iagno.vala
+++ b/src/iagno.vala
@@ -613,7 +613,7 @@ private class Iagno : Gtk.Application, BaseApplication
private void back_cb ()
requires (game_is_set)
{
- set_window_title (game.reverse);
+ set_window_title ();
if (game.current_color != player_one && computer != null && !game.is_complete)
((!) computer).move (SLOW_MOVE_DELAY);
else if (game.is_complete)
@@ -668,8 +668,8 @@ private class Iagno : Gtk.Application, BaseApplication
opening = Opening.REVERSI;
bool reverse = settings.get_string ("type") == "reverse";
- set_window_title (reverse);
game = new Game (reverse, opening, (uint8) size /* 4 <= size <= 16 */, print_logs);
+ set_window_title ();
game_is_set = true;
game.turn_ended.connect (turn_ended_cb);
view.game = game;
@@ -875,13 +875,13 @@ private class Iagno : Gtk.Application, BaseApplication
window.set_history_button_label (game.current_color);
}
- private void set_window_title (bool reverse)
+ private void set_window_title ()
{
/* Translators: name of one of the games, as displayed in the headerbar when playing */
- window.set_title (reverse ? _("Reverse Reversi")
+ window.set_title (game.reverse ? _("Reverse Reversi")
/* Translators: name of one of the games, as displayed in the headerbar when playing */
- : _("Classic Reversi"));
+ : _("Classic Reversi"));
}
/*\
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]