myth-dbus/src/gmyth-dbus-server.c
branchtrunk
changeset 869 48cf27f814b7
parent 867 c6c57f6060bd
     1.1 --- a/myth-dbus/src/gmyth-dbus-server.c	Thu Oct 25 15:26:21 2007 +0100
     1.2 +++ b/myth-dbus/src/gmyth-dbus-server.c	Thu Oct 25 15:38:08 2007 +0100
     1.3 @@ -407,6 +407,7 @@
     1.4                                 GError **error)
     1.5  {
     1.6      GMythDbusServerPrivate *priv;
     1.7 +    g_debug ("%s:%d", __FUNCTION__, __LINE__);
     1.8      priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
     1.9  
    1.10      g_return_val_if_fail (priv->myth_backend, FALSE);
    1.11 @@ -437,7 +438,6 @@
    1.12      g_return_val_if_fail (priv->myth_backend, FALSE);
    1.13      g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
    1.14  
    1.15 -
    1.16      g_time_val_from_iso8601 (start_time, &start_time_val);
    1.17      g_time_val_from_iso8601 (end_time, &end_time_val);
    1.18  
    1.19 @@ -460,6 +460,9 @@
    1.20  
    1.21          data = (GMythProgramInfo *) walk->data;
    1.22  
    1.23 +        if (!data)
    1.24 +            continue;
    1.25 +
    1.26          g_value_init (&program, program_type);
    1.27          g_value_take_boxed (&program,
    1.28                              dbus_g_type_specialized_construct (program_type));
    1.29 @@ -482,7 +485,10 @@
    1.30          g_free (end_str);
    1.31      }
    1.32  
    1.33 -    gmyth_free_program_list (list);
    1.34 +    if (list)
    1.35 +        gmyth_free_program_list (list);
    1.36 +
    1.37 +    g_debug ("%s:%d", __FUNCTION__, __LINE__);
    1.38      return TRUE;
    1.39  }
    1.40  
    1.41 @@ -593,6 +599,7 @@
    1.42          gmyth_dbus_server_parse_recorded_info (data, &record);
    1.43  
    1.44          g_ptr_array_add (*records, g_value_get_boxed (&record));
    1.45 +        //g_value_unset (&record);
    1.46      }
    1.47  
    1.48      gmyth_recorded_info_list_free (list);
    1.49 @@ -678,8 +685,6 @@
    1.50  
    1.51      priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
    1.52  
    1.53 -    g_debug ("getting icon: %s", uri);
    1.54 -
    1.55      g_return_val_if_fail (priv->myth_backend, FALSE);
    1.56  
    1.57      if (!gmyth_util_file_exists (priv->myth_backend, uri))
    1.58 @@ -708,6 +713,8 @@
    1.59      return TRUE;
    1.60  
    1.61  fail:
    1.62 +    if (*image)
    1.63 +        g_byte_array_free (*image, TRUE);
    1.64      g_object_unref(file_transfer);
    1.65      return FALSE;
    1.66  }
    1.67 @@ -958,6 +965,7 @@
    1.68  {
    1.69      GMythDbusServerPrivate *priv;
    1.70  
    1.71 +    g_debug ("%s:%d", __FUNCTION__, __LINE__);
    1.72      priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
    1.73  
    1.74      g_return_val_if_fail (priv->myth_backend, FALSE);