1.1 --- a/gmyth-dbus/src/gmyth-dbus-server.c Tue Jan 29 18:40:32 2008 +0000
1.2 +++ b/gmyth-dbus/src/gmyth-dbus-server.c Fri Feb 01 22:17:33 2008 +0000
1.3 @@ -82,7 +82,7 @@
1.4 /* Dbus */
1.5 static gboolean gmyth_dbus_server_connect (GObject *obj,
1.6 const gchar *host,
1.7 - guint port,
1.8 + gint port,
1.9 const gchar *user,
1.10 const gchar *password,
1.11 GError **error);
1.12 @@ -139,7 +139,7 @@
1.13 gboolean *result,
1.14 GError **error);
1.15 static gboolean gmyth_dbus_server_add_schedule (GObject *obj,
1.16 - guint channel_id,
1.17 + gint channel_id,
1.18 const gchar *program_id,
1.19 const gchar *start_time,
1.20 const gchar *end_time,
1.21 @@ -149,7 +149,7 @@
1.22 GError **error);
1.23 static gboolean gmyth_dbus_server_add_exception (GObject *obj,
1.24 guint schedule_id,
1.25 - guint channel_id,
1.26 + gint channel_id,
1.27 const gchar *program_id,
1.28 const gchar *start_time,
1.29 const gchar *end_time,
1.30 @@ -290,7 +290,7 @@
1.31 static gboolean
1.32 gmyth_dbus_server_connect (GObject *obj,
1.33 const gchar *host,
1.34 - guint port,
1.35 + gint port,
1.36 const gchar *user,
1.37 const gchar *password,
1.38 GError **error)
1.39 @@ -1046,7 +1046,7 @@
1.40
1.41 static gboolean
1.42 gmyth_dbus_server_add_schedule (GObject *obj,
1.43 - guint channel_id,
1.44 + gint channel_id,
1.45 const gchar *program_id,
1.46 const gchar *start_time,
1.47 const gchar *end_time,
1.48 @@ -1073,14 +1073,13 @@
1.49
1.50 g_time_val_from_iso8601 (start_time, &start_vtime);
1.51 g_time_val_from_iso8601 (end_time, &end_vtime);
1.52 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.53 +
1.54 sch_info = gmyth_dbus_server_new_schedule_info (description,
1.55 channel_id,
1.56 program_id,
1.57 &start_vtime,
1.58 &end_vtime);
1.59
1.60 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.61 if (sch_info != NULL) {
1.62 GMythScheduleType type;
1.63 GTimeVal t_now;
1.64 @@ -1092,20 +1091,17 @@
1.65
1.66 g_get_current_time (&t_now);
1.67
1.68 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.69 has_record = gmyth_scheduler_was_recorded_before (priv->myth_scheduler,
1.70 channel_id,
1.71 (time_t) start_vtime.tv_sec);
1.72
1.73
1.74 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.75 if ((t_now.tv_sec >= start_vtime.tv_sec)
1.76 && (t_now.tv_sec <= end_vtime.tv_sec) && has_record)
1.77 {
1.78 GMythSocket *socket;
1.79 gboolean res = FALSE;
1.80
1.81 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.82 socket = gmyth_backend_info_get_connected_socket (priv->myth_backend);
1.83 res = gmyth_scheduler_reactivate_schedule(priv->myth_scheduler,
1.84 channel_id,
1.85 @@ -1113,21 +1109,17 @@
1.86 if (res) {
1.87 GMythStringList *slist = gmyth_string_list_new();
1.88
1.89 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.90 gmyth_string_list_append_char_array(slist, "RESCHEDULE_RECORDINGS 0");
1.91 gmyth_socket_sendreceive_stringlist(socket, slist);
1.92 res = (gmyth_string_list_get_int(slist, 0) == 1);
1.93 g_object_unref(slist);
1.94 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.95 }
1.96 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.97
1.98 g_object_unref(socket);
1.99 return res;
1.100 }
1.101 else
1.102 {
1.103 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.104 if (!gmyth_scheduler_add_schedule_full (priv->myth_scheduler,
1.105 sch_info,
1.106 type))
1.107 @@ -1136,11 +1128,8 @@
1.108 return FALSE;
1.109 }
1.110
1.111 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.112 (*schedule_id) = sch_info->schedule_id;
1.113 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.114 gmyth_schedule_info_free (sch_info);
1.115 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
1.116 return TRUE;
1.117 }
1.118 }
1.119 @@ -1150,7 +1139,7 @@
1.120 static gboolean
1.121 gmyth_dbus_server_add_exception (GObject *obj,
1.122 guint schedule_id,
1.123 - guint channel_id,
1.124 + gint channel_id,
1.125 const gchar *program_id,
1.126 const gchar *start_time,
1.127 const gchar *end_time,