[five-or-more] Rename desktop file so we appear in GNOME Software

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ebe0533b7924edba70039e71a3f3ddf52bd5c282
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Feb 5 15:29:49 2014 -0600

    Rename desktop file so we appear in GNOME Software

 data/Makefile.am                                   |    2 +-
 .../{glines.desktop.in => five-or-more.desktop.in} |    0
 po/POTFILES.in                                     |    2 +-
 src/glines.c                                       |    8 +-------
 4 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 1c7901e..4300278 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,7 +18,7 @@ gsettings_SCHEMAS = org.gnome.five-or-more.gschema.xml
 
 man_MANS = five-or-more.6
 
-desktop_in_files = glines.desktop.in
+desktop_in_files = five-or-more.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
diff --git a/data/glines.desktop.in b/data/five-or-more.desktop.in
similarity index 100%
rename from data/glines.desktop.in
rename to data/five-or-more.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3efb67d..dc636b8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,9 +2,9 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/five-or-more.appdata.xml.in
+data/five-or-more.desktop.in
 [type: gettext/glade]data/five-or-more-preferences.ui
 [type: gettext/glade]data/five-or-more.ui
-data/glines.desktop.in
 [type: gettext/glade]data/menu.ui
 data/org.gnome.five-or-more.gschema.xml
 src/games-scores-dialog.c
diff --git a/src/glines.c b/src/glines.c
index 6645bc8..2e5244c 100644
--- a/src/glines.c
+++ b/src/glines.c
@@ -1545,7 +1545,7 @@ startup_cb (GApplication *application)
 
   settings = g_settings_new ("org.gnome.five-or-more");
 
-  highscores = games_scores_new ("glines",
+  highscores = games_scores_new ("five-or-more",
                                  scorecats, G_N_ELEMENTS (scorecats),
                                  "board size", NULL,
                                  0 /* default category */,
@@ -1673,12 +1673,6 @@ main (int argc, char *argv[])
 
   rgen = g_rand_new ();
 
-  /* 
-   * Required for proper app menu because the binary doesn't match the desktop file.
-   * Has to be before the call to g_option_context_parse.
-   */
-  g_set_prgname ("glines");
-
   context = g_option_context_new (NULL);
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));