[Gmyth-commits] SF.net SVN: gmyth: [879] trunk/gmyth-dbus/src/gmyth-dbus-server.c

[<ren...@us...>]

Revision: 879
          http://gmyth.svn.sourceforge.net/gmyth/?rev=879&view=rev
Author:   renatofilho
Date:     2007-10-25 12:36:19 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
bug fixes

Modified Paths:
--------------
    trunk/gmyth-dbus/src/gmyth-dbus-server.c

Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c	2007-10-25 17:43:23 UTC (rev 878)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c	2007-10-25 19:36:19 UTC (rev 879)
@@ -217,6 +217,9 @@
                             GError **error)
 {
     GMythDbusServerPrivate *priv;
+
+    g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     if (priv->myth_backend)
@@ -237,6 +240,9 @@
                              GError **error)
 {
     GMythDbusServerPrivate *priv;
+
+    g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     if (priv->myth_backend)
@@ -251,6 +257,9 @@
                               GError **error)
 {
     GMythDbusServerPrivate *priv;
+
+    g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     if (priv->myth_epg)
@@ -340,8 +349,10 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
 
+    if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
+
     ch_type = GMYTH_DBUS_CHANNEL_G_TYPE;
 
     ch_info = gmyth_epg_get_channel_info (priv->myth_epg, channel_id);
@@ -375,9 +386,11 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
+    if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
 
 
+    lst = NULL;
     len = gmyth_epg_get_channel_list (priv->myth_epg, &lst);
 
     *channels = g_ptr_array_sized_new (len);
@@ -436,7 +449,8 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
+    if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
 
     g_time_val_from_iso8601 (start_time, &start_time_val);
     g_time_val_from_iso8601 (end_time, &end_time_val);
@@ -534,8 +548,10 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
 
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
+
     record_type = GMYTH_DBUS_RECORD_G_TYPE;
 
     record_info = gmyth_scheduler_get_recorded_info (priv->myth_scheduler,
@@ -576,7 +592,8 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
 
 
     len = gmyth_scheduler_get_recorded_list (priv->myth_scheduler,
@@ -622,7 +639,8 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
 
 
     len = gmyth_scheduler_get_schedule_list (priv->myth_scheduler,
@@ -685,6 +703,8 @@
 
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
+    file_transfer = NULL;
+
     g_return_val_if_fail (priv->myth_backend, FALSE);
 
     if (!gmyth_util_file_exists (priv->myth_backend, uri))
@@ -783,7 +803,8 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
 
     ret = gmyth_scheduler_stop_recording (priv->myth_scheduler,
                                           channel_id);
@@ -846,9 +867,11 @@
     *schedule_id = 0;
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
 
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
 
+
     g_time_val_from_iso8601 (start_time, &start_vtime);
     g_time_val_from_iso8601 (end_time, &end_vtime);
     sch_info = gmyth_dbus_server_new_schedule_info (description,
@@ -931,8 +954,10 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
 
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
+
     g_time_val_from_iso8601 (start_time, &start_vtime);
     g_time_val_from_iso8601 (end_time, &end_vtime);
 
@@ -969,8 +994,10 @@
     priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
 
     g_return_val_if_fail (priv->myth_backend, FALSE);
-    g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
 
+    if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+        return FALSE;
+
     return gmyth_scheduler_delete_schedule (priv->myth_scheduler, schedule_id);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.