[gnome-nibbles] Remove score-dialog that doesn't work, remaining score functionality should be working



commit 3e08f33ba06145a7363ea7a6b9782c26dfc81062
Author: Bryan Quigley <bryanquigs src gnome org>
Date:   Fri Sep 6 21:59:16 2013 -0400

    Remove score-dialog that doesn't work, remaining score functionality should be working

 src/Makefile.am           |    2 -
 src/games-scores-dialog.c |  610 ---------------------------------------------
 src/games-scores-dialog.h |   81 ------
 src/gnibbles.c            |   36 +---
 src/main.c                |   10 -
 5 files changed, 1 insertions(+), 738 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ca61d0..9df28c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,8 +21,6 @@ gnome_nibbles_SOURCES = \
        games-score.c                   \
        games-scores.c                  \
        games-scores.h                  \
-       games-scores-dialog.c   \
-       games-scores-dialog.h   \
        gnibbles.h \
        gnibbles.c \
        properties.h \
diff --git a/src/gnibbles.c b/src/gnibbles.c
index d2b7028..81625d6 100644
--- a/src/gnibbles.c
+++ b/src/gnibbles.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+//* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 
 /*
  *   Gnome Nibbles: Gnome Worm Game
@@ -40,7 +40,6 @@
 #include "board.h"
 #include "sound.h"
 #include "worm.h"
-#include "games-scores-dialog.h"
 #include "games-scores.h"
 
 GnibblesWorm *worms[NUMWORMS];
@@ -331,38 +330,6 @@ gnibbles_keypress_worms (guint keyval)
 }
 
 void
-gnibbles_show_scores (GtkWidget * window, gint pos)
-{
-  static GtkWidget *scoresdialog = NULL;
-  gchar *message;
-
-  if (!scoresdialog) {
-    scoresdialog = games_scores_dialog_new (GTK_WINDOW (window),
-                                            highscores,
-                                            _("Nibbles Scores"));
-    games_scores_dialog_set_category_description (GAMES_SCORES_DIALOG
-                                                  (scoresdialog),
-                                                  _("Speed:"));
-  }
-  if (pos > 0) {
-    games_scores_dialog_set_hilight (GAMES_SCORES_DIALOG (scoresdialog), pos);
-    message = g_strdup_printf ("<b>%s</b>\n\n%s",
-                               _("Congratulations!"),
-                               pos == 1 ? _("Your score is the best!") :
-                               _("Your score has made the top ten."));
-    games_scores_dialog_set_message (GAMES_SCORES_DIALOG (scoresdialog),
-                                     message);
-    g_free (message);
-  } else {
-    games_scores_dialog_set_message (GAMES_SCORES_DIALOG (scoresdialog),
-                                     NULL);
-  }
-
-  gtk_dialog_run (GTK_DIALOG (scoresdialog));
-  gtk_widget_hide (scoresdialog);
-}
-
-void
 gnibbles_log_score (GtkWidget * window)
 {
   gint pos;
@@ -381,5 +348,4 @@ gnibbles_log_score (GtkWidget * window)
 
   pos = games_scores_add_plain_score (highscores, worms[0]->score);
 
-  gnibbles_show_scores (window, pos);
 }
diff --git a/src/main.c b/src/main.c
index 3051e4b..6d200c5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -327,12 +327,6 @@ pause_game_cb (GtkAction * action, gpointer data)
   }
 }
 
-static void
-show_scores_cb (GtkAction * action, gpointer data)
-{
-  gnibbles_show_scores (window, 0);
-}
-
 void
 end_game (void)
 {
@@ -588,8 +582,6 @@ static const GtkActionEntry action_entry[] = {
    G_CALLBACK (new_game_cb)},
   {"EndGame", NULL, N_("_End Game"), NULL, NULL,
    G_CALLBACK (end_game_cb)},
-  {"Scores", NULL, N_("_Scores"), NULL, NULL,
-   G_CALLBACK (show_scores_cb)},
   {"Quit", GTK_STOCK_QUIT, NULL, NULL, NULL, G_CALLBACK (quit_cb)},
   {"Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL,
    G_CALLBACK (gnibbles_preferences_cb)},
@@ -606,8 +598,6 @@ static const char ui_description[] =
   "      <separator/>"
   "      <menuitem action='Pause'/>"
   "      <separator/>"
-  "      <menuitem action='Scores'/>"
-  "      <separator/>"
   "      <menuitem action='Quit'/>"
   "    </menu>"
   "    <menu action='ViewMenu'>"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]