soylent r120 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Sat Apr  5 05:56:28 2008
New Revision: 120
URL: http://svn.gnome.org/viewvc/soylent?rev=120&view=rev

Log:
always attempt to load local Glade file first

Modified:
   trunk/src/soylent-browser.c

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Sat Apr  5 05:56:28 2008
@@ -31,9 +31,10 @@
 #include "soylent-person.h"
 #include "soylent-utils.h"
 
+
 #define SOYLENT_GLADE_FILE_UNINSTALLED \
                                     SOYLENT_GLADEDIR_UNINSTALLED"/soylent.glade"
-#define SOYLENT_GLADE_FILE SOYLENT_GLADEDIR"/soylent.glade"
+#define SOYLENT_GLADE_FILE_INSTALLED SOYLENT_GLADEDIR"/soylent.glade"
 
 /* TODO: make this a full-fledged GObject */
 struct SoylentBrowser_tag
@@ -92,16 +93,13 @@
     {
       view_mode = SB_PEOPLE_VIEW_MODE_BROWSE;
 
-      /* In development builds, try to load the local glade file first */
-      if (BUILD_DEV)
-        {
-          browser->main_window = glade_xml_new (SOYLENT_GLADE_FILE_UNINSTALLED,
-                                                NULL, NULL);
-        }
-
+      /* Try to load the local glade file first */
+      browser->main_window = glade_xml_new (SOYLENT_GLADE_FILE_UNINSTALLED,
+                                            NULL, NULL);
       if (!browser->main_window)
         {
-          browser->main_window = glade_xml_new (SOYLENT_GLADE_FILE, NULL, NULL);
+          browser->main_window = glade_xml_new (SOYLENT_GLADE_FILE_INSTALLED,
+                                                NULL, NULL);
         }
 
       if (browser->main_window)