From 6998871adf152242b1b87d8a7b8049af6287493b Mon Sep 17 00:00:00 2001
From: Matthew Bowra-Dean <matthew@ijw.co.nz>
Date: Tue, 4 Jan 2011 18:38:31 +1300
Subject: [PATCH] Fix GTK launcher to change to correct working directory.

---
 OpenRA.Launcher.Gtk/main.c     | 5 ++++-
 packaging/linux/openra.desktop | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Launcher.Gtk/main.c b/OpenRA.Launcher.Gtk/main.c
index e77b171748..61e1682481 100644
--- a/OpenRA.Launcher.Gtk/main.c
+++ b/OpenRA.Launcher.Gtk/main.c
@@ -434,7 +434,10 @@ int main(int argc, char ** argv)
 {
   GtkWidget * hbox1, * hbox2, * vbox;
 
-  int res = chdir("../share/openra");
+  int res = chdir("/usr/share/openra");
+
+  if (0 != res)
+    res = chdir("/usr/local/share/openra");
 
   if (0 != res)
   {
diff --git a/packaging/linux/openra.desktop b/packaging/linux/openra.desktop
index fb67ce6548..f4239136be 100644
--- a/packaging/linux/openra.desktop
+++ b/packaging/linux/openra.desktop
@@ -1,4 +1,3 @@
-
 [Desktop Entry]
 Type=Application
 Version={VERSION}
@@ -8,4 +7,3 @@ Icon=openra
 Exec=/usr/bin/openra
 Terminal=false
 Categories=Game;
-Name[en_NZ]=openra.desktop