Convert uses of XKeycodeToKeysym (deprecated) to XkbKeycodeToKeysym

[oweals/cde.git] / cde / programs / dtcm / dtcm / props_pu.c

diff --git a/cde/programs/dtcm/dtcm/props_pu.c b/cde/programs/dtcm/dtcm/props_pu.c
index 55708a0d637d33db2acf85ba131ee11fb71987e9..6315fb23dbd2531888aff8fe793744ca2969c5ef 100644 (file)
--- a/cde/programs/dtcm/dtcm/props_pu.c
+++ b/cde/programs/dtcm/dtcm/props_pu.c
@@ -2136,7 +2136,7 @@ p_save_changes(Calendar *c) {
 
         if (redisplay_mask & PROPS_REDO_EDITORS) {
 
-               if (((Editor *) c->editor)->base_form_mgr) {
+               if (c->editor && ((Editor *) c->editor)->base_form_mgr) {
 
                        Editor *e = (Editor *) c->editor;
                        DSSW *dssw = &((Editor *) c->editor)->dssw;
@@ -2159,7 +2159,7 @@ p_save_changes(Calendar *c) {
                }
        
 
-               if (((ToDo *) c->todo)->base_form_mgr) {
+               if (c->todo && ((ToDo *) c->todo)->base_form_mgr) {
                        ToDo *t = (ToDo *)c->todo;
                        DSSW *dssw = &((ToDo *) c->todo)->dssw;
 
@@ -3093,7 +3093,10 @@ set_editor_vals_on_ui(Props_pu *pu, Props *p) {
        val->selected = convert_boolean_str(get_char_prop(p, CP_MAILON));
        val->scope = convert_time_scope_str(get_char_prop(p, CP_MAILUNIT));
        val->scope_val = get_int_prop(p, CP_MAILADV);
-       strcpy(pu->ep_reminders.mailto_val, get_char_prop(p, CP_MAILTO));
+       snprintf(pu->ep_reminders.mailto_val,
+                sizeof(pu->ep_reminders.mailto_val),
+                "%s",
+                get_char_prop(p, CP_MAILTO));
 
        set_reminders_vals(&pu->ep_reminders, False);