1.1 --- a/gmyth/src/gmyth_file_transfer.c	Fri Mar 23 15:14:43 2007 +0000
     1.2 +++ b/gmyth/src/gmyth_file_transfer.c	Fri Mar 23 15:26:38 2007 +0000
     1.3 @@ -89,7 +89,6 @@
     1.4  #define GMYTH_FILE_TRANSFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GMYTH_FILE_TRANSFER_TYPE, GMythFileTransferPrivate))
     1.5  
     1.6  struct _GMythFileTransferPrivate {
     1.7 -	
     1.8  	GMythRecorder *recorder;
     1.9  	
    1.10  	gboolean do_next_program_chain;
    1.11 @@ -183,11 +182,6 @@
    1.12      /* Make sure dispose does not run twice. */
    1.13      transfer->priv->disposed = TRUE;
    1.14      
    1.15 -  if ( transfer->priv->livetv != NULL ) {
    1.16 -  	g_object_unref( transfer->priv->livetv );
    1.17 -  	transfer->priv->livetv = NULL;
    1.18 -  }
    1.19 -  
    1.20    if ( transfer->mutex != NULL ) {
    1.21    	g_mutex_free( transfer->mutex );
    1.22    	transfer->mutex = NULL;
    1.23 @@ -815,15 +809,9 @@
    1.24  	
    1.25  	transfer->priv = GMYTH_FILE_TRANSFER_GET_PRIVATE(transfer);	
    1.26      
    1.27 -    // FIXME: add g_object_ref to livetv because is being deallocated
    1.28 -    if (transfer->priv->livetv != NULL) {
    1.29 -        g_object_unref (transfer->priv->livetv);
    1.30 -    }
    1.31 -    
    1.32  	g_object_ref(recorder);
    1.33  	
    1.34  	transfer->priv->recorder = recorder;
    1.35 -    g_object_ref (transfer->priv->livetv);
    1.36  
    1.37  	transfer->priv->do_next_program_chain = TRUE;
    1.38  }

     2.1 --- a/gmyth/src/gmyth_file_transfer.h	Fri Mar 23 15:14:43 2007 +0000
     2.2 +++ b/gmyth/src/gmyth_file_transfer.h	Fri Mar 23 15:26:38 2007 +0000
     2.3 @@ -76,8 +76,8 @@
     2.4  	GObject 				parent;
     2.5  	
     2.6  	/* Myth URI structure */
     2.7 -	gchar 					*filename;
     2.8 -	GMythBackendInfo *backend_info;
     2.9 +	gchar                   *filename;
    2.10 +	GMythBackendInfo        *backend_info;
    2.11  	
    2.12  	/* MythTV version number */	
    2.13  	gint 					mythtv_version;

     3.1 --- a/gmyth/src/gmyth_jobqueue.c	Fri Mar 23 15:14:43 2007 +0000
     3.2 +++ b/gmyth/src/gmyth_jobqueue.c	Fri Mar 23 15:26:38 2007 +0000
     3.3 @@ -128,7 +128,7 @@
     3.4  
     3.5      if (socket != NULL) {
     3.6          GString* options = g_string_new ("");
     3.7 -        gchar* ret;
     3.8 +        gchar* ret = NULL;
     3.9  
    3.10          if (g_ascii_strcasecmp(job, "JOB_TRANSCODE") == 0)
    3.11          {
    3.12 @@ -145,7 +145,7 @@
    3.13          ret = send_command(socket, "ADD", job, transcode->chanid,
    3.14                                      transcode->starttime, options->str);
    3.15          res = test_result(ret, "JOBQUEUE_OK");
    3.16 -	gmyth_socket_close_connection (socket);
    3.17 +        gmyth_socket_close_connection (socket);
    3.18  
    3.19          g_object_unref (socket);
    3.20  

     4.1 --- a/gmyth/src/gmyth_monitor_handler.c	Fri Mar 23 15:14:43 2007 +0000
     4.2 +++ b/gmyth/src/gmyth_monitor_handler.c	Fri Mar 23 15:26:38 2007 +0000
     4.3 @@ -422,23 +422,18 @@
     4.4  gmyth_monitor_handler_listener( GIOChannel *io_channel, GIOCondition io_cond, gpointer data )
     4.5  {
     4.6  	GMythMonitorHandler *monitor = (GMythMonitorHandler*)data; 
     4.7 -  GIOStatus io_status;
     4.8 -  //GIOCondition io_cond;  
     4.9    guint recv = 0;
    4.10 -  gboolean *ret = g_new0( gboolean, 1 );
    4.11 -  *ret = TRUE;
    4.12 -  //gboolean ret = TRUE;
    4.13 +  gboolean ret = TRUE;
    4.14    gsize len = 0;
    4.15    
    4.16    static guint count = 0;
    4.17  
    4.18    myth_control_acquire_context ( monitor, TRUE );
    4.19    
    4.20 -  if ( ( io_cond & G_IO_HUP ) != 0 )
    4.21 -  {
    4.22 -  	*ret = FALSE;
    4.23 +  if ( ( io_cond & G_IO_HUP ) != 0 ) {
    4.24 +  	ret = FALSE;
    4.25    	goto clean_up;
    4.26 -	}
    4.27 +  }
    4.28    
    4.29    //GIOChannel *io_channel = monitor->event_sock->sd_io_ch;
    4.30    //GIOCondition condition = g_io_channel_get_buffer_condition( io_channel );
    4.31 @@ -447,7 +442,7 @@
    4.32    
    4.33    if ( NULL == io_channel ) {
    4.34    	gmyth_debug ("Monitor socket is NULL! (GIOChannel)");
    4.35 -  	*ret = FALSE;
    4.36 +  	ret = FALSE;
    4.37    	goto clean_up;
    4.38    }
    4.39      
    4.40 @@ -511,16 +506,10 @@
    4.41  
    4.42    } /* main GThread while */
    4.43    
    4.44 -  if ( io_status == G_IO_STATUS_ERROR ) {
    4.45 -    gmyth_debug ("Error reading MONITOR event socket.\n");
    4.46 -   	*ret = FALSE;
    4.47 -   	goto clean_up;   	
    4.48 -  }
    4.49 -  
    4.50  clean_up:
    4.51    myth_control_release_context (monitor);
    4.52    	
    4.53 - 	return *ret;
    4.54 + 	return ret;
    4.55  
    4.56  }
    4.57  

     5.1 --- a/gmyth/src/gmyth_socket.c	Fri Mar 23 15:14:43 2007 +0000
     5.2 +++ b/gmyth/src/gmyth_socket.c	Fri Mar 23 15:26:38 2007 +0000
     5.3 @@ -1099,7 +1099,7 @@
     5.4  gmyth_socket_read_stringlist (GMythSocket *gmyth_socket, GMythStringList* str_list)
     5.5  {
     5.6      GString *response;
     5.7 -    gchar **str_array;
     5.8 +    gchar **str_array = NULL;
     5.9      gint i;
    5.10  
    5.11      response = gmyth_socket_receive_response(gmyth_socket);

     6.1 --- a/gmyth/src/gmyth_uri.c	Fri Mar 23 15:14:43 2007 +0000
     6.2 +++ b/gmyth/src/gmyth_uri.c	Fri Mar 23 15:26:38 2007 +0000
     6.3 @@ -45,12 +45,12 @@
     6.4  static void gmyth_uri_dispose  (GObject *object);
     6.5  static void gmyth_uri_finalize (GObject *object);
     6.6  
     6.7 +static void gmyth_uri_parser_setup_and_new(GMythURI *uri, const gchar *value);
     6.8 +static gchar* gmyth_uri_print_field(const GString* field);
     6.9 +
    6.10  G_DEFINE_TYPE(GMythURI, gmyth_uri, G_TYPE_OBJECT)
    6.11  
    6.12  static void
    6.13 -gmyth_uri_parser_setup_and_new( GMythURI *uri, const gchar *value );
    6.14 -    
    6.15 -static void
    6.16  gmyth_uri_class_init (GMythURIClass *klass)
    6.17  {
    6.18  	GObjectClass *gobject_class;