[four-in-a-row] Rename desktop file so we appear in GNOME Software

[Michael Catanzaro <mcatanzaro src gnome org>]

commit a4ce5b5dea70ad6c64220bf04c0d1ec176195b2e
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Feb 5 15:33:08 2014 -0600

    Rename desktop file so we appear in GNOME Software

 data/Makefile.am                                   |    2 +-
 data/four-in-a-row.appdata.xml.in                  |    2 +-
 .../{gnect.desktop.in => four-in-a-row.desktop.in} |    0
 po/POTFILES.in                                     |    2 +-
 src/main.c                                         |    6 ------
 5 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 3ac1e1a..32f3f1f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,7 +23,7 @@ velenadir      = $(datadir)/four-in-a-row
 velena_DATA    = white_ob.cn4.gz
 
 desktopdir       = $(datadir)/applications
-desktop_in_files = gnect.desktop.in
+desktop_in_files = four-in-a-row.desktop.in
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/data/four-in-a-row.appdata.xml.in b/data/four-in-a-row.appdata.xml.in
index 1e765cd..1ce9de4 100644
--- a/data/four-in-a-row.appdata.xml.in
+++ b/data/four-in-a-row.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
 <application>
- <id type="desktop">gnect.desktop</id>
+ <id type="desktop">four-in-a-row.desktop</id>
  <licence>CC0</licence>
  <description>
   <_p>
diff --git a/data/gnect.desktop.in b/data/four-in-a-row.desktop.in
similarity index 100%
rename from data/gnect.desktop.in
rename to data/four-in-a-row.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c35590b..970a564 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 data/four-in-a-row.appdata.xml.in
-data/gnect.desktop.in
+data/four-in-a-row.desktop.in
 data/org.gnome.four-in-a-row.gschema.xml
 src/games-controls.c
 src/games-stock.c
diff --git a/src/main.c b/src/main.c
index feeda05..5dd566a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1292,12 +1292,6 @@ main (int argc, char *argv[])
   application = gtk_application_new ("org.gnome.four-in-a-row", 0);
   g_signal_connect (application, "activate", G_CALLBACK (create_app), NULL);
 
-  /*
-   * Required because the binary doesn't match the desktop file.
-   * Has to be before the call to g_option_context_parse.
-   */
-  g_set_prgname (APPNAME);
-
   context = g_option_context_new (NULL);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
   retval = g_option_context_parse (context, &argc, &argv, &error);