[svn r454] Removes the g_main_context_acquire_context. trunk
authorrosfran
Mon Mar 26 16:07:21 2007 +0100 (2007-03-26)
branchtrunk
changeset 449916bec80b82c
parent 448 1eff6a1f7263
child 450 b0ce3c9fe7c5
[svn r454] Removes the g_main_context_acquire_context.
gmyth/src/gmyth_monitor_handler.c
     1.1 --- a/gmyth/src/gmyth_monitor_handler.c	Mon Mar 26 16:04:46 2007 +0100
     1.2 +++ b/gmyth/src/gmyth_monitor_handler.c	Mon Mar 26 16:07:21 2007 +0100
     1.3 @@ -146,17 +146,17 @@
     1.4  {
     1.5  	GMythMonitorHandler *monitor = GMYTH_MONITOR_HANDLER (object);
     1.6  	GSource* source = NULL;
     1.7 -	GMainContext* context = g_main_context_default();
     1.8 +	//GMainContext* context = g_main_context_default();
     1.9    
    1.10    gmyth_monitor_handler_close(monitor);
    1.11  
    1.12  	monitor->allow_msgs_listener = FALSE;
    1.13  
    1.14 -	if ( context != NULL && monitor->sid_io_watch != -1 )
    1.15 +	if ( monitor->sid_io_watch != -1 )
    1.16  	{
    1.17 -		g_main_context_acquire( context );
    1.18 +		//g_main_context_acquire( context );
    1.19  		
    1.20 -		source = g_main_context_find_source_by_id( context, 
    1.21 +		source = g_main_context_find_source_by_id( NULL, 
    1.22  						monitor->sid_io_watch );
    1.23  		
    1.24  		if ( source != NULL )
    1.25 @@ -164,7 +164,7 @@
    1.26  			g_source_destroy( source );
    1.27  		}
    1.28  		
    1.29 -		g_main_context_release( context );
    1.30 +		//g_main_context_release( context );
    1.31  		
    1.32  	}
    1.33  
    1.34 @@ -561,6 +561,8 @@
    1.35    if ( channel != NULL ) {
    1.36    	
    1.37    	monitor->allow_msgs_listener = TRUE;
    1.38 +    
    1.39 +    monitor->sid_io_watch = -1;
    1.40    	
    1.41      monitor->sid_io_watch = g_io_add_watch( channel, G_IO_IN | G_IO_HUP, 
    1.42      					(GIOFunc)gmyth_monitor_handler_listener, monitor );