summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-08-10 03:41:03 +0000
committerDon Seiler <rizzo@gentoo.org>2004-08-10 03:41:03 +0000
commitaf2ed56a04a9898695bdd783fc717b3595c765d5 (patch)
tree838579dd8cb56b799c5235e0e7e0b745a1214cc9 /games-board/gnocatan/files
parentStable on x86 (diff)
downloadhistorical-af2ed56a04a9898695bdd783fc717b3595c765d5.tar.gz
historical-af2ed56a04a9898695bdd783fc717b3595c765d5.tar.bz2
historical-af2ed56a04a9898695bdd783fc717b3595c765d5.zip
Removing obsolete files
Diffstat (limited to 'games-board/gnocatan/files')
-rw-r--r--games-board/gnocatan/files/chat.diff51
-rw-r--r--games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r11
-rw-r--r--games-board/gnocatan/files/gmap.diff16
-rw-r--r--games-board/gnocatan/files/nothing.diff28
-rw-r--r--games-board/gnocatan/files/servertrade.diff104
5 files changed, 0 insertions, 200 deletions
diff --git a/games-board/gnocatan/files/chat.diff b/games-board/gnocatan/files/chat.diff
deleted file mode 100644
index 93d67ba4ab12..000000000000
--- a/games-board/gnocatan/files/chat.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: chat.c
-===================================================================
-RCS file: /cvsroot/gnocatan/gnocatan/client/gtk/chat.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 chat.c
---- chat.c 1 Jan 2004 19:23:09 -0000 1.2
-+++ chat.c 23 Feb 2004 23:04:29 -0000
-@@ -19,15 +19,16 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#define GDK_DISABLE_DEPRECATED 1
-+#define GTK_DISABLE_DEPRECATED 1
-+#define GNOME_DISABLE_DEPRECATED 1
-+
- #include "config.h"
--#include <string.h>
--
--#include "log.h"
- #include "frontend.h"
-
--#define MAX_CHAT 512 /* maximum chat message size */
-+#define MAX_CHAT 512 /* maximum chat message size */
-
--static GtkWidget *chat_entry; /* messages text widget */
-+static GtkWidget *chat_entry; /* messages text widget */
-
- static void chat_cb(GtkEditable *editable, UNUSED(gpointer user_data))
- {
-@@ -59,8 +60,9 @@ GtkWidget *chat_build_panel()
- gtk_widget_show(frame);
-
- chat_entry = gtk_entry_new();
-- gtk_signal_connect(GTK_OBJECT(chat_entry), "activate",
-- GTK_SIGNAL_FUNC(chat_cb), NULL);
-+ gtk_entry_set_max_length(GTK_ENTRY(chat_entry), MAX_CHAT);
-+ g_signal_connect(G_OBJECT(chat_entry), "activate",
-+ G_CALLBACK(chat_cb), NULL);
- gtk_widget_show(chat_entry);
- gtk_container_add(GTK_CONTAINER(frame), chat_entry);
-
-@@ -69,5 +71,8 @@ GtkWidget *chat_build_panel()
-
- void chat_set_focus(void)
- {
-- gtk_widget_grab_focus(GTK_WIDGET(chat_entry));
-+ if (!gtk_widget_is_focus(chat_entry)) {
-+ gtk_widget_grab_focus(chat_entry);
-+ gtk_editable_set_position(GTK_EDITABLE(chat_entry), -1);
-+ }
- }
diff --git a/games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1 b/games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1
deleted file mode 100644
index fe963935f0ef..000000000000
--- a/games-board/gnocatan/files/digest-gnocatan-0.8.1.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dd31aad77a44ed2e3e8ba6c39e5aa7e gnocatan-0.8.1.16.tar.gz 2116705
diff --git a/games-board/gnocatan/files/gmap.diff b/games-board/gnocatan/files/gmap.diff
deleted file mode 100644
index 06cba4ceddcf..000000000000
--- a/games-board/gnocatan/files/gmap.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: client/gtk/gui.c
-===================================================================
-RCS file: /cvsroot/gnocatan/gnocatan/client/gtk/gui.c,v
-retrieving revision 1.4
-diff -u -p -r1.4 gui.c
---- client/gtk/gui.c 2 Jan 2004 13:33:50 -0000 1.4
-+++ client/gtk/gui.c 6 Feb 2004 18:25:41 -0000
-@@ -296,7 +296,7 @@ void gui_highlight_chits(gint roll)
- static gint expose_map_cb(GtkWidget *area, GdkEventExpose *event,
- UNUSED(gpointer user_data))
- {
-- if (area->window == NULL || map == NULL)
-+ if (area->window == NULL || map == NULL || gmap == NULL)
- return FALSE;
-
- if (gmap->pixmap == NULL) {
diff --git a/games-board/gnocatan/files/nothing.diff b/games-board/gnocatan/files/nothing.diff
deleted file mode 100644
index d7986315bb14..000000000000
--- a/games-board/gnocatan/files/nothing.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: client/common/resource.c
-===================================================================
-RCS file: /cvsroot/gnocatan/gnocatan/client/common/resource.c,v
-retrieving revision 1.3
-diff -u -p -r1.3 resource.c
---- client/common/resource.c 11 Jan 2004 22:38:26 -0000 1.3
-+++ client/common/resource.c 8 Feb 2004 20:38:15 -0000
-@@ -134,7 +134,7 @@ void resource_format_num(gchar *str, gui
- str[len - 1] = '\0';
- return;
- }
--
-+
- if (num_types == 1) {
- for (idx = 0; idx < NO_RESOURCE; idx++) {
- gint num = resources[idx];
-@@ -211,6 +211,11 @@ void resource_format_type(gchar *str, gi
- if (resources[idx] != 0)
- num_types++;
-
-+ if (num_types == 0) {
-+ strcpy(str, _("nothing"));
-+ return;
-+ }
-+
- if (num_types == 1) {
- for (idx = 0; idx < NO_RESOURCE; idx++) {
- gint num = resources[idx];
diff --git a/games-board/gnocatan/files/servertrade.diff b/games-board/gnocatan/files/servertrade.diff
deleted file mode 100644
index 8d5af9534484..000000000000
--- a/games-board/gnocatan/files/servertrade.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: server/player.c
-===================================================================
-RCS file: /cvsroot/gnocatan/gnocatan/server/player.c,v
-retrieving revision 1.37
-diff -u -p -r1.37 player.c
---- server/player.c 1 Jan 2004 19:23:09 -0000 1.37
-+++ server/player.c 8 Feb 2004 00:43:53 -0000
-@@ -402,26 +402,11 @@ void player_archive(Player *player)
-
- /* If the player was in the middle of a trade, pop the state
- machine and inform others as necessary */
-+ /* This doesn't quite solve anything, since it is still this
-+ * player's turn, so the others have to wait for the reconnect
-+ * anyway. */
- state = sm_current(player->sm);
-- if (state == (StateFunc)mode_wait_quote_exit)
-- {
-- sm_pop(player->sm);
-- }
-- else if (state == (StateFunc)mode_domestic_quote)
-- {
-- for (;;) {
-- QuoteInfo *quote;
-- quote = quotelist_find_domestic(game->quotes,
-- player->num, -1);
-- if (quote == NULL)
-- break;
-- quotelist_delete(game->quotes, quote);
-- }
-- player_broadcast(player, PB_RESPOND, "domestic-quote finish\n");
--
-- sm_pop(player->sm);
-- }
-- else if (state == (StateFunc)mode_domestic_initiate)
-+ if (state == (StateFunc)mode_domestic_initiate)
- {
- trade_finish_domestic(player);
- }
-Index: server/trade.c
-===================================================================
-RCS file: /cvsroot/gnocatan/gnocatan/server/trade.c,v
-retrieving revision 1.14
-diff -u -p -r1.14 trade.c
---- server/trade.c 1 Jan 2004 19:23:09 -0000 1.14
-+++ server/trade.c 8 Feb 2004 00:43:53 -0000
-@@ -125,6 +125,27 @@ gboolean mode_wait_quote_exit(Player *pl
- return FALSE;
- }
-
-+static void end_quote (Player *player)
-+{
-+ /* Player has rejected domestic trade - remove all
-+ * quotes from that player
-+ */
-+ for (;;) {
-+ QuoteInfo *quote;
-+ quote = quotelist_find_domestic(player->game->quotes,
-+ player->num, -1);
-+ if (quote == NULL)
-+ break;
-+ quotelist_delete(player->game->quotes, quote);
-+ }
-+ player_broadcast(player, PB_RESPOND, "domestic-quote finish\n");
-+
-+ if (player->disconnected)
-+ sm_pop (player->sm);
-+ else
-+ sm_goto(player->sm, (StateFunc)mode_wait_quote_exit);
-+}
-+
- gboolean mode_domestic_quote(Player *player, gint event)
- {
- StateMachine *sm = player->sm;
-@@ -138,20 +159,7 @@ gboolean mode_domestic_quote(Player *pla
- return FALSE;
-
- if (sm_recv(sm, "domestic-quote finish")) {
-- /* Player has rejected domestic trade - remove all
-- * quotes from that player
-- */
-- for (;;) {
-- QuoteInfo *quote;
-- quote = quotelist_find_domestic(game->quotes,
-- player->num, -1);
-- if (quote == NULL)
-- break;
-- quotelist_delete(game->quotes, quote);
-- }
-- player_broadcast(player, PB_RESPOND, "domestic-quote finish\n");
--
-- sm_goto(sm, (StateFunc)mode_wait_quote_exit);
-+ end_quote (player);
- return TRUE;
- }
-
-@@ -209,7 +217,7 @@ void trade_finish_domestic(Player *playe
- list != NULL; list = player_next_real(list)) {
- Player *scan = list->data;
- if (scan != player && scan->num < game->params->num_players)
-- sm_goto(scan->sm, (StateFunc)mode_wait_quote_exit);
-+ end_quote (scan);
- }
- quotelist_free(game->quotes);
- game->quotes = NULL;