[gnome-system-monitor] Added autotools changes to properly install preferences.ui

[Chris KÃhl <chriskuehl src gnome org>]

commit e1d08de31cac584084feb1942fe4ae9f2fca478a
Author: Chris KÃhl <chrisk openismus com>
Date:   Sat Jan 28 01:55:13 2012 +0100

    Added autotools changes to properly install preferences.ui
    
    https://bugzilla.gnome.org/show_bug.cgi?id=663736

 Makefile.am         |    4 ++++
 po/POTFILES.in      |    1 +
 src/Makefile.am     |    2 ++
 src/procdialogs.cpp |    4 +++-
 4 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 09be157..d0b1e7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = pixmaps po src help
 
+uidir = $(pkgdatadir)
+ui_DATA = data/preferences.ui
+
 EXTRA_DIST = \
+	$(ui_DATA) \
 	gnome-doc-utils.make \
 	gnome-system-monitor.desktop.in \
 	gnome-system-monitor.doap \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 912d9c9..35154c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 gnome-system-monitor.desktop.in.in
+data/preferences.ui
 src/argv.cpp
 src/argv.h
 src/callbacks.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 50c9f02..da92fb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,6 +51,8 @@ gnome_system_monitor_SOURCES = \
 
 gnome_system_monitor_LDADD = @PROCMAN_LIBS@ @SYSTEMD_LIBS@ libbacon.la
 
+gnome_system_monitor_CPPFLAGS = -DGSM_DATA_DIR=\""$(pkgdatadir)"\"
+
 noinst_LTLIBRARIES = libbacon.la
 libbacon_la_SOURCES = \
 	bacon-message-connection.c \
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index 56b4cc3..2618acd 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -492,8 +492,10 @@ procdialog_create_preferences_dialog (ProcData *procdata)
     if (prefs_dialog)
         return;
 
+    gchar* filename = g_build_filename (GSM_DATA_DIR, "preferences.ui", NULL);
+
     builder = gtk_builder_new();
-    gtk_builder_add_from_file (builder, "preferences.ui", NULL);
+    gtk_builder_add_from_file (builder, filename, NULL);
 
     prefs_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "preferences_dialog"));