--- a/src/9mcc-television.c	Sat Apr 26 12:44:54 2008 +0200
+++ b/src/9mcc-television.c	Wed Aug 13 13:30:59 2008 +0200
@@ -51,7 +51,7 @@
 #include "9mcc-network.h"
 #include "9mcc-menu.h"
 
-#define NEUFTV_URL "http://80.118.196.219/gen-asx.cgi?channel=france_2&playlist=all"
+//#define NEUFTV_URL "http://80.118.196.219/gen-asx.cgi?channel=france_2&playlist=all"
 #define NEUFTV_URL "http://80.118.196.219/gen-asx.cgi?channel=france_2"
 #define TNTTV_FNAME "tnt.asx"
 #define ANALOGTV_FNAME "analog.asx"
@@ -117,29 +117,29 @@ static void on_button_scan_clicked(GtkWi
  */
 static int start_subprocess(const char *commandline)
 {
-	GError *gError = NULL;
-	gint argc;
-	gchar **argv;
-	GPid pid;
-  
+  GError *gError = NULL;
+  gint argc;
+  gchar **argv;
+  GPid pid;
+
   trace("launch %s\n", commandline);
 
-	if (!g_shell_parse_argv(commandline, &argc, &argv, &gError)) {
-		fprintf(stderr, "Parsing cmdline error: %s\n", gError->message);
-		g_error_free(gError);
-		return -1;
-	}
-
-	if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, &gError)) {
-		fprintf(stderr, "Error while launching application: %s\n", gError->message);
-		g_error_free(gError);
-		g_strfreev(argv);
-		return -1;
-	}
-
-	g_strfreev(argv);
-	sleep(1);
-	return pid;
+  if (!g_shell_parse_argv(commandline, &argc, &argv, &gError)) {
+     fprintf(stderr, "Parsing cmdline error: %s\n", gError->message);
+     g_error_free(gError);
+     return -1;
+  }
+
+  if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, &gError)) {
+     fprintf(stderr, "Error while launching application: %s\n", gError->message);
+     g_error_free(gError);
+     g_strfreev(argv);
+     return -1;
+  }
+
+  g_strfreev(argv);
+  sleep(1);
+  return pid;
 }
 
 /**
@@ -318,7 +318,7 @@ static gboolean scan_channels(const gcha
  */
 
 static size_t
-curl_common_append_data(void *ptr, size_t size, size_t nmemb, GString *stream)
+curl_common_append_data(const void *ptr, size_t size, size_t nmemb, GString *stream)
 {
   g_string_append_len(stream, ptr, size * nmemb);
   return size * nmemb;
@@ -969,13 +969,16 @@ menu_television_get_descriptions(void)
    {
      struct television_stream *stream = streams->data;
 
-     if (urls[i] && urls_contents[i])
+     if (stream->image_url)
       {
-	stream->image_pixbuf = gdk_pixbuf_new_from_memory(urls_contents[i]->str,
-							  urls_contents[i]->len);
-	g_string_free(urls_contents[i], TRUE);
+	if (urls[i] && urls_contents[i])
+	 {
+	   stream->image_pixbuf = gdk_pixbuf_new_from_memory(urls_contents[i]->str,
+	       urls_contents[i]->len);
+	   g_string_free(urls_contents[i], TRUE);
+	 }
+	i++;
       }
-     i++;
 
      streams = streams->next;
 
@@ -1402,7 +1405,7 @@ on_button_scan_clicked(GtkWidget *widget
   gboolean is_scan_needed = FALSE;
   gboolean is_confirm_needed = (gboolean)user_data;
   GDir *cities_dir;
-  gchar *new_city_fname, *new_city;
+  const gchar *new_city_fname;
   gchar *city_selected=NULL;
   GList *cities_list=NULL, *city_elt=NULL;
   
@@ -1488,7 +1491,7 @@ on_button_scan_clicked(GtkWidget *widget
         city_elt = g_list_first(cities_list);
         while (city_elt != NULL)
         {
-          new_city = (gchar *)(city_elt->data);
+          gchar *new_city = (gchar *)(city_elt->data);
           gtk_combo_box_append_text(GTK_COMBO_BOX(cities), new_city);
           g_free(new_city);
           city_elt = g_list_next(city_elt);
@@ -1576,9 +1579,9 @@ menu_television_refresh_list(GtkListStor
       {
         gtk_list_store_append(store_list, &iter);
         gtk_list_store_set(store_list, &iter,
-          PIXBUF_COLUMN, stream->image_pixbuf,
-          TEXT_COLUMN, stream->description,
-          -1);
+			   PIXBUF_COLUMN, stream->image_pixbuf,
+			   TEXT_COLUMN, stream->description,
+			   -1);
       }
 
      streams = streams->next;