external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Jon Trulson 2012-09-17 18:23:31 -06:00
commit 735bdff392
12 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtstyle/Audio.c
View file

@ -650,7 +650,7 @@ restoreAudio(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("audioDlg");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

8
cde/programs/dtstyle/Backdrop.c
View file

@ -552,7 +552,7 @@ static
ReadBitmaps( void )
{
int status;
Pixmap tmpPix = NULL;
Pixmap tmpPix = 0;
int width, height, x, y;
Window win;
int num;
@ -589,7 +589,7 @@ static
{
/* give error dialog, free space, and return */
backdrops.errStr = (char *)XtMalloc(strlen(ERR2) + 1);
sprintf(backdrops.errStr, ERR2);
sprintf(backdrops.errStr, "%s", ERR2);
ErrDialog (backdrops.errStr, style.shell);
FreeAll();
free_dirList(backdrops.dirList, backdrops.dirCount);
@ -608,7 +608,7 @@ static
{
/* give error dialog, free space, and return */
backdrops.errStr = (char *)XtMalloc(strlen(ERR2) + 1);
sprintf(backdrops.errStr, ERR2);
sprintf(backdrops.errStr, "%s", ERR2);
ErrDialog (backdrops.errStr, style.shell);
FreeAll();
free_dirList(backdrops.dirList, backdrops.dirCount);
@ -1129,7 +1129,7 @@ restoreBackdrop(
XrmValue value;
xrm_name [0] = XrmStringToQuark (BACKDROPSDLG);
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

2
cde/programs/dtstyle/ColorEdit.c
View file

@ -1615,7 +1615,7 @@ restoreColorEdit(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("colorEditDlg");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

4
cde/programs/dtstyle/ColorMain.c
View file

@ -2323,7 +2323,7 @@ restoreColor(
/*"paletteDlg" is the resource name of the dialog shell we are saving for.*/
xrm_name [0] = XrmStringToQuark (PALETTEDLG);
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");
@ -2343,7 +2343,7 @@ restoreColor(
strcpy(defaultName_restore, value.addr);
}
else
defaultName_restore[0] = NULL;
defaultName_restore[0] = 0;
/* get selected button */
xrm_name [1] = XrmStringToQuark ("selected_button");

2
cde/programs/dtstyle/Dtwm.c
View file

@ -911,7 +911,7 @@ restoreDtwm(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("dtwmDlg");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

2
cde/programs/dtstyle/Font.c
View file

@ -685,7 +685,7 @@ restoreFonts(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("Fonts");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

2
cde/programs/dtstyle/I18nMain.c
View file

@ -1131,7 +1131,7 @@ restoreI18n(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("i18nDlg");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

2
cde/programs/dtstyle/Keyboard.c
View file

@ -569,7 +569,7 @@ restoreKeybd(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("keyboardDlg");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

24
cde/programs/dtstyle/MainWin.c
View file

@ -198,7 +198,7 @@ build_mainWindow(
n = 0;
tmpStr = (char *)XtMalloc(strlen(GETMESSAGE(4, 1, "Style Manager"))+1);
sprintf(tmpStr, GETMESSAGE(4, 1, "Style Manager"));
sprintf(tmpStr, "%s", GETMESSAGE(4, 1, "Style Manager"));
XtSetArg(args[n], XmNtitle, tmpStr); n++;
XtSetArg(args[n], XmNiconName,
(char *)GETMESSAGE(4, 37, "Style")); n++;
@ -474,68 +474,68 @@ ProcessComponentList(
{
cmp_string = CMPSTR(GETMESSAGE(4, 27, "Color"));
helpTag = HELP_COLOR_BUTTON;
dtIcon = _DtGetIconFileName(style.screen, COLOR_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, COLOR_ICON, NULL, NULL, 0);
style.workProcs = True;
}
else if (strcmp(string, FONT) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 28, "Font"));
dtIcon = _DtGetIconFileName(style.screen, FONT_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, FONT_ICON, NULL, NULL, 0);
helpTag = HELP_FONT_BUTTON;
}
else if (strcmp(string, BACKDROP) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 29, "Backdrop"));
dtIcon = _DtGetIconFileName(style.screen, BACKDROP_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, BACKDROP_ICON, NULL, NULL, 0);
helpTag = HELP_BACKDROP_BUTTON;
}
else if (strcmp(string, KEYBOARD) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 30, "Keyboard"));
dtIcon = _DtGetIconFileName(style.screen, KEYBOARD_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, KEYBOARD_ICON, NULL, NULL, 0);
helpTag = HELP_KEYBOARD_BUTTON;
}
else if (strcmp(string, MOUSE) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 31, "Mouse"));
dtIcon = _DtGetIconFileName(style.screen, MOUSE_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, MOUSE_ICON, NULL, NULL, 0);
helpTag = HELP_MOUSE_BUTTON;
}
else if (strcmp(string, BEEP) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 32, "Beep"));
dtIcon = _DtGetIconFileName(style.screen, BEEP_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, BEEP_ICON, NULL, NULL, 0);
helpTag = HELP_AUDIO_BUTTON;
}
else if (strcmp(string, SCREEN) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 33, "Screen"));
dtIcon = _DtGetIconFileName(style.screen, SCREEN_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, SCREEN_ICON, NULL, NULL, 0);
helpTag = HELP_SCREEN_BUTTON;
}
else if (strcmp(string, DTWM) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 38, "Window"));
dtIcon = _DtGetIconFileName(style.screen, DTWM_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, DTWM_ICON, NULL, NULL, 0);
helpTag = HELP_DTWM_BUTTON;
}
else if (strcmp(string, STARTUP) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 35, "Startup"));
dtIcon = _DtGetIconFileName(style.screen, STARTUP_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, STARTUP_ICON, NULL, NULL, 0);
helpTag = HELP_STARTUP_BUTTON;
}
else if (strcmp(string, I18N) == 0)
{
cmp_string = CMPSTR(GETMESSAGE(4, 34, "Intl'"));
dtIcon = _DtGetIconFileName(style.screen, I18N_ICON, NULL, NULL, NULL);
dtIcon = _DtGetIconFileName(style.screen, I18N_ICON, NULL, NULL, 0);
helpTag = HELP_I18N_BUTTON;
}
else
@ -717,7 +717,7 @@ restoreMain(
xrm_name [0] = XrmStringToQuark ("mainWindow");
xrm_name [1] = XrmStringToQuark ("ismapped");
xrm_name [2] = NULL;
xrm_name [2] = 0;
if (XrmQGetResource (db, xrm_name, xrm_name, &rep_type, &value)) {
/* Are we supposed to be mapped? */

2
cde/programs/dtstyle/Mouse.c
View file

@ -1706,7 +1706,7 @@ restoreMouse(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("Mouse");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

2
cde/programs/dtstyle/Screen.c
View file

@ -2843,7 +2843,7 @@ restoreScreen(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("Screen");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");

4
cde/programs/dtstyle/Startup.c
View file

@ -139,7 +139,7 @@ popup_startupBB(
if (style.startupDialog == NULL)
{
if (smWindow != NULL)
if (smWindow != 0)
{
if (style.smState.smCompatMode)
{
@ -660,7 +660,7 @@ restoreStartup(
XrmValue value;
xrm_name [0] = XrmStringToQuark ("startupDlg");
xrm_name [2] = NULL;
xrm_name [2] = 0;
/* get x position */
xrm_name [1] = XrmStringToQuark ("x");