From 76bf2f26705b06297ef8d54f7870092defc3adf9 Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@yahoo.com>
Date: Fri, 18 Nov 2011 23:58:19 +0100
Subject: Fix loading glade file when installed. Added desktop entry.

---
 src/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index d2db45d..5f0953e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -280,7 +280,7 @@ static gint liststore_default_compare_func(GtkTreeModel* model,
 
 int main(int argc, char** argv)
 {
-    const gchar* gladefile;
+    gchar* gladefile;
     GtkBuilder* builder;
     GError* error = NULL;
     guint ret;
@@ -309,7 +309,7 @@ int main(int argc, char** argv)
     }
 
     builder = gtk_builder_new();
-    gladefile = DATAROOTDIR "viewtorrents/viewtorrents.glade";
+    gladefile = g_build_filename(DATAROOTDIR, "viewtorrents.glade", NULL);
     ret = gtk_builder_add_from_file(builder, gladefile, &error);
 #ifdef DEBUG
     if (ret == 0)
@@ -322,9 +322,11 @@ int main(int argc, char** argv)
     if (ret == 0)
     {
         fprintf(stderr, "Unable to load %s: %s\n", gladefile, error->message);
+        g_free(gladefile);
         g_clear_error(&error);
         return EXIT_FAILURE;
     }
+    g_free(gladefile);
 
     master.torrents = g_hash_table_new_full(g_direct_hash, g_direct_equal,
                                             noop_destroy, torrent_destroy);
-- 
cgit v1.2.3-70-g09d2