1.1 --- a/gmyth/src/gmyth_livetv.c	Wed Feb 14 22:26:33 2007 +0000
     1.2 +++ b/gmyth/src/gmyth_livetv.c	Wed Feb 14 23:06:17 2007 +0000
     1.3 @@ -408,7 +408,7 @@
     1.4  	
     1.5  		} /* if - changes the channel number */
     1.6  		
     1.7 -    sleep (4);                  /* FIXME: this is evil (tpm) */
     1.8 +    sleep (6);                  /* FIXME: this is evil (tpm) */
     1.9    }
    1.10    
    1.11    /* DEBUG message */  

     2.1 --- a/gmyth/src/gmyth_monitor_handler.c	Wed Feb 14 22:26:33 2007 +0000
     2.2 +++ b/gmyth/src/gmyth_monitor_handler.c	Wed Feb 14 23:06:17 2007 +0000
     2.3 @@ -70,22 +70,11 @@
     2.4  #define GMYTHTV_ENABLE_DEBUG				1
     2.5  #endif
     2.6  
     2.7 -//GThread *monitor_th = NULL;
     2.8 -
     2.9 -//static gboolean* myth_control_sock_listener( GIOChannel *io_channel );
    2.10  gboolean gmyth_monitor_handler_listener( GIOChannel *io_channel, 
    2.11  						GIOCondition io_cond, gpointer data );
    2.12  
    2.13 -//gboolean* gmyth_monitor_handler_listener( GMythMonitorHandler *monitor );
    2.14 -
    2.15 -//void gmyth_monitor_handler_listener( GMythMonitorHandler *monitor, gpointer user_data );
    2.16 -
    2.17  static void gmyth_monitor_handler_default_listener( GMythMonitorHandler *monitor, gint msg_code, gchar* message );
    2.18  
    2.19 -/* static GStaticMutex			mutex 					 = G_STATIC_MUTEX_INIT; */
    2.20 -
    2.21 -//static GCond*					io_watcher_cond  = NULL;
    2.22 -
    2.23  static void gmyth_monitor_handler_class_init          (GMythMonitorHandlerClass *klass);
    2.24  static void gmyth_monitor_handler_init                (GMythMonitorHandler *object);
    2.25  
    2.26 @@ -499,7 +488,6 @@
    2.27    } /* main GThread while */
    2.28    
    2.29    if ( io_status == G_IO_STATUS_ERROR ) {
    2.30 -    //gmyth_debug ("[%s] Error reading: %s\n", __FUNCTION__, error != NULL ? error->message : "" );
    2.31      gmyth_debug ("Error reading MONITOR event socket.\n");
    2.32     	*ret = FALSE;
    2.33     	goto clean_up;   	

     3.1 --- a/gmyth/src/gmyth_uri.c	Wed Feb 14 22:26:33 2007 +0000
     3.2 +++ b/gmyth/src/gmyth_uri.c	Wed Feb 14 23:06:17 2007 +0000
     3.3 @@ -311,17 +311,17 @@
     3.4  	}
     3.5  	
     3.6  	gmyth_debug( "uri value:  %s", value );
     3.7 -	uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_E_DELIM ) );
     3.8 +	uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_QUESTION_DELIM ) );
     3.9  	
    3.10 -	eIdx = gmyth_strstr( value+currIdx, GMYTH_URI_E_DELIM );
    3.11 +	eIdx = gmyth_strstr( value+currIdx, GMYTH_URI_QUESTION_DELIM );
    3.12  	
    3.13  	if ( 0 < eIdx ) {
    3.14 -		uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_E_DELIM ) );
    3.15 +		uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_QUESTION_DELIM ) );
    3.16  		gmyth_debug( "query = %s", uri->query->str );
    3.17  	}
    3.18  	
    3.19  	/**** Path (Query/Fragment) ****/
    3.20 -	sharpIdx = gmyth_strstr(value+currIdx, GMYTH_URI_SHARP_DELIM);
    3.21 +	sharpIdx = gmyth_strstr(value+currIdx, GMYTH_URI_E_DELIM);
    3.22  	if (0 < sharpIdx) {
    3.23  		uri->path = g_string_append_len( uri->path, value+currIdx, sharpIdx);
    3.24  		uri->fragment = g_string_new_len (value+currIdx+sharpIdx+1, uriLen-(currIdx+sharpIdx+1));
    3.25 @@ -348,7 +348,8 @@
    3.26  	
    3.27  	g_return_val_if_fail( uri != NULL && uri->uri != NULL && uri->uri->str != NULL, FALSE );
    3.28  	
    3.29 -	ret = ( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "/?" ) != NULL );
    3.30 +	ret = ( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "/?" ) != NULL ) ||
    3.31 +				( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "livetv" ) != NULL );
    3.32  	
    3.33  	if ( ret )
    3.34  		gmyth_debug( "This URI is a LiveTV recording..." );