Commit fa1ccdcb authored by Paolo Bacchilega's avatar Paolo Bacchilega
Browse files

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

parent 77758fa4
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment