debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtstyle: XVaGetValues() calls

Browse Source
This commit is contained in:
Marcin Cieslak
2012-09-26 12:14:52 +02:00
committed by Jon Trulson
parent b61e8ebad6
commit e1f9b57844
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtstyle/Font.c
View File

@@ -452,7 +452,8 @@ ButtonCB(
{
DtDialogBoxCallbackStruct *cb
= (DtDialogBoxCallbackStruct *) call_data;
int n, len, items;
int n, len;
XtArgVal items;
char *str, *fntstr, *fntsetstr;
Arg args[MAX_ARGS];
char fontres[8192];

9
cde/programs/dtstyle/I18nMain.c
View File

@@ -825,7 +825,8 @@ UpdateImList(
I18nEnv *env,
char *hostname)
{
Cardinal n,i;
Cardinal i;
XtArgVal n;
Widget *im_tog = NULL;
int ret = NoError;
@@ -992,7 +993,8 @@ SaveSelectedValues(
{
int ret = NoError;
char *preeditStr = NULL, *tmpStr;
int i, num_preedit = 0;
int i;
XtArgVal num_preedit = 0;
XmStringTable list_preedit;
static char preeditTypeRes[1024];
@@ -1068,7 +1070,8 @@ SetFileSelValues(
)
{
char *hostname;
Cardinal n,i;
Cardinal i;
XtArgVal n;
Widget *im_tog;
/* The hostname value is stored in the ImsSel structure. */

12
cde/programs/dtstyle/Screen.c
View File

@@ -507,6 +507,7 @@ build_screenDialog(
Dimension LabelWidth = 0;
Atom delete_window_atom;
Boolean low_res = False;
XtArgVal scratch;
/* initialize saver data */
savers.shadow = 2;
@@ -820,7 +821,8 @@ build_screenDialog(
XtSetArg (args[n], XmNwidth, SAVER_WIDTH); n++; }
screen.saverArea = XmCreateDrawingArea (screen.saverAreaFrame, "saverArea", args, n);
/* get the initial secondary color pixel value for dtstyle for later use */
XtVaGetValues(screen.saverArea, XmNbackground, &savers.bg, NULL);
XtVaGetValues(screen.saverArea, XmNbackground, &scratch, NULL);
savers.bg = (Pixel)scratch;
/* label for the previewed saver */
n = 0;
@@ -2396,6 +2398,7 @@ ButtonCB(
Boolean flag;
static char screenres[48];
int mintime;
XtArgVal scratch;
DtDialogBoxCallbackStruct *cb = (DtDialogBoxCallbackStruct *) call_data;
@@ -2482,7 +2485,8 @@ ButtonCB(
free_saverList(savers.selsaverActionNames, savers.selsaverCount);
savers.selsaverActionNames = NULL;
XtVaGetValues(screen.cycleTimeScale, XmNvalue, &screen.cycleTimeout, NULL);
XtVaGetValues(screen.cycleTimeScale, XmNvalue, &scratch, NULL);
screen.cycleTimeout = scratch;
/* send new saver time, lock time and time per saver to SM if they have changed, */
/* flag value indicates which value has changed */
@@ -2610,6 +2614,7 @@ no_svr_ext_ButtonCB(
Boolean flag;
static char screenres[48];
int mintime;
XtArgVal scratch;
DtDialogBoxCallbackStruct *cb = (DtDialogBoxCallbackStruct *) call_data;
@@ -2686,7 +2691,8 @@ no_svr_ext_ButtonCB(
free_saverList(savers.selsaverActionNames, savers.selsaverCount);
savers.selsaverActionNames = NULL;
XtVaGetValues(screen.cycleTimeScale, XmNvalue, &screen.cycleTimeout, NULL);
XtVaGetValues(screen.cycleTimeScale, XmNvalue, &scratch, NULL);
screen.cycleTimeout = scratch;
/* send new saver time, lock time and time per saver to SM if they have changed, */
/* flag value indicates which value has changed */