# HG changeset patch # User renatofilho # Date 1179356123 -3600 # Node ID 1d488185037f99eea80285b1c9b832cb3ee8a799 # Parent 6c0f6e4bd591b33825e3950cebd038ebe03d4ec9 [svn r687] removed some debug messages diff -r 6c0f6e4bd591 -r 1d488185037f gmyth/src/gmyth_livetv.c --- a/gmyth/src/gmyth_livetv.c Wed May 16 23:53:36 2007 +0100 +++ b/gmyth/src/gmyth_livetv.c Wed May 16 23:55:23 2007 +0100 @@ -90,6 +90,7 @@ { GMythLiveTV *livetv = GMYTH_LIVETV (object); + if (livetv->disposed) { /* If dispose did already run, return. */ @@ -111,6 +112,7 @@ livetv->file = NULL; } + if (livetv->recorder != NULL) { //gmyth_recorder_close(livetv->recorder); @@ -130,6 +132,7 @@ livetv->tvchain = NULL; } + if (livetv->proginfo != NULL) { g_object_unref (livetv->proginfo); @@ -142,6 +145,7 @@ livetv->backend_info = NULL; } + if (livetv->uri != NULL) { g_object_unref (livetv->uri); @@ -154,6 +158,7 @@ livetv->mutex = NULL; } + if (livetv->local_hostname != NULL) { g_string_free (livetv->local_hostname, TRUE); @@ -648,12 +653,18 @@ return res; error: + g_mutex_unlock (livetv->mutex); + gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__); res = FALSE; - if (livetv->local_hostname != NULL) + if (livetv->local_hostname != NULL) { g_string_free (livetv->local_hostname, TRUE); + livetv->local_hostname = NULL; + } + + gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__); if (livetv->recorder != NULL) { @@ -661,24 +672,33 @@ livetv->recorder = NULL; } + gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__); + if (livetv->tvchain != NULL) { g_object_unref (livetv->tvchain); livetv->tvchain = NULL; } + gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__); + if (livetv->proginfo != NULL) { g_object_unref (livetv->proginfo); livetv->proginfo = NULL; } + gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__); + if (livetv->monitor != NULL) { g_object_unref (livetv->monitor); livetv->monitor = NULL; } + + gmyth_debug ("[%s] ERROR running LiveTV setup.\n", __FUNCTION__); + return res; } diff -r 6c0f6e4bd591 -r 1d488185037f gmyth/src/gmyth_socket.c --- a/gmyth/src/gmyth_socket.c Wed May 16 23:53:36 2007 +0100 +++ b/gmyth/src/gmyth_socket.c Wed May 16 23:55:23 2007 +0100 @@ -247,8 +247,8 @@ gint res = gethostname (hname, 50); if (res == -1) { - gmyth_debug ("Error while getting hostname"); - return g_string_new ("default"); + gmyth_debug ("Error while getting hostname"); + return g_string_new ("default"); } return g_string_new (hname);