diff -r 0cc42675b88d -r fc9ff4a3ac98 gmyth-dbus/src/gmyth-dbus-server.c
--- a/gmyth-dbus/src/gmyth-dbus-server.c	Wed Jan 23 20:04:59 2008 +0000
+++ b/gmyth-dbus/src/gmyth-dbus-server.c	Thu Jan 31 12:49:56 2008 +0000
@@ -633,7 +633,7 @@
         end_str = g_time_val_to_iso8601 (data->endts);
 
         dbus_g_type_struct_set (&program,
-                                0, data->xx_channel_id,
+                                0, data->channel_id,
                                 1, start_str,
                                 2, end_str,
                                 3, data->title->str,
@@ -666,8 +666,8 @@
 
     dbus_g_type_struct_set (val,
                             0, info->record_id,
-                            1, info->xx_program_id->str,
-                            2, info->xx_channel_id,
+                            1, info->program_id->str,
+                            2, info->channel_id,
                             3, start_str,
                             4, end_str,
                             5, info->title->str,
@@ -824,8 +824,8 @@
 
         dbus_g_type_struct_set (&schedule,
                             0, data->schedule_id,
-                            1, data->xx_program_id->str,
-                            2, data->xx_channel_id,
+                            1, data->program_id->str,
+                            2, data->channel_id,
                             3, start_str_time,
                             4, end_str_time,
                             5, data->title->str,
@@ -1025,8 +1025,8 @@
     /* record_id == -1 for generating a new id */
     new_sched_info->schedule_id = -1;
 
-    new_sched_info->xx_channel_id = channel_id;
-    new_sched_info->xx_program_id = g_string_new (program_id);
+    new_sched_info->channel_id = channel_id;
+    new_sched_info->program_id = g_string_new (program_id);
     new_sched_info->start_time = g_new0 (GTimeVal, 1);
     *new_sched_info->start_time = *start_vtime;
     new_sched_info->end_time = g_new0 (GTimeVal, 1);