1.1 --- a/gmyth-dbus/src/gmyth-dbus-server.c	Tue Jan 29 18:40:18 2008 +0000
     1.2 +++ b/gmyth-dbus/src/gmyth-dbus-server.c	Tue Jan 29 18:40:32 2008 +0000
     1.3 @@ -633,7 +633,7 @@
     1.4          end_str = g_time_val_to_iso8601 (data->endts);
     1.5  
     1.6          dbus_g_type_struct_set (&program,
     1.7 -                                0, data->xx_channel_id,
     1.8 +                                0, data->channel_id,
     1.9                                  1, start_str,
    1.10                                  2, end_str,
    1.11                                  3, data->title->str,
    1.12 @@ -666,8 +666,8 @@
    1.13  
    1.14      dbus_g_type_struct_set (val,
    1.15                              0, info->record_id,
    1.16 -                            1, info->xx_program_id->str,
    1.17 -                            2, info->xx_channel_id,
    1.18 +                            1, info->program_id->str,
    1.19 +                            2, info->channel_id,
    1.20                              3, start_str,
    1.21                              4, end_str,
    1.22                              5, info->title->str,
    1.23 @@ -824,8 +824,8 @@
    1.24  
    1.25          dbus_g_type_struct_set (&schedule,
    1.26                              0, data->schedule_id,
    1.27 -                            1, data->xx_program_id->str,
    1.28 -                            2, data->xx_channel_id,
    1.29 +                            1, data->program_id->str,
    1.30 +                            2, data->channel_id,
    1.31                              3, start_str_time,
    1.32                              4, end_str_time,
    1.33                              5, data->title->str,
    1.34 @@ -1025,8 +1025,8 @@
    1.35      /* record_id == -1 for generating a new id */
    1.36      new_sched_info->schedule_id = -1;
    1.37  
    1.38 -    new_sched_info->xx_channel_id = channel_id;
    1.39 -    new_sched_info->xx_program_id = g_string_new (program_id);
    1.40 +    new_sched_info->channel_id = channel_id;
    1.41 +    new_sched_info->program_id = g_string_new (program_id);
    1.42      new_sched_info->start_time = g_new0 (GTimeVal, 1);
    1.43      *new_sched_info->start_time = *start_vtime;
    1.44      new_sched_info->end_time = g_new0 (GTimeVal, 1);