*** empty log message ***

[moira.git] / clients / mmoira / stubs.c

diff --git a/clients/mmoira/stubs.c b/clients/mmoira/stubs.c
index bf1c7ee744133b9506b8ae8de4bf1f8e2045e2a4..d9055c4a440d234263c8c3e6606ba2a71bb02841 100644 (file)
--- a/clients/mmoira/stubs.c
+++ b/clients/mmoira/stubs.c
@@ -56,10 +56,15 @@ PopupErrorMessage(text, extrahelp)
 char   *text;
 char   *extrahelp;
 {
-       Widget          child;
+       static Widget           child;
        Arg             wargs[10];
        int             n;
-       XmString        label;          /* !@#$%^ compound string required */
+       static XmString        label;
+
+       if (label) {
+               XtFree(label);
+               XtDestroyWidget(child);
+       }
 
 
        label = XmStringCreateLtoR( text, XmSTRING_DEFAULT_CHARSET);
@@ -89,11 +94,15 @@ void
 PopupHelpWindow(text)
 char   *text;
 {
-       Widget          child;
+       static Widget           child;
        Arg             wargs[10];
        int             n;
-       XmString        label;          /* !@#$%^ compound string required */
 
+       static XmString        label;
+       if (label) {
+               XtFree(label);
+               XtDestroyWidget(child);
+       }
 
        label = XmStringCreateLtoR( text, XmSTRING_DEFAULT_CHARSET);
 
@@ -180,20 +189,21 @@ EntryForm *spec;
 
                case FT_BOOLEAN:
                        n = 0;
-                       XtSetArg(wargs[n], XmNset, current->returnvalue.booleanvalue);  n++;
+                       XtSetArg(wargs[n], XmNset,
+                                current->returnvalue.booleanvalue ? True : False);     n++;
                        XtSetValues (current->mywidget, wargs, n);
                        break;
 
                case FT_KEYWORD:
                        kidcount = ((CompositeRec *)(current->mywidget))->
                                        composite.num_children;
-                       printf ("Keyword field has %d children\n", kidcount);
 
                        while(kidcount--) {
                                n = 0;
                                kid = ((CompositeRec *)(current->mywidget))->
                                        composite.children[kidcount];
-                               if (!strcmp (XtName(kid), current->returnvalue.stringvalue)) {
+                               if (current->returnvalue.stringvalue &&
+                                       (!strcmp (XtName(kid), current->returnvalue.stringvalue))) {
                                        XtSetArg(wargs[n], XmNset, True);
                                        n++;
                                }