[gthumb] load the .desktop file from the local data dir if --enable-run-in-place is used

[Paolo Bacchilega <paobac src gnome org>]

commit fa1ccdcb3012d6cf73e7ae7c3f015747356ac81d
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jul 10 12:37:24 2011 +0200

    load the .desktop file from the local data dir if --enable-run-in-place is used

 gthumb/Makefile.am |    3 +++
 gthumb/gth-main.c  |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index 37ee516..ff9b278 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -276,11 +276,13 @@ ui_dir = $(abs_top_srcdir)/data/ui
 icon_dir = $(abs_top_srcdir)/data/icons
 extensions_ui_dir = $(abs_top_srcdir)/extensions
 extensions_dir = $(abs_top_builddir)/extensions
+applications_dir = $(abs_top_builddir)/data
 else
 ui_dir = $(pkgdatadir)/ui
 icon_dir = $(pkgdatadir)/icons
 extensions_ui_dir = $(pkgdatadir)/ui
 extensions_dir = $(pkglibdir)/extensions
+applications_dir = $(datadir)/applications
 endif
 
 gthumb_CFLAGS =							\
@@ -308,6 +310,7 @@ gthumb_CFLAGS =							\
 	-DGTHUMB_ICON_DIR=\"$(icon_dir)\"			\
 	-DGTHUMB_EXTENSIONS_UI_DIR=\"$(extensions_ui_dir)\"	\
 	-DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\"		\
+	-DGTHUMB_APPLICATIONS_DIR=\"$(applications_dir)\"	\
 	$(NULL)
 
 gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS)
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index c8af515..0f0dbe5 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -223,10 +223,10 @@ gth_main_initialize (void)
 	Main = (GthMain*) g_object_new (GTH_TYPE_MAIN, NULL);
 
 #ifdef GDK_WINDOWING_X11
-	egg_set_desktop_file (GTHUMB_DATADIR "/applications/gthumb.desktop");
+	egg_set_desktop_file (GTHUMB_APPLICATIONS_DIR "/gthumb.desktop");
 #else
 	/* manually set name and icon */
-	g_set_application_name (_("gthumb"));
+	g_set_application_name (_("gThumb"));
 	gtk_window_set_default_icon_name ("gthumb");
 #endif