# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1171386263 0
# Node ID d18df1e6b0282bc88fbb96c5359da653a58e117b
# Parent 5124df9bf343da79bf272ea8f05bfaf44025a00b
Select the correct defaults for new installations.
diff -r d18df1e6b0282bc88fbb96c5359da653a58e117b -r
5124df9bf343da79bf272ea8f05bfaf44025a00b src/engine.c
--- a/src/engine.c Tue Feb 13 17:04:23 2007 +0000
+++ b/src/engine.c Fri Feb 09 17:14:25 2007 +0000
@@ -28,6 +28,7 @@
#include <pthread.h>
#include <stdarg.h>
#include <errno.h>
+#include <unistd.h>
#include <glib/gthread.h>
@@ -417,6 +418,7 @@ void engine_init (void)
xine = xine_new ();
cfgfilename = get_config_filename (FILE_CONFIG);
+ have_config = !access (cfgfilename, R_OK); /* upgrade or install? */
xine_config_load (xine, cfgfilename);
free (cfgfilename);
xine_engine_set_param (xine, XINE_ENGINE_PARAM_VERBOSITY, verbosity);
diff -r d18df1e6b0282bc88fbb96c5359da653a58e117b -r
5124df9bf343da79bf272ea8f05bfaf44025a00b src/globals.h
--- a/src/globals.h Tue Feb 13 17:04:23 2007 +0000
+++ b/src/globals.h Fri Feb 09 17:14:25 2007 +0000
@@ -47,9 +47,10 @@ typedef enum {
CONFIG_VERSION_CURRENT = CONFIG_VERSION_0_6_0
} config_version_t;
+extern gboolean have_config;
extern int config_version;
#define CONFIG_VERSION_ATLEAST(EPOCH, MAJOR, MINOR) \
- (config_version >= CONFIG_VERSION_##EPOCH##_##MAJOR##_##MINOR)
+ (!have_config || config_version >=
CONFIG_VERSION_##EPOCH##_##MAJOR##_##MINOR)
extern GtkWidget *app;
extern GtkWidget *gtv; /* GtkVideo widget */
diff -r d18df1e6b0282bc88fbb96c5359da653a58e117b -r
5124df9bf343da79bf272ea8f05bfaf44025a00b src/ui.c
--- a/src/ui.c Tue Feb 13 17:04:23 2007 +0000
+++ b/src/ui.c Fri Feb 09 17:14:25 2007 +0000
@@ -43,6 +43,7 @@
* UI button & adjustment handling
*/
+gboolean have_config = FALSE;
int config_version = 0;
gboolean no_recursion = FALSE;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
