do not hardcode the psensor desktop file name.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1dd2d52..5057822 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ endif
 AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -DDATADIR=\""$(datadir)"\"\
+       -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/unity \
        $(GTK_CFLAGS)\

diff --git a/src/Makefile.in b/src/Makefile.in
index 55d5eab..2cdacc7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -355,11 +355,13 @@ AM_LDFLAGS = -Wl,--as-needed -export-dynamic
 # -no-deprecated-declarations to avoid some glib deprecation warnings
 AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
-       -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/unity $(GTK_CFLAGS) $(SENSORS_CFLAGS) \
-       $(am__append_2) $(am__append_6) $(am__append_9) \
-       $(am__append_10) $(am__append_12) $(am__append_14) \
-       $(am__append_17) $(am__append_21)
+       -DDATADIR=\""$(datadir)"\" \
+       -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\" \
+       -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \
+       $(GTK_CFLAGS) $(SENSORS_CFLAGS) $(am__append_2) \
+       $(am__append_6) $(am__append_9) $(am__append_10) \
+       $(am__append_12) $(am__append_14) $(am__append_17) \
+       $(am__append_21)
 @GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
 psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \
        graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \

diff --git a/src/pxdg.c b/src/pxdg.c
index aa61e03..6ef9d28 100644 (file)
--- a/src/pxdg.c
+++ b/src/pxdg.c
@@ -46,7 +46,7 @@ static char *get_user_desktop_file()
        char *dir, *path;
 
        dir = get_user_autostart_dir();
-       path = path_append(dir, "psensor.desktop");
+       path = path_append(dir, PSENSOR_DESKTOP_FILE);
 
        free(dir);
 
@@ -55,7 +55,7 @@ static char *get_user_desktop_file()
 
 static const char *get_desktop_file()
 {
-       return DATADIR"/applications/psensor.desktop";
+       return DATADIR"/applications/"PSENSOR_DESKTOP_FILE;
 }
 
 static int is_file_exists(const char *path)

diff --git a/src/ui_unity.c b/src/ui_unity.c
index a8f8b20..2c00403 100644 (file)
--- a/src/ui_unity.c
+++ b/src/ui_unity.c
@@ -33,7 +33,7 @@ void ui_unity_launcher_entry_update(struct psensor **sensors,
 
        if (!initialized) {
                psensor_entry = unity_launcher_entry_get_for_desktop_file
-                       ("psensor.desktop");
+                       (PSENSOR_DESKTOP_FILE);
 
                unity_launcher_entry_set_count(psensor_entry, 0);
                initialized = 1;