1.1 --- a/gmyth-dbus/src/gmyth-dbus-server.c Thu Oct 25 15:40:47 2007 +0100
1.2 +++ b/gmyth-dbus/src/gmyth-dbus-server.c Thu Oct 25 20:36:19 2007 +0100
1.3 @@ -217,6 +217,9 @@
1.4 GError **error)
1.5 {
1.6 GMythDbusServerPrivate *priv;
1.7 +
1.8 + g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.9 +
1.10 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.11
1.12 if (priv->myth_backend)
1.13 @@ -237,6 +240,9 @@
1.14 GError **error)
1.15 {
1.16 GMythDbusServerPrivate *priv;
1.17 +
1.18 + g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.19 +
1.20 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.21
1.22 if (priv->myth_backend)
1.23 @@ -251,6 +257,9 @@
1.24 GError **error)
1.25 {
1.26 GMythDbusServerPrivate *priv;
1.27 +
1.28 + g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.29 +
1.30 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.31
1.32 if (priv->myth_epg)
1.33 @@ -340,7 +349,9 @@
1.34 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.35
1.36 g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
1.37 - g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
1.38 +
1.39 + if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
1.40 + return FALSE;
1.41
1.42 ch_type = GMYTH_DBUS_CHANNEL_G_TYPE;
1.43
1.44 @@ -375,9 +386,11 @@
1.45 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.46
1.47 g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
1.48 - g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
1.49 + if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
1.50 + return FALSE;
1.51
1.52
1.53 + lst = NULL;
1.54 len = gmyth_epg_get_channel_list (priv->myth_epg, &lst);
1.55
1.56 *channels = g_ptr_array_sized_new (len);
1.57 @@ -436,7 +449,8 @@
1.58 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.59
1.60 g_return_val_if_fail (priv->myth_backend, FALSE);
1.61 - g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
1.62 + if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
1.63 + return FALSE;
1.64
1.65 g_time_val_from_iso8601 (start_time, &start_time_val);
1.66 g_time_val_from_iso8601 (end_time, &end_time_val);
1.67 @@ -534,7 +548,9 @@
1.68 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.69
1.70 g_return_val_if_fail (priv->myth_backend, FALSE);
1.71 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.72 +
1.73 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.74 + return FALSE;
1.75
1.76 record_type = GMYTH_DBUS_RECORD_G_TYPE;
1.77
1.78 @@ -576,7 +592,8 @@
1.79 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.80
1.81 g_return_val_if_fail (priv->myth_backend, FALSE);
1.82 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.83 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.84 + return FALSE;
1.85
1.86
1.87 len = gmyth_scheduler_get_recorded_list (priv->myth_scheduler,
1.88 @@ -622,7 +639,8 @@
1.89 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.90
1.91 g_return_val_if_fail (priv->myth_backend, FALSE);
1.92 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.93 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.94 + return FALSE;
1.95
1.96
1.97 len = gmyth_scheduler_get_schedule_list (priv->myth_scheduler,
1.98 @@ -685,6 +703,8 @@
1.99
1.100 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.101
1.102 + file_transfer = NULL;
1.103 +
1.104 g_return_val_if_fail (priv->myth_backend, FALSE);
1.105
1.106 if (!gmyth_util_file_exists (priv->myth_backend, uri))
1.107 @@ -783,7 +803,8 @@
1.108 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.109
1.110 g_return_val_if_fail (priv->myth_backend, FALSE);
1.111 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.112 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.113 + return FALSE;
1.114
1.115 ret = gmyth_scheduler_stop_recording (priv->myth_scheduler,
1.116 channel_id);
1.117 @@ -846,7 +867,9 @@
1.118 *schedule_id = 0;
1.119
1.120 g_return_val_if_fail (priv->myth_backend, FALSE);
1.121 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.122 +
1.123 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.124 + return FALSE;
1.125
1.126
1.127 g_time_val_from_iso8601 (start_time, &start_vtime);
1.128 @@ -931,7 +954,9 @@
1.129 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.130
1.131 g_return_val_if_fail (priv->myth_backend, FALSE);
1.132 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.133 +
1.134 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.135 + return FALSE;
1.136
1.137 g_time_val_from_iso8601 (start_time, &start_vtime);
1.138 g_time_val_from_iso8601 (end_time, &end_vtime);
1.139 @@ -969,7 +994,9 @@
1.140 priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
1.141
1.142 g_return_val_if_fail (priv->myth_backend, FALSE);
1.143 - g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
1.144 +
1.145 + if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
1.146 + return FALSE;
1.147
1.148 return gmyth_scheduler_delete_schedule (priv->myth_scheduler, schedule_id);
1.149 }