1.1 --- a/gmyth/src/gmyth_file_transfer.c	Fri May 18 01:34:31 2007 +0100
     1.2 +++ b/gmyth/src/gmyth_file_transfer.c	Fri May 18 16:16:30 2007 +0100
     1.3 @@ -833,11 +833,14 @@
     1.4                                         gmyth_file_get_file_name (GMYTH_FILE
     1.5                                                                   (transfer))) !=
     1.6                  0)
     1.7 +		
     1.8 +		_control_release_context (transfer);
     1.9                  ret =
    1.10                      gmyth_file_transfer_open (transfer,
    1.11                                                g_strrstr (prog_info->pathname->
    1.12                                                           str, "/"));
    1.13 -
    1.14 +		_control_acquire_context (transfer, TRUE);
    1.15 + 
    1.16              if (prog_info != NULL)
    1.17                  g_object_unref (prog_info);
    1.18  
    1.19 @@ -848,7 +851,7 @@
    1.20                               gmyth_file_get_file_name (GMYTH_FILE (transfer)));
    1.21          }
    1.22  
    1.23 -    }                           /* if */
    1.24 +    } /* if */
    1.25  
    1.26    error:
    1.27  

     2.1 --- a/gmyth/src/gmyth_monitor_handler.c	Fri May 18 01:34:31 2007 +0100
     2.2 +++ b/gmyth/src/gmyth_monitor_handler.c	Fri May 18 16:16:30 2007 +0100
     2.3 @@ -376,9 +376,7 @@
     2.4                                       strlen (*back_msg_action),
     2.5                                       "SCHEDULE_CHANGE")
     2.6                      || g_strstr_len (*back_msg_action,
     2.7 -                                     strlen (*back_msg_action), "LIVETV_WATCH")
     2.8 -                  || g_strstr_len (*back_msg_action,
     2.9 -                                     strlen (*back_msg_action), "SIGNAL"))
    2.10 +                                     strlen (*back_msg_action), "LIVETV_WATCH"))
    2.11                  {
    2.12                      gmyth_debug
    2.13                          ("MONITOR: message type == GMYTH_BACKEND_PROGRAM_INFO_CHANGED, msg = %s",
    2.14 @@ -522,7 +520,7 @@
    2.15                                                                    strlist,
    2.16                                                                    &back_msg_action);
    2.17  
    2.18 -                    if (monitor != NULL)
    2.19 +                    if (monitor != NULL && msg_type != GMYTH_BACKEND_NO_MESSAGE)
    2.20                          g_signal_emit (monitor, GMYTH_MONITOR_HANDLER_GET_CLASS (monitor)->backend_events_handler_signal_id, 0, /* details */
    2.21                                         msg_type, back_msg_action);
    2.22  
    2.23 @@ -541,7 +539,7 @@
    2.24  
    2.25              io_cond = g_io_channel_get_buffer_condition (io_channel);
    2.26  
    2.27 -	    g_usleep( 5000 );
    2.28 +	    g_usleep( 500 );
    2.29  
    2.30          }
    2.31          while (recv <= 0 && ((io_cond & G_IO_HUP) == 0));