# HG changeset patch
# User leo_sobral
# Date 1174663598 0
# Node ID d6603c86582f512357be82c192ea355fdc23a417
# Parent  4d883f3edcdd79fcb6d9016d81d590653d3000a8
[svn r449] warnings removed

diff -r 4d883f3edcdd -r d6603c86582f gmyth/src/gmyth_file_transfer.c
--- a/gmyth/src/gmyth_file_transfer.c	Fri Mar 23 15:14:43 2007 +0000
+++ b/gmyth/src/gmyth_file_transfer.c	Fri Mar 23 15:26:38 2007 +0000
@@ -89,7 +89,6 @@
 #define GMYTH_FILE_TRANSFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GMYTH_FILE_TRANSFER_TYPE, GMythFileTransferPrivate))
 
 struct _GMythFileTransferPrivate {
-	
 	GMythRecorder *recorder;
 	
 	gboolean do_next_program_chain;
@@ -183,11 +182,6 @@
     /* Make sure dispose does not run twice. */
     transfer->priv->disposed = TRUE;
     
-  if ( transfer->priv->livetv != NULL ) {
-  	g_object_unref( transfer->priv->livetv );
-  	transfer->priv->livetv = NULL;
-  }
-  
   if ( transfer->mutex != NULL ) {
   	g_mutex_free( transfer->mutex );
   	transfer->mutex = NULL;
@@ -815,15 +809,9 @@
 	
 	transfer->priv = GMYTH_FILE_TRANSFER_GET_PRIVATE(transfer);	
     
-    // FIXME: add g_object_ref to livetv because is being deallocated
-    if (transfer->priv->livetv != NULL) {
-        g_object_unref (transfer->priv->livetv);
-    }
-    
 	g_object_ref(recorder);
 	
 	transfer->priv->recorder = recorder;
-    g_object_ref (transfer->priv->livetv);
 
 	transfer->priv->do_next_program_chain = TRUE;
 }
diff -r 4d883f3edcdd -r d6603c86582f gmyth/src/gmyth_file_transfer.h
--- a/gmyth/src/gmyth_file_transfer.h	Fri Mar 23 15:14:43 2007 +0000
+++ b/gmyth/src/gmyth_file_transfer.h	Fri Mar 23 15:26:38 2007 +0000
@@ -76,8 +76,8 @@
 	GObject 				parent;
 	
 	/* Myth URI structure */
-	gchar 					*filename;
-	GMythBackendInfo *backend_info;
+	gchar                   *filename;
+	GMythBackendInfo        *backend_info;
 	
 	/* MythTV version number */	
 	gint 					mythtv_version;
diff -r 4d883f3edcdd -r d6603c86582f gmyth/src/gmyth_jobqueue.c
--- a/gmyth/src/gmyth_jobqueue.c	Fri Mar 23 15:14:43 2007 +0000
+++ b/gmyth/src/gmyth_jobqueue.c	Fri Mar 23 15:26:38 2007 +0000
@@ -128,7 +128,7 @@
 
     if (socket != NULL) {
         GString* options = g_string_new ("");
-        gchar* ret;
+        gchar* ret = NULL;
 
         if (g_ascii_strcasecmp(job, "JOB_TRANSCODE") == 0)
         {
@@ -145,7 +145,7 @@
         ret = send_command(socket, "ADD", job, transcode->chanid,
                                     transcode->starttime, options->str);
         res = test_result(ret, "JOBQUEUE_OK");
-	gmyth_socket_close_connection (socket);
+        gmyth_socket_close_connection (socket);
 
         g_object_unref (socket);
 
diff -r 4d883f3edcdd -r d6603c86582f gmyth/src/gmyth_monitor_handler.c
--- a/gmyth/src/gmyth_monitor_handler.c	Fri Mar 23 15:14:43 2007 +0000
+++ b/gmyth/src/gmyth_monitor_handler.c	Fri Mar 23 15:26:38 2007 +0000
@@ -422,23 +422,18 @@
 gmyth_monitor_handler_listener( GIOChannel *io_channel, GIOCondition io_cond, gpointer data )
 {
 	GMythMonitorHandler *monitor = (GMythMonitorHandler*)data; 
-  GIOStatus io_status;
-  //GIOCondition io_cond;  
   guint recv = 0;
-  gboolean *ret = g_new0( gboolean, 1 );
-  *ret = TRUE;
-  //gboolean ret = TRUE;
+  gboolean ret = TRUE;
   gsize len = 0;
   
   static guint count = 0;
 
   myth_control_acquire_context ( monitor, TRUE );
   
-  if ( ( io_cond & G_IO_HUP ) != 0 )
-  {
-  	*ret = FALSE;
+  if ( ( io_cond & G_IO_HUP ) != 0 ) {
+  	ret = FALSE;
   	goto clean_up;
-	}
+  }
   
   //GIOChannel *io_channel = monitor->event_sock->sd_io_ch;
   //GIOCondition condition = g_io_channel_get_buffer_condition( io_channel );
@@ -447,7 +442,7 @@
   
   if ( NULL == io_channel ) {
   	gmyth_debug ("Monitor socket is NULL! (GIOChannel)");
-  	*ret = FALSE;
+  	ret = FALSE;
   	goto clean_up;
   }
     
@@ -511,16 +506,10 @@
 
   } /* main GThread while */
   
-  if ( io_status == G_IO_STATUS_ERROR ) {
-    gmyth_debug ("Error reading MONITOR event socket.\n");
-   	*ret = FALSE;
-   	goto clean_up;   	
-  }
-  
 clean_up:
   myth_control_release_context (monitor);
   	
- 	return *ret;
+ 	return ret;
 
 }
 
diff -r 4d883f3edcdd -r d6603c86582f gmyth/src/gmyth_socket.c
--- a/gmyth/src/gmyth_socket.c	Fri Mar 23 15:14:43 2007 +0000
+++ b/gmyth/src/gmyth_socket.c	Fri Mar 23 15:26:38 2007 +0000
@@ -1099,7 +1099,7 @@
 gmyth_socket_read_stringlist (GMythSocket *gmyth_socket, GMythStringList* str_list)
 {
     GString *response;
-    gchar **str_array;
+    gchar **str_array = NULL;
     gint i;
 
     response = gmyth_socket_receive_response(gmyth_socket);
diff -r 4d883f3edcdd -r d6603c86582f gmyth/src/gmyth_uri.c
--- a/gmyth/src/gmyth_uri.c	Fri Mar 23 15:14:43 2007 +0000
+++ b/gmyth/src/gmyth_uri.c	Fri Mar 23 15:26:38 2007 +0000
@@ -45,12 +45,12 @@
 static void gmyth_uri_dispose  (GObject *object);
 static void gmyth_uri_finalize (GObject *object);
 
+static void gmyth_uri_parser_setup_and_new(GMythURI *uri, const gchar *value);
+static gchar* gmyth_uri_print_field(const GString* field);
+
 G_DEFINE_TYPE(GMythURI, gmyth_uri, G_TYPE_OBJECT)
 
 static void
-gmyth_uri_parser_setup_and_new( GMythURI *uri, const gchar *value );
-    
-static void
 gmyth_uri_class_init (GMythURIClass *klass)
 {
 	GObjectClass *gobject_class;