1.1 --- a/gmyth-dbus/debian/changelog Thu Jan 31 20:02:39 2008 +0000
1.2 +++ b/gmyth-dbus/debian/changelog Fri Feb 01 13:38:20 2008 +0000
1.3 @@ -1,3 +1,9 @@
1.4 +gmyth-dbus (0.1.4) unstable; urgency=low
1.5 +
1.6 + * Fixed dbus interface bug for add_exception function.
1.7 +
1.8 + -- Hallyson <hallyson.melo@ndt.org.br> Fri, 01 Feb 2008 10:35:55 -0300
1.9 +
1.10 gmyth-dbus (0.1.3) unstable; urgency=low
1.11
1.12 * updated to gmyth 0.6;
2.1 --- a/gmyth-dbus/src/gmyth-dbus-server.c Thu Jan 31 20:02:39 2008 +0000
2.2 +++ b/gmyth-dbus/src/gmyth-dbus-server.c Fri Feb 01 13:38:20 2008 +0000
2.3 @@ -82,7 +82,7 @@
2.4 /* Dbus */
2.5 static gboolean gmyth_dbus_server_connect (GObject *obj,
2.6 const gchar *host,
2.7 - guint port,
2.8 + gint port,
2.9 const gchar *user,
2.10 const gchar *password,
2.11 GError **error);
2.12 @@ -139,7 +139,7 @@
2.13 gboolean *result,
2.14 GError **error);
2.15 static gboolean gmyth_dbus_server_add_schedule (GObject *obj,
2.16 - guint channel_id,
2.17 + gint channel_id,
2.18 const gchar *program_id,
2.19 const gchar *start_time,
2.20 const gchar *end_time,
2.21 @@ -149,7 +149,7 @@
2.22 GError **error);
2.23 static gboolean gmyth_dbus_server_add_exception (GObject *obj,
2.24 guint schedule_id,
2.25 - guint channel_id,
2.26 + gint channel_id,
2.27 const gchar *program_id,
2.28 const gchar *start_time,
2.29 const gchar *end_time,
2.30 @@ -290,7 +290,7 @@
2.31 static gboolean
2.32 gmyth_dbus_server_connect (GObject *obj,
2.33 const gchar *host,
2.34 - guint port,
2.35 + gint port,
2.36 const gchar *user,
2.37 const gchar *password,
2.38 GError **error)
2.39 @@ -1046,7 +1046,7 @@
2.40
2.41 static gboolean
2.42 gmyth_dbus_server_add_schedule (GObject *obj,
2.43 - guint channel_id,
2.44 + gint channel_id,
2.45 const gchar *program_id,
2.46 const gchar *start_time,
2.47 const gchar *end_time,
2.48 @@ -1073,14 +1073,13 @@
2.49
2.50 g_time_val_from_iso8601 (start_time, &start_vtime);
2.51 g_time_val_from_iso8601 (end_time, &end_vtime);
2.52 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.53 +
2.54 sch_info = gmyth_dbus_server_new_schedule_info (description,
2.55 channel_id,
2.56 program_id,
2.57 &start_vtime,
2.58 &end_vtime);
2.59
2.60 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.61 if (sch_info != NULL) {
2.62 GMythScheduleType type;
2.63 GTimeVal t_now;
2.64 @@ -1092,20 +1091,17 @@
2.65
2.66 g_get_current_time (&t_now);
2.67
2.68 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.69 has_record = gmyth_scheduler_was_recorded_before (priv->myth_scheduler,
2.70 channel_id,
2.71 (time_t) start_vtime.tv_sec);
2.72
2.73
2.74 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.75 if ((t_now.tv_sec >= start_vtime.tv_sec)
2.76 && (t_now.tv_sec <= end_vtime.tv_sec) && has_record)
2.77 {
2.78 GMythSocket *socket;
2.79 gboolean res = FALSE;
2.80
2.81 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.82 socket = gmyth_backend_info_get_connected_socket (priv->myth_backend);
2.83 res = gmyth_scheduler_reactivate_schedule(priv->myth_scheduler,
2.84 channel_id,
2.85 @@ -1113,21 +1109,17 @@
2.86 if (res) {
2.87 GMythStringList *slist = gmyth_string_list_new();
2.88
2.89 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.90 gmyth_string_list_append_char_array(slist, "RESCHEDULE_RECORDINGS 0");
2.91 gmyth_socket_sendreceive_stringlist(socket, slist);
2.92 res = (gmyth_string_list_get_int(slist, 0) == 1);
2.93 g_object_unref(slist);
2.94 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.95 }
2.96 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.97
2.98 g_object_unref(socket);
2.99 return res;
2.100 }
2.101 else
2.102 {
2.103 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.104 if (!gmyth_scheduler_add_schedule_full (priv->myth_scheduler,
2.105 sch_info,
2.106 type))
2.107 @@ -1136,11 +1128,8 @@
2.108 return FALSE;
2.109 }
2.110
2.111 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.112 (*schedule_id) = sch_info->schedule_id;
2.113 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.114 gmyth_schedule_info_free (sch_info);
2.115 - g_debug ("%s:%d", __FUNCTION__, __LINE__);
2.116 return TRUE;
2.117 }
2.118 }
2.119 @@ -1150,7 +1139,7 @@
2.120 static gboolean
2.121 gmyth_dbus_server_add_exception (GObject *obj,
2.122 guint schedule_id,
2.123 - guint channel_id,
2.124 + gint channel_id,
2.125 const gchar *program_id,
2.126 const gchar *start_time,
2.127 const gchar *end_time,
3.1 --- a/gmyth-dbus/src/gmyth-dbus-server.xml Thu Jan 31 20:02:39 2008 +0000
3.2 +++ b/gmyth-dbus/src/gmyth-dbus-server.xml Fri Feb 01 13:38:20 2008 +0000
3.3 @@ -84,8 +84,8 @@
3.4
3.5 <method name="AddException">
3.6 <arg type="u" name="schedule_id" direction="in" />
3.7 + <arg type="i" name="channel_id" direction="in" />
3.8 <arg type="s" name="program_id" direction="in" />
3.9 - <arg type="i" name="channel_id" direction="in" />
3.10 <arg type="s" name="start_time" direction="in" />
3.11 <arg type="s" name="end_time" direction="in" />
3.12 <arg type="s" name="description" direction="in" />