libgnomevfs2-mythtv/modules/mythtv-method.c
branchtrunk
changeset 335 aedcbbf818b7
parent 333 f9d778bb88a2
child 338 6d9f4e8468b3
     1.1 --- a/libgnomevfs2-mythtv/modules/mythtv-method.c	Wed Feb 07 20:38:39 2007 +0000
     1.2 +++ b/libgnomevfs2-mythtv/modules/mythtv-method.c	Thu Feb 08 14:30:36 2007 +0000
     1.3 @@ -349,7 +349,9 @@
     1.4  		
     1.5  			/* Gets the recorder num */
     1.6  			recorder = remote_request_next_free_recorder (socket, -1);
     1.7 -			gmyth_socket_close_connection (socket);
     1.8 +			
     1.9 +			if ( socket != NULL )
    1.10 +				g_object_unref (socket);
    1.11  		
    1.12  			if ( recorder == NULL ) {
    1.13  				g_print ("[%s] None remote encoder available", __FUNCTION__);
    1.14 @@ -417,7 +419,7 @@
    1.15  			
    1.16  				} /* if - changes the channel number */
    1.17  				
    1.18 -				//sleep( 1 );
    1.19 +				sleep( 1 );
    1.20  				
    1.21  		  }
    1.22  		  
    1.23 @@ -451,7 +453,7 @@
    1.24  	    	g_object_unref (tvchain);
    1.25  				
    1.26  	    if ( recorder != NULL )
    1.27 -	    	g_object_unref (recorder);
    1.28 +	    	gmyth_recorder_close (recorder);
    1.29  	    
    1.30  	    if ( prog_info != NULL )
    1.31  	    	g_object_unref( prog_info );
    1.32 @@ -470,21 +472,20 @@
    1.33  	    /* sets the Playback monitor connection */
    1.34  	    ret = gmyth_file_transfer_open ( file_transfer, gmyth_uri_get_path (gmyth_uri) );
    1.35  	    
    1.36 -	    file_info->name = g_strdup ( gnome_vfs_uri_get_path (uri) );
    1.37 +	    file_info->name = g_strdup ( gnome_vfs_uri_get_path (uri) );	    
    1.38  	        
    1.39  		
    1.40 -	  } /* if - LiveTV or not? */
    1.41 +	  } /* if - LiveTV or not? */	  
    1.42  	  
    1.43 -	  /*	  
    1.44      if (ret == FALSE) {
    1.45 -	    g_warning ("MythTV FileTransfer open error\n");
    1.46 +	    g_debug ("MythTV FileTransfer open error\n");
    1.47  	    return GNOME_VFS_ERROR_NOT_OPEN;
    1.48  	  }
    1.49 -	  */
    1.50 +	  
    1.51  		if ( ret == TRUE  && file_transfer != NULL ) {
    1.52      	file_info->size = gmyth_file_transfer_get_filesize (file_transfer);
    1.53  	    if ( file_transfer )
    1.54 -	    	g_object_unref (file_transfer);
    1.55 +	    	gmyth_file_transfer_close (file_transfer);
    1.56     	}
    1.57   	
    1.58      file_info->block_count = GNOME_VFS_FILE_INFO_FIELDS_BLOCK_COUNT;