1.1 --- a/gmyth/src/gmyth_epg.c	Thu May 03 16:07:36 2007 +0100
     1.2 +++ b/gmyth/src/gmyth_epg.c	Thu May 03 16:07:54 2007 +0100
     1.3 @@ -136,7 +136,7 @@
     1.4      g_return_val_if_fail (gmyth_epg != NULL, FALSE);
     1.5  
     1.6      if (gmyth_epg->sqlquery != NULL) {	
     1.7 -        gmyth_query_disconnect (gmyth_epg);
     1.8 +        gmyth_query_disconnect (gmyth_epg->sqlquery);
     1.9          g_object_unref (gmyth_epg->sqlquery);
    1.10          gmyth_epg->sqlquery = NULL;
    1.11      }
    1.12 @@ -199,7 +199,7 @@
    1.13      MYSQL_RES *msql_res;
    1.14      gchar* query_str;
    1.15  
    1.16 -    g_return_val_if_fail (gmyth_epg != NULL, -1);
    1.17 +    g_return_val_if_fail (gmyth_epg != NULL, NULL);
    1.18  
    1.19      query_str = g_strdup_printf ("SELECT channum, name, icon FROM channel WHERE chanid=%d;", channel_id);
    1.20      msql_res = gmyth_query_process_statement (gmyth_epg->sqlquery, query_str);