Install glade file.

Use installed glade file.

pmo-trunk-r26

diff --git a/ChangeLog b/ChangeLog
index e69de29..a9c99a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2006-05-10  Florian Boor <fb@kernelconcepts.de>
+
+       * Install glade file.
+       * Use installed glade file.

diff --git a/src/Makefile.am b/src/Makefile.am
index 897028f..95ae7bb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,8 @@ INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_GCONF_CFLAGS)\
        $(MODEST_GTK_CFLAGS)\
-       $(MODEST_TINYMAIL_CFLAGS)
+       $(MODEST_TINYMAIL_CFLAGS)\
+       -DPREFIX=\"@prefix@\"
 
 bin_PROGRAMS=\
        modest

diff --git a/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am
index 47af953..69351e3 100644 (file)
--- a/src/gtk-glade/Makefile.am
+++ b/src/gtk-glade/Makefile.am
@@ -10,7 +10,8 @@ INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
        $(MODEST_GTK_CFLAGS) \
        $(MODEST_GLADE_CFLAGS) \
-       $(MODEST_TINYMAIL_CFLAGS)
+       $(MODEST_TINYMAIL_CFLAGS)\
+       -DPREFIX=\"@prefix@\"
 
 noinst_LTLIBRARIES=\
        libmodest-ui.la
@@ -35,3 +36,6 @@ EXTRA_DIST=pixmaps/*.png modest.glade modest.gladep
 
 $(GLADE_SOURCE): $(GLADE_FILES)
        $(top_srcdir)/scripts/txt2doth $< > $@ 
+
+gladedir = $(prefix)/share/modest/glade
+glade_DATA = $(GLADE_FILES)

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index ef24b15..f0d1c2f 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -22,7 +22,7 @@
 
 //#include "modest.glade.h"
 
-#define MODEST_GLADE          "modest.glade"
+#define MODEST_GLADE          PREFIX "/share/modest/glade/modest.glade"
 #define MODEST_GLADE_MAIN_WIN "main"
 #define MODEST_GLADE_EDIT_WIN "new_mail"