1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code

This commit is contained in:
Jon Trulson 2019-02-24 12:56:10 -07:00
commit d6ece8fd00
3 changed files with 6 additions and 4 deletions

View file

@ -1685,13 +1685,14 @@ add_to_gaccess_list(
char access, *buf;
XmString xmstr;
Calendar *c;
Props_pu *p = (Props_pu *)ge->cal->properties_pu;
Props_pu *p;
Access_data *new_data = NULL;
if (!ge)
return;
c = ge->cal;
p = (Props_pu *)c->properties_pu;
while (ge->access_data && cnt <= ge->access_data->count) {
new_data = (Access_data *)

View file

@ -621,8 +621,8 @@ cm_mbstrlen(char *s) {
*/
extern char *
cm_mbchar(char *str) {
static char *string;
static char *string_head;
static char *string = NULL;
static char *string_head = NULL;
static char *buf = NULL;
int num_byte = 0;

View file

@ -214,7 +214,7 @@ rfp_apply_proc(Widget w, XtPointer client_data, XtPointer cbs) {
char *str, buf[128];
XmString xmstr;
Calendar *c;
Props_pu *pu = (Props_pu *)c->properties_pu;
Props_pu *pu;
Repeat_scope_menu_op op = REPEAT_DAYS;
char *repeat_str;
@ -222,6 +222,7 @@ rfp_apply_proc(Widget w, XtPointer client_data, XtPointer cbs) {
return;
c = rfp->cal;
pu = (Props_pu *)c->properties_pu;
str = XmTextGetString(rfp->repeat_popup_text);