1.1 --- a/gmyth/src/gmyth_epg.c	Tue Oct 17 01:03:06 2006 +0100
     1.2 +++ b/gmyth/src/gmyth_epg.c	Wed Oct 18 20:38:47 2006 +0100
     1.3 @@ -100,8 +100,8 @@
     1.4  	assert(gmyth_epg);
     1.5  
     1.6  	if (gmyth_epg->sqlquery	== NULL) {
     1.7 -		g_warning ("[%s] GMythEPG not initialized", __FUNCTION__);
     1.8 -		return FALSE;
     1.9 +		g_warning ("[%s] GMythEPG db initializing", __FUNCTION__);
    1.10 +	    gmyth_epg->sqlquery = gmyth_query_new ();		
    1.11  	}
    1.12  
    1.13      if (!gmyth_query_connect(gmyth_epg->sqlquery)) {
    1.14 @@ -124,6 +124,7 @@
    1.15  
    1.16  	if (gmyth_epg->sqlquery	!= NULL) {	
    1.17  		g_object_unref (gmyth_epg->sqlquery);
    1.18 +        gmyth_epg->sqlquery = NULL;
    1.19  	}
    1.20  	
    1.21  	return TRUE;

     2.1 --- a/gmyth/src/gmyth_scheduler.c	Tue Oct 17 01:03:06 2006 +0100
     2.2 +++ b/gmyth/src/gmyth_scheduler.c	Wed Oct 18 20:38:47 2006 +0100
     2.3 @@ -133,9 +133,9 @@
     2.4      assert(scheduler);
     2.5  
     2.6      if (scheduler->msqlquery == NULL) {
     2.7 -        g_warning ("[%s] MMythScheduler not initialized", __FUNCTION__);
     2.8 -        return FALSE;
     2.9 -    }
    2.10 +        g_warning ("[%s] GMythScheduler db initializing", __FUNCTION__);
    2.11 +	    scheduler->msqlquery = gmyth_query_new ();		
    2.12 +	}
    2.13  
    2.14      if (!gmyth_query_connect(scheduler->msqlquery)) {
    2.15      	g_warning ("[%s] Error while connecting to db", __FUNCTION__);

     3.1 --- a/gmyth/src/gmyth_settings.h	Tue Oct 17 01:03:06 2006 +0100
     3.2 +++ b/gmyth/src/gmyth_settings.h	Wed Oct 18 20:38:47 2006 +0100
     3.3 @@ -34,13 +34,6 @@
     3.4  
     3.5  #include <glib-object.h>
     3.6  
     3.7 -//#include <stdio.h>
     3.8 -//#include <stdlib.h>
     3.9 -//#include <string.h>
    3.10 -//#include <netdb.h>
    3.11 -//#include <sys/socket.h>
    3.12 -//#include <unistd.h>
    3.13 -
    3.14  G_BEGIN_DECLS
    3.15  
    3.16  #define GMYTH_SETTINGS_TYPE               (gmyth_settings_get_type ())
    3.17 @@ -82,21 +75,31 @@
    3.18  GType gmyth_settings_get_type (void);
    3.19  
    3.20  GMythSettings* gmyth_settings_new (void);
    3.21 -gboolean gmyth_settings_load_from_file (GMythSettings *gmyth_settings, GString *filename);
    3.22 +
    3.23 +gboolean gmyth_settings_load_from_file (GMythSettings *gmyth_settings, 
    3.24 +                                        GString *filename);
    3.25  gboolean gmyth_settings_load (GMythSettings *msettings);
    3.26  gboolean gmyth_settings_save (GMythSettings *gmyth_settings);
    3.27  
    3.28  GString* gmyth_settings_get_backend_hostname (GMythSettings *gmyth_settings);
    3.29 -void gmyth_settings_set_backend_hostname (GMythSettings *gmyth_settings, GString *new_hostname);
    3.30 +void     gmyth_settings_set_backend_hostname (GMythSettings *gmyth_settings, 
    3.31 +                                              GString *new_hostname);
    3.32 +
    3.33  GString* gmyth_settings_get_username (GMythSettings *gmyth_settings);
    3.34 -void gmyth_settings_set_username (GMythSettings *gmyth_settings, GString *new_username);
    3.35 +void     gmyth_settings_set_username (GMythSettings *gmyth_settings, 
    3.36 +                                      GString *new_username);
    3.37 +
    3.38  GString* gmyth_settings_get_password (GMythSettings *gmyth_settings);
    3.39 -void gmyth_settings_set_password (GMythSettings *gmyth_settings, GString *new_password);
    3.40 +void     gmyth_settings_set_password (GMythSettings *gmyth_settings, 
    3.41 +                                      GString *new_password);
    3.42 +
    3.43  GString* gmyth_settings_get_dbname (GMythSettings *gmyth_settings);
    3.44 -void gmyth_settings_set_dbname (GMythSettings *gmyth_settings, GString *new_dbname);
    3.45 -int gmyth_settings_get_backend_port (GMythSettings *gmyth_settings);
    3.46 -void gmyth_settings_set_backend_port (GMythSettings *gmyth_settings, gint new_port);
    3.47 +void     gmyth_settings_set_dbname (GMythSettings *gmyth_settings, 
    3.48 +                                    GString *new_dbname);
    3.49  
    3.50 +int      gmyth_settings_get_backend_port (GMythSettings *gmyth_settings);
    3.51 +void     gmyth_settings_set_backend_port (GMythSettings *gmyth_settings, 
    3.52 +                                          gint new_port);
    3.53  
    3.54  G_END_DECLS
    3.55