soylent r187 - in trunk: . src

[treitter svn gnome org]

Author: treitter
Date: Sun Jun 29 18:50:35 2008
New Revision: 187
URL: http://svn.gnome.org/viewvc/soylent?rev=187&view=rev

Log:
fix the installation path of the glade file for releases (pointed out by Florian)

Modified:
   trunk/configure.ac
   trunk/src/soylent-browser.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jun 29 18:50:35 2008
@@ -140,13 +140,13 @@
 dnl AC_SUBST(GETTEXT_PACKAGE)
 dnl AM_GLIB_GNU_GETTEXT
 
-privdatadir='${datadir}'/soylent/$SOYLENT_MAJOR_MINOR
+privdatadir='${datadir}'/soylent
 AC_SUBST(privdatadir)
 
 SOYLENT_GLADEDIR_UNINSTALLED='$(abs_top_srcdir)'/data
 AC_SUBST(SOYLENT_GLADEDIR_UNINSTALLED)
 
-SOYLENT_GLADEDIR="$privdatadir/data"
+SOYLENT_GLADEDIR="$privdatadir"
 AC_SUBST(SOYLENT_GLADEDIR)
 
 dnl this is a workaround for automake 1.9 not quoting this by standard

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Sun Jun 29 18:50:35 2008
@@ -88,15 +88,14 @@
     {
       view_mode = SB_PEOPLE_VIEW_MODE_BROWSE;
 
-      /* Try to load the local glade file first */
+      /* Try to load the local glade file first for development builds */
+#ifdef BUILD_DEV
       browser->main_window = glade_xml_new (SOYLENT_GLADE_FILE_UNINSTALLED,
                                             NULL, NULL);
       if (!browser->main_window)
-        {
+#endif /* BUILD_DEV */
           browser->main_window = glade_xml_new (SOYLENT_GLADE_FILE_INSTALLED,
                                                 NULL, NULL);
-        }
-
       if (browser->main_window)
         {
           GtkIconTheme *gtk_icon_theme = NULL;