Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h alert.c config.c dialog.c events.c globals.c handlers.c
main.c memory.c misc.c session.c setup.c sound.c
Log Message:
Change some ALERT macro stuff to function calls.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -3 -r1.219 -r1.220
--- E.h 9 Mar 2004 19:07:05 -0000 1.219
+++ E.h 11 Mar 2004 16:58:12 -0000 1.220
@@ -204,18 +204,6 @@
/* long's on 64bit machines... thus well the CARD32's Im unsing shoudl be.. */
#define CARD32 long
-#define RESET_ALERT \
- AssignTitleText(_("Enlightenment Message Dialog")); \
- AssignIgnoreText(_("Ignore this")); \
- AssignRestartText(_("Restart Enlightenment")); \
- AssignExitText(_("Quit Enlightenment"));
-
-#define ASSIGN_ALERT(a, b, c, d) \
- AssignTitleText(a); \
- AssignIgnoreText(b); \
- AssignRestartText(c); \
- AssignExitText(d);
-
#ifndef HAVE_GETCWD
#error "ERROR: Enlightenment needs a system with getcwd() in it's libs."
#error "You may have to upgrade your Operating system, Distribution, base"
@@ -1589,7 +1577,11 @@
int doDragButtonEnd(void *params);
/* alert.c */
-void Alert(char *fmt, ...);
+void AlertInit(void);
+void Alert(const char *fmt, ...);
+void AlertX(const char *title, const char *ignore,
+ const char *restart, const char *exit,
+ const char *fmt, ...);
void InitStringList(void);
void AssignIgnoreFunction(int (*FunctionToAssign) (void *),
void *params);
@@ -1597,10 +1589,10 @@
void *params);
void AssignExitFunction(int (*FunctionToAssign) (void *),
void *params);
-void AssignTitleText(char *text);
-void AssignIgnoreText(char *text);
-void AssignRestartText(char *text);
-void AssignExitText(char *text);
+void AssignTitleText(const char *text);
+void AssignIgnoreText(const char *text);
+void AssignRestartText(const char *text);
+void AssignExitText(const char *text);
/* areas.c */
void AreaFix(int *ax, int *ay);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/alert.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- alert.c 28 Feb 2004 15:13:58 -0000 1.28
+++ alert.c 11 Mar 2004 16:58:12 -0000 1.29
@@ -39,7 +39,49 @@
static char *TitleText = NULL;
void
-Alert(char *fmt, ...)
+AlertInit(void)
+{
+ /* Set up all the text bits that belong on the GSOD */
+ AssignTitleText(_("Enlightenment Message Dialog"));
+ AssignIgnoreText(_("Ignore this"));
+ AssignRestartText(_("Restart Enlightenment"));
+ AssignExitText(_("Quit Enlightenment"));
+
+ /* We'll set up what the buttons do now, too */
+ AssignRestartFunction(SessionExit, "restart");
+ AssignExitFunction(SessionExit, NULL);
+}
+
+void
+AlertX(const char *title, const char *ignore,
+ const char *restart, const char *exit, const char *fmt, ...)
+{
+ char text[10240];
+ va_list ap;
+
+ EDBUG(7, "AlertX");
+
+ AssignTitleText(title);
+ AssignIgnoreText(ignore);
+ AssignRestartText(restart);
+ AssignExitText(exit);
+
+ va_start(ap, fmt);
+ Evsnprintf(text, 10240, fmt, ap);
+ va_end(ap);
+ SoundPlay("SOUND_ALERT");
+ ShowAlert(text);
+
+ AssignTitleText(_("Enlightenment Message Dialog"));
+ AssignIgnoreText(_("Ignore this"));
+ AssignRestartText(_("Restart Enlightenment"));
+ AssignExitText(_("Quit Enlightenment"));
+
+ EDBUG_RETURN_;
+}
+
+void
+Alert(const char *fmt, ...)
{
char text[10240];
va_list ap;
@@ -56,7 +98,7 @@
}
void
-AssignTitleText(char *text)
+AssignTitleText(const char *text)
{
EDBUG(7, "AssignTitleText");
@@ -68,7 +110,7 @@
}
void
-AssignIgnoreText(char *text)
+AssignIgnoreText(const char *text)
{
EDBUG(7, "AssignIgnoreText");
@@ -81,7 +123,7 @@
}
void
-AssignRestartText(char *text)
+AssignRestartText(const char *text)
{
EDBUG(7, "AssignRestartText");
@@ -94,7 +136,7 @@
}
void
-AssignExitText(char *text)
+AssignExitText(const char *text)
{
EDBUG(7, "AssignExitText");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- config.c 7 Mar 2004 07:17:51 -0000 1.93
+++ config.c 11 Mar 2004 16:58:12 -0000 1.94
@@ -553,16 +553,14 @@
}
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current Text"
- " definition:\n" "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current Text"
+ " definition:\n" "%s\nWill ignore and continue...\n"), s);
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a text block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a text block. Outcome is likely not good.\n"));
}
static void
@@ -629,16 +627,14 @@
}
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current Text "
- "definition:\n" "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current Text "
+ "definition:\n" "%s\nWill ignore and continue...\n"), s);
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Slideout block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Slideout block. Outcome is likely not good.\n"));
}
static void
@@ -951,16 +947,14 @@
break;
default:
RecoverUserConfig();
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current Control "
- "definition:\n" "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current Control "
+ "definition:\n" "%s\nWill ignore and continue...\n"), s);
}
}
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Control block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Control block. Outcome is likely not good.\n"));
}
static void
@@ -1068,9 +1062,8 @@
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Menu block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Menu block. Outcome is likely not good.\n"));
}
static void
@@ -1297,9 +1290,8 @@
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Menu block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Menu block. Outcome is likely not good.\n"));
}
static void
@@ -1434,9 +1426,8 @@
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a BorderPart block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a BorderPart block. Outcome is likely not good.\n"));
}
static void
@@ -1524,9 +1515,8 @@
}
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Main Border block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Main Border block. Outcome is likely not good.\n"));
}
static void
@@ -1743,9 +1733,8 @@
Efree(name);
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Button block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Button block. Outcome is likely not good.\n"));
return;
}
@@ -2003,9 +1992,8 @@
Efree(bg2);
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Desktop block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Desktop block. Outcome is likely not good.\n"));
return;
}
@@ -2086,9 +2074,8 @@
Efree(name);
if (file)
Efree(file);
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading a Desktop block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading a Desktop block. Outcome is likely not good.\n"));
}
static void
@@ -2129,9 +2116,8 @@
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an Iconbox block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an Iconbox block. Outcome is likely not good.\n"));
}
static void
@@ -2164,9 +2150,8 @@
sc = SclassCreate(s1, s2);
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an Sound block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an Sound block. Outcome is likely not good.\n"));
}
static void
@@ -2418,11 +2403,10 @@
break;
default:
RecoverUserConfig();
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- "ActionClass definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ "ActionClass definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
@@ -2433,9 +2417,8 @@
if (action_tooltipstring)
Efree(action_tooltipstring);
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an Action Class block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an Action Class block. Outcome is likely not good.\n"));
}
static void
@@ -2635,17 +2618,15 @@
ICToRead = ic->sticky_active.disabled;
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- "ImageClass definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ "ImageClass definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an ImageClass block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an ImageClass block. Outcome is likely not good.\n"));
}
static void
@@ -2883,11 +2864,10 @@
break;
default:
RecoverUserConfig();
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- " ColorModifier definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ " ColorModifier definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
@@ -2908,10 +2888,9 @@
Efree(by);
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an ColorModifier block.\n"
- "Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an ColorModifier block.\n"
+ "Outcome is likely not good.\n"));
return;
}
@@ -3000,17 +2979,15 @@
FindItem(s2, 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- "ToolTip definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ "ToolTip definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an ToolTip block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an ToolTip block. Outcome is likely not good.\n"));
}
@@ -3047,9 +3024,8 @@
}
}
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an FX block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an FX block. Outcome is likely not good.\n"));
}
static void
@@ -3138,18 +3114,16 @@
return;
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- "Iconbox definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ "Iconbox definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an Iconbox block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an Iconbox block. Outcome is likely not good.\n"));
}
static void
@@ -3184,18 +3158,16 @@
return;
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- "Extras definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ "Extras definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
RecoverUserConfig();
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an Extras block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an Extras block. Outcome is likely not good.\n"));
}
static void
@@ -3300,17 +3272,15 @@
bm->make_sticky = atoi(s2);
break;
default:
- Alert(_
- ("Warning: unable to determine what to do with\n"
- "the following text in the middle of current "
- "WindowMatch definition:\n"
- "%s\nWill ignore and continue...\n"), s);
+ Alert(_("Warning: unable to determine what to do with\n"
+ "the following text in the middle of current "
+ "WindowMatch definition:\n"
+ "%s\nWill ignore and continue...\n"), s);
break;
}
}
- Alert(_
- ("Warning: Configuration appears to have ended before we were\n"
- "Done loading an WindowMatch block. Outcome is likely not good.\n"));
+ Alert(_("Warning: Configuration appears to have ended before we were\n"
+ "Done loading an WindowMatch block. Outcome is likely not good.\n"));
}
static char *cfg_tmpfile = NULL;
@@ -3338,12 +3308,11 @@
if ((!have_epp) && (!(isfile(epp_path)) && (canexec(epp_path))))
{
- Alert(_
- ("Help! Cannot find epp!\n"
- "Enlightenment is looking for epp here:\n" "%s\n"
- "This is a FATAL ERROR.\n"
- "This is probably due to either the program not existing or\n"
- "it not being able to be executed by you.\n"), epp_path);
+ Alert(_("Help! Cannot find epp!\n"
+ "Enlightenment is looking for epp here:\n" "%s\n"
+ "This is a FATAL ERROR.\n"
+ "This is probably due to either the program not existing or\n"
+ "it not being able to be executed by you.\n"), epp_path);
SessionExit("error");
}
else
@@ -3446,53 +3415,51 @@
{
if (!is_autosave)
{
- ASSIGN_ALERT(_("Theme versioning ERROR"),
- _("Restart with Defaults"), " ",
- _("Abort and Exit"));
- Alert(_
- ("ERROR:\n" "\n"
- "The configuration for the theme you are "
- "running is\n"
- "incompatible. It's config revision is %i. "
- "It needs to\n" "be marked as being revision %i\n"
- "\n" "Please contact the theme author or "
- "maintainer and\n"
- "inform them that in order for their theme "
- "to function\n"
- "with this version of Enlightenment, they "
- "have to\n"
- "update it to the current settings, and "
- "then match\n" "the revision number.\n" "\n"
- "If the theme revision is higher than "
- "Enlightenment's\n"
- "it may be that you haven't upgraded "
- "Enlightenment for\n"
- "a while and this theme takes advantages of new\n"
- "features in Enlightenment in new versions.\n"),
- e_cfg_ver, min_e_cfg_ver);
- RESET_ALERT;
+ AlertX(_("Theme versioning ERROR"),
+ _("Restart with Defaults"), " ",
+ _("Abort and Exit"),
+ _("ERROR:\n" "\n"
+ "The configuration for the theme you are "
+ "running is\n"
+ "incompatible. It's config revision is %i. "
+ "It needs to\n"
+ "be marked as being revision %i\n" "\n"
+ "Please contact the theme author or "
+ "maintainer and\n"
+ "inform them that in order for their theme "
+ "to function\n"
+ "with this version of Enlightenment, they "
+ "have to\n"
+ "update it to the current settings, and "
+ "then match\n" "the revision number.\n" "\n"
+ "If the theme revision is higher than "
+ "Enlightenment's\n"
+ "it may be that you haven't upgraded "
+ "Enlightenment for\n"
+ "a while and this theme takes advantages of new\n"
+ "features in Enlightenment in new versions.\n"),
+ e_cfg_ver, min_e_cfg_ver);
SessionExit("restart_theme DEFAULT");
}
else
{
conf.autosave = 0;
- ASSIGN_ALERT(_("User Config Version ERROR"),
- _("Restart with Defaults"), " ",
- _("Abort and Exit"));
- Alert(_
- ("ERROR:\n" "\n" "The settings you are using are "
- "incompatible with\n"
- "this version of Enlightenment.\n"
- "It's revision is %i It needs to be revision "
- "%i to\n" "be compatible.\n" "\n"
- "If you just upgraded to a new version of E\n"
- "Restarting with Defaults will remove your current\n"
- "user preferences and start cleanly with system\n"
- "defaults. You can then modify your "
- "configuration to\n"
- "your liking again safely.\n"), e_cfg_ver,
- min_e_cfg_ver);
- RESET_ALERT;
+ AlertX(_("User Config Version ERROR"),
+ _("Restart with Defaults"), " ",
+ _("Abort and Exit"),
+ _("ERROR:\n" "\n"
+ "The settings you are using are "
+ "incompatible with\n"
+ "this version of Enlightenment.\n"
+ "It's revision is %i It needs to be revision "
+ "%i to\n" "be compatible.\n" "\n"
+ "If you just upgraded to a new version of E\n"
+ "Restarting with Defaults will remove your current\n"
+ "user preferences and start cleanly with system\n"
+ "defaults. You can then modify your "
+ "configuration to\n"
+ "your liking again safely.\n"), e_cfg_ver,
+ min_e_cfg_ver);
SessionExit("restart");
}
}
@@ -3727,39 +3694,37 @@
Esnprintf(ss, sizeof(ss), "%s/user_theme.cfg", EDirUser());
mv(s, ss);
if (!isfile(ss))
- Alert(_
- ("WARNING!\n" "There was an error writing the file:\n" "%s\n"
- "This may be due to lack of disk space, quota or\n"
- "filesystem permissions.\n"), ss);
+ Alert(_("WARNING!\n" "There was an error writing the file:\n" "%s\n"
+ "This may be due to lack of disk space, quota or\n"
+ "filesystem permissions.\n"), ss);
}
theme = FindTheme(themelocation);
if (!theme)
{
- Alert(_
- ("Enlightenment has just experienced some major problems in\n"
- "attempting to load the theme you specified or the default\n"
- "configuration directory:\n" "%s/config/\n"
- "This will prevent Enlightenment from loading any "
- "configuration\n" "files at all.\n"
- "Since this couldn't be found Enlightenment is probably not\n"
- "going to find any configuration files anywhere on your\n"
- "system, and so it will have almost no configuration loaded\n"
- "when it starts up. This is most likely the sign of a bad\n"
- "installation of Enlightenment if this directory is missing.\n"
- "The likely causes are that the package was improperly built,\n"
- "if a binary package, or 'make install' hasn't been typed\n"
- "or during the installation the directory above was not\n"
- "able to be copied over for installation perhaps due to\n"
- "permissions or lack of disk space. It also could be that the\n"
- "config directory has been inadvertently deleted since\n"
- "installation.\n"
- "This is a serious problem and should be rectified immediately\n"
- "Please contact your system administrator or package "
- "maintainer.\n"
- "If you are the administrator of your own system please\n"
- "consult the documentation that came with Enlightenment for\n"
- "additional information.\n"), EDirRoot());
+ Alert(_("Enlightenment has just experienced some major problems in\n"
+ "attempting to load the theme you specified or the default\n"
+ "configuration directory:\n" "%s/config/\n"
+ "This will prevent Enlightenment from loading any "
+ "configuration\n" "files at all.\n"
+ "Since this couldn't be found Enlightenment is probably not\n"
+ "going to find any configuration files anywhere on your\n"
+ "system, and so it will have almost no configuration loaded\n"
+ "when it starts up. This is most likely the sign of a bad\n"
+ "installation of Enlightenment if this directory is missing.\n"
+ "The likely causes are that the package was improperly built,\n"
+ "if a binary package, or 'make install' hasn't been typed\n"
+ "or during the installation the directory above was not\n"
+ "able to be copied over for installation perhaps due to\n"
+ "permissions or lack of disk space. It also could be that the\n"
+ "config directory has been inadvertently deleted since\n"
+ "installation.\n"
+ "This is a serious problem and should be rectified immediately\n"
+ "Please contact your system administrator or package "
+ "maintainer.\n"
+ "If you are the administrator of your own system please\n"
+ "consult the documentation that came with Enlightenment for\n"
+ "additional information.\n"), EDirRoot());
EDBUG_RETURN(0);
}
@@ -4251,16 +4216,14 @@
{
if (is_autosave)
{
- ASSIGN_ALERT(_("Recover system config?"), _("Yes, Attempt recovery"),
- _("Restart and try again"), _("Quit and give up"));
- Alert(_
- ("Enlightenment has encountered parsing errors in your autosaved\n"
- "configuration.\n" "\n"
- "This may be due to filing system errors, Minor bugs or "
- "unforeseen\n" "system shutdowns.\n" "\n"
- "Do you wish Enlightenment to recover its original system\n"
- "configuration and try again?\n"));
- RESET_ALERT;
+ AlertX(_("Recover system config?"), _("Yes, Attempt recovery"),
+ _("Restart and try again"), _("Quit and give up"),
+ ("Enlightenment has encountered parsing errors in your autosaved\n"
+ "configuration.\n" "\n"
+ "This may be due to filing system errors, Minor bugs or "
+ "unforeseen\n" "system shutdowns.\n" "\n"
+ "Do you wish Enlightenment to recover its original system\n"
+ "configuration and try again?\n"));
conf.autosave = 0;
MapUnmap(1);
if (getpid() == master_pid && init_win_ext)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- dialog.c 7 Mar 2004 08:14:24 -0000 1.79
+++ dialog.c 11 Mar 2004 16:58:13 -0000 1.80
@@ -2182,9 +2182,7 @@
va_start(ap, fmt);
Evsnprintf(text, 10240, fmt, ap);
va_end(ap);
- ASSIGN_ALERT(_("Attention !!!"), _("OK"), " ", " ");
- Alert(text);
- RESET_ALERT;
+ AlertX(_("Attention !!!"), _("OK"), " ", " ", text);
}
/*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- events.c 9 Mar 2004 20:32:14 -0000 1.55
+++ events.c 11 Mar 2004 16:58:13 -0000 1.56
@@ -73,15 +73,13 @@
}
else
{
- ASSIGN_ALERT(_("X server setup error"), "", "",
- _("Quit Enlightenment"));
- Alert(_
- ("FATAL ERROR:\n" "\n"
- "This Xserver does not support the Shape extension.\n"
- "This is required for Enlightenment to run.\n" "\n"
- "Your Xserver probably is too old or mis-configured.\n" "\n"
- "Exiting.\n"));
- RESET_ALERT;
+ AlertX(_("X server setup error"), "", "",
+ _("Quit Enlightenment"),
+ _("FATAL ERROR:\n" "\n"
+ "This Xserver does not support the Shape extension.\n"
+ "This is required for Enlightenment to run.\n" "\n"
+ "Your Xserver probably is too old or mis-configured.\n" "\n"
+ "Exiting.\n"));
EExit((void *)1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- globals.c 9 Mar 2004 19:07:05 -0000 1.31
+++ globals.c 11 Mar 2004 16:58:13 -0000 1.32
@@ -68,6 +68,6 @@
char *e_machine_name = NULL;
#ifdef DEBUG
-int call_level;
+int call_level = 0;
char *call_stack[1024];
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/handlers.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- handlers.c 18 Feb 2004 22:18:41 -0000 1.32
+++ handlers.c 11 Mar 2004 16:58:13 -0000 1.33
@@ -180,28 +180,25 @@
{
if ((!no_overwrite) && (mode.xselect))
{
- ASSIGN_ALERT(_("Another Window Manager is already running"),
- _("OK (edit file)"), "", _("Cancel (do NOT edit)"));
- Alert(_
- ("Another Window Manager is already running.\n" "\n"
- "You will have to quit your current Window Manager first before\n"
- "you can successfully run Enlightenment.\n" "\n"
- "If you haven't edited your user start-up files, Enlightenment\n"
- "can do that now for you, so when you log in again after\n"
- "quitting your current window manager, you will have\n"
- "Enlightenment running.\n" "\n"
- "If you want to do this, click OK, otherwise hit cancel\n"
- "to abort this operation and edit the files by hand.\n" "\n"
- "WARNING WARNING WARNING WARNING!\n" "\n"
- "It is possible that this MAY not properly edit your files.\n"));
- ASSIGN_ALERT(_("Are you sure?"), _("YES (edit file)"), "",
- _("NO (do not edit)"));
- Alert(_
- ("Are you absolutely sure you want to have Enlightenment\n"
- "edit your start-up files for you?\n" "\n"
- "If your start-up files are highly customised this may not\n"
- "work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
- RESET_ALERT;
+ AlertX(_("Another Window Manager is already running"),
+ _("OK (edit file)"), "", _("Cancel (do NOT edit)"),
+ _("Another Window Manager is already running.\n" "\n"
+ "You will have to quit your current Window Manager first
before\n"
+ "you can successfully run Enlightenment.\n" "\n"
+ "If you haven't edited your user start-up files, Enlightenment\n"
+ "can do that now for you, so when you log in again after\n"
+ "quitting your current window manager, you will have\n"
+ "Enlightenment running.\n" "\n"
+ "If you want to do this, click OK, otherwise hit cancel\n"
+ "to abort this operation and edit the files by hand.\n"
+ "\n" "WARNING WARNING WARNING WARNING!\n" "\n"
+ "It is possible that this MAY not properly edit your files.\n"));
+ AlertX(_("Are you sure?"), _("YES (edit file)"), "",
+ _("NO (do not edit)"),
+ _("Are you absolutely sure you want to have Enlightenment\n"
+ "edit your start-up files for you?\n" "\n"
+ "If your start-up files are highly customised this may not\n"
+ "work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
AddE();
EExit((void *)1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- main.c 9 Mar 2004 19:07:05 -0000 1.78
+++ main.c 11 Mar 2004 16:58:13 -0000 1.79
@@ -76,9 +76,6 @@
/* End of gettext stuff */
-#ifdef DEBUG
- call_level = 0;
-#endif
str = getenv("EDBUG");
if (str)
mode.debug = atoi(str);
@@ -94,16 +91,6 @@
lists = Emalloc(sizeof(List) * LIST_TYPE_COUNT);
lists = memset(lists, 0, (sizeof(List) * LIST_TYPE_COUNT));
- /* Set up all the text bits that belong on the GSOD */
- AssignTitleText(_("Enlightenment Message Dialog"));
- AssignIgnoreText(_("Ignore this"));
- AssignRestartText(_("Restart Enlightenment"));
- AssignExitText(_("Quit Enlightenment"));
-
- /* We'll set up what the buttons do now, too */
- AssignRestartFunction(SessionExit, "restart");
- AssignExitFunction(SessionExit, NULL);
-
srand(time(NULL));
if (!uname(&ubuf))
@@ -237,6 +224,7 @@
SetSMUserThemePath(themepath);
/* run most of the setup */
+ AlertInit(); /* Set up all the text bits that belong on the
GSOD */
SignalsSetup();
SetupX();
BlumFlimFrub();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/memory.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- memory.c 28 Feb 2004 15:14:01 -0000 1.33
+++ memory.c 11 Mar 2004 16:58:14 -0000 1.34
@@ -191,21 +191,20 @@
{
if (disp)
UngrabX();
- ASSIGN_ALERT(_("Cannot allocate enough memory"), _("Ignore this"),
- _("Restart Enlightenment"), _("Quit Enlightenment"));
- Alert(_
- ("WARNING!!!!!!\n" "\n"
- "Allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
- "\n" "Either this is a bug where ridiculous amounts of memory\n"
- "are being allocated, or your system has run out of both\n"
- "real and virtual memory and is unable to satisfy the request.\n"
- "\n"
- "If you have a low memory system it is suggested to either\n"
- "purchase more memory, increase SWAP space, or reconfigure\n"
- "Enlightenment to use less resources by turning features off.\n"
- "\n" "The malloc requested was at %s, line %d\n "), size,
- (float)size / 1024, (float)size / (1024 * 1024), file, line);
- RESET_ALERT;
+ AlertX(_("Cannot allocate enough memory"), _("Ignore this"),
+ _("Restart Enlightenment"), _("Quit Enlightenment"),
+ _("WARNING!!!!!!\n" "\n"
+ "Allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
+ "\n"
+ "Either this is a bug where ridiculous amounts of memory\n"
+ "are being allocated, or your system has run out of both\n"
+ "real and virtual memory and is unable to satisfy the request.\n"
+ "\n"
+ "If you have a low memory system it is suggested to either\n"
+ "purchase more memory, increase SWAP space, or reconfigure\n"
+ "Enlightenment to use less resources by turning features off.\n"
+ "\n" "The malloc requested was at %s, line %d\n "), size,
+ (float)size / 1024, (float)size / (1024 * 1024), file, line);
}
#ifdef DBUG_MEM
if (p)
@@ -267,19 +266,17 @@
{
if (disp)
UngrabX();
- ASSIGN_ALERT(_
- ("Error in reallocating memory that hasn't been allocated"),
- _("Ignore this"), _("Restart Enlightenment"),
- _("Quit Enlightenment"));
- Alert(_
- ("WARNING!!!!!!\n" "\n"
- "Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n"
- "for pointer %x is attempting to re-allocate memory for a\n"
- "memory chunk that has not been allocated or has already been\n"
- "freed.\n" "\n" "This is definitely a bug. Please report it.\n"
- "\n" "The error occurred at %s, line %d.\n"), size,
- (float)size / 1024, (float)size / (1024 * 1024), ptr, file, line);
- RESET_ALERT;
+ AlertX(_("Error in reallocating memory that hasn't been allocated"),
+ _("Ignore this"), _("Restart Enlightenment"),
+ _("Quit Enlightenment"),
+ _("WARNING!!!!!!\n" "\n"
+ "Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n"
+ "for pointer %x is attempting to re-allocate memory for a\n"
+ "memory chunk that has not been allocated or has already been\n"
+ "freed.\n" "\n" "This is definitely a bug. Please report it.\n"
+ "\n" "The error occurred at %s, line %d.\n"), size,
+ (float)size / 1024, (float)size / (1024 * 1024), ptr, file,
+ line);
EDBUG_RETURN(NULL);
}
#endif
@@ -288,21 +285,20 @@
{
if (disp)
UngrabX();
- ASSIGN_ALERT(_("Cannot allocate enough memory"), _("Ignore this"),
- _("Restart Enlightenment"), _("Quit Enlightenment"));
- Alert(_
- ("WARNING!!!!!!\n" "\n"
- "Re-allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
- "\n" "Either this is a bug where ridiculous amounts of memory\n"
- "are being allocated, or your system has run out of both\n"
- "real and virtual memory and is unable to satisfy the request.\n"
- "\n"
- "If you have a low memory system it is suggested to either\n"
- "purchase more memory, increase SWAP space, or reconfigure\n"
- "Enlightenment to use less resources by turning features off.\n"
- "\n" "The realloc requested was at %s, line %d\n "), size,
- (float)size / 1024, (float)size / (1024 * 1024), file, line);
- RESET_ALERT;
+ AlertX(_("Cannot allocate enough memory"), _("Ignore this"),
+ _("Restart Enlightenment"), _("Quit Enlightenment"),
+ _("WARNING!!!!!!\n" "\n"
+ "Re-allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
+ "\n"
+ "Either this is a bug where ridiculous amounts of memory\n"
+ "are being allocated, or your system has run out of both\n"
+ "real and virtual memory and is unable to satisfy the request.\n"
+ "\n"
+ "If you have a low memory system it is suggested to either\n"
+ "purchase more memory, increase SWAP space, or reconfigure\n"
+ "Enlightenment to use less resources by turning features off.\n"
+ "\n" "The realloc requested was at %s, line %d\n "), size,
+ (float)size / 1024, (float)size / (1024 * 1024), file, line);
}
#ifdef DBUG_MEM
if (p)
@@ -364,16 +360,14 @@
{
if (disp)
UngrabX();
- ASSIGN_ALERT(_("Error in freeing memory that hasn't been allocated"),
- _("Ignore this"), _("Restart Enlightenment"),
- _("Quit Enlightenment"));
- Alert(_
- ("WARNING!!!!!!\n" "\n"
- "freeing for pointer %x is attempting to free memory for a\n"
- "memory chunk that has not been allocated, or has already been\n"
- "freed.\n" "\n" "This is definitely a bug. Please report it.\n"
- "\n" "The error occurred at %s, line %d.\n"), ptr, file, line);
- RESET_ALERT;
+ AlertX(_("Error in freeing memory that hasn't been allocated"),
+ _("Ignore this"), _("Restart Enlightenment"),
+ _("Quit Enlightenment"),
+ _("WARNING!!!!!!\n" "\n"
+ "freeing for pointer %x is attempting to free memory for a\n"
+ "memory chunk that has not been allocated, or has already been\n"
+ "freed.\n" "\n" "This is definitely a bug. Please report it.\n"
+ "\n" "The error occurred at %s, line %d.\n"), ptr, file, line);
EDBUG_RETURN_;
}
#endif
@@ -381,17 +375,15 @@
{
if (disp)
UngrabX();
- ASSIGN_ALERT(_("Error in attempting to free NULL pointer"),
- _("Ignore this (safe)"), _("Restart Enlightenment"),
- _("Quit Enlightenment"));
- Alert(_
- ("WARNING!!!!!!\n" "\n"
- "Enlightenment attempted to free a NULL pointer.\n" "\n"
- "This is definitely a bug. Please report it.\n"
- "It is safe to ignore this error and continue running Enlightenment.\n"
- "\n" "The pointer value was %x.\n"
- "The error occurred at %s, line %d.\n"), ptr, file, line);
- RESET_ALERT;
+ AlertX(_("Error in attempting to free NULL pointer"),
+ _("Ignore this (safe)"), _("Restart Enlightenment"),
+ _("Quit Enlightenment"),
+ _("WARNING!!!!!!\n" "\n"
+ "Enlightenment attempted to free a NULL pointer.\n" "\n"
+ "This is definitely a bug. Please report it.\n"
+ "It is safe to ignore this error and continue running
Enlightenment.\n"
+ "\n" "The pointer value was %x.\n"
+ "The error occurred at %s, line %d.\n"), ptr, file, line);
EDBUG_RETURN_;
}
free(ptr);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- misc.c 5 Mar 2004 17:05:53 -0000 1.44
+++ misc.c 11 Mar 2004 16:58:14 -0000 1.45
@@ -44,27 +44,25 @@
Esnprintf(s, sizeof(s), "%s/%s", EDirBin(), bins[i]);
if (!exists(s))
{
- Alert(_
- ("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
- "Enlightenment's utility executable cannot be found at:\n"
- "\n" "%s\n"
- "This is a fatal error and Enlightenment will cease to run.\n"
- "Please rectify this situation and ensure it is installed\n"
- "correctly.\n" "\n"
- "The reason this could be missing is due to badly created\n"
- "packages, someone manually deleting that program or perhaps\n"
- "an error in installing Enlightenment.\n"), s);
+ Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
+ "Enlightenment's utility executable cannot be found at:\n"
+ "\n" "%s\n"
+ "This is a fatal error and Enlightenment will cease to run.\n"
+ "Please rectify this situation and ensure it is installed\n"
+ "correctly.\n" "\n"
+ "The reason this could be missing is due to badly created\n"
+ "packages, someone manually deleting that program or perhaps\n"
+ "an error in installing Enlightenment.\n"), s);
EExit(NULL);
}
if (!canexec(s))
{
- Alert(_
- ("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
- "Enlightenment's dox executable is not able to be executed:\n"
- "\n" "%s\n"
- "This is a fatal error and Enlightenment will cease to run.\n"
- "Please rectify this situation and ensure dox is installed\n"
- "correctly.\n"), s);
+ Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
+ "Enlightenment's dox executable is not able to be executed:\n"
+ "\n" "%s\n"
+ "This is a fatal error and Enlightenment will cease to run.\n"
+ "Please rectify this situation and ensure dox is installed\n"
+ "correctly.\n"), s);
EExit(NULL);
}
}
@@ -74,15 +72,14 @@
Esnprintf(s, sizeof(s), "%s/%s", EDirRoot(), thms[i]);
if (!exists(s))
{
- Alert(_
- ("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
- "Enlightenment's DEFAULT installed theme is missing or
inadequately\n"
- "configured to be a useful DEFAULT theme.\n" "\n"
- "This is a fatal error and Enlightenment will cease to run.\n"
- "Please rectify this situation and ensure it is installed\n"
- "correctly. The DEFAULT theme Enlightenment comes with normally\n"
- "is BrushedMetal-Tigert and this theme is adequate for a DEFAULT\n"
- "theme.\n"));
+ Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
+ "Enlightenment's DEFAULT installed theme is missing or
inadequately\n"
+ "configured to be a useful DEFAULT theme.\n" "\n"
+ "This is a fatal error and Enlightenment will cease to run.\n"
+ "Please rectify this situation and ensure it is installed\n"
+ "correctly. The DEFAULT theme Enlightenment comes with normally\n"
+ "is BrushedMetal-Tigert and this theme is adequate for a
DEFAULT\n"
+ "theme.\n"));
EExit(NULL);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- session.c 29 Feb 2004 01:30:17 -0000 1.55
+++ session.c 11 Mar 2004 16:58:14 -0000 1.56
@@ -257,12 +257,11 @@
Esnprintf(ss, sizeof(ss), "%s.clients.%i", GetSMFile(), root.scr);
mv(s, ss);
if (!isfile(ss))
- Alert(_
- ("There was an error writing the clients "
- "session save file.\n" "You may have run out of disk "
- "space, not have permission\n"
- "to write to your filing system "
- "or other similar problems.\n"));
+ Alert(_("There was an error writing the clients "
+ "session save file.\n" "You may have run out of disk "
+ "space, not have permission\n"
+ "to write to your filing system "
+ "or other similar problems.\n"));
}
Efree(lst);
}
@@ -441,9 +440,8 @@
SaveUserControlConfig(fopen(s, "w"));
mv(s, GetGenericSMFile());
if (!isfile(GetGenericSMFile()))
- Alert(_
- ("There was an error saving your autosave data - filing\n"
- "system problems.\n"));
+ Alert(_("There was an error saving your autosave data - filing\n"
+ "system problems.\n"));
/*
* if (strcmp(GetSMFile(), GetGenericSMFile()))
* {
@@ -856,13 +854,12 @@
if (status == IceProcessMessagesIOError)
{
/* Less of the hope.... E survives */
- DialogAlert(_
- ("ERROR!\n" "\n"
- "Lost the Session Manager that was there?\n"
- "Here here session manager... come here... want a bone?\n"
- "Oh come now! Stop sulking! Bugger. Oh well. "
- "Will continue without\n" "a session manager.\n" "\n"
- "I'll survive somehow.\n" "\n" "\n" "... I hope.\n"));
+ DialogAlert(_("ERROR!\n" "\n"
+ "Lost the Session Manager that was there?\n"
+ "Here here session manager... come here... want a bone?\n"
+ "Oh come now! Stop sulking! Bugger. Oh well. "
+ "Will continue without\n" "a session manager.\n" "\n"
+ "I'll survive somehow.\n" "\n" "\n" "... I hope.\n"));
SmcCloseConnection(sm_conn, 0, NULL);
sm_conn = NULL;
sm_fd = -1;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- setup.c 9 Mar 2004 19:07:05 -0000 1.114
+++ setup.c 11 Mar 2004 16:58:14 -0000 1.115
@@ -122,17 +122,16 @@
/* if cannot connect to display */
if (!disp)
{
- Alert(_
- ("Enlightenment cannot connect to the display nominated by\n"
- "your shell's DISPLAY environment variable. You may set this\n"
- "variable to indicate which display name Enlightenment is to\n"
- "connect to. It may be that you do not have an Xserver already\n"
- "running to serve that Display connection, or that you do not\n"
- "have permission to connect to that display. Please make sure\n"
- "all is correct before trying again. Run an Xserver by running\n"
- "xdm or startx first, or contact your local system\n"
- "administrator, or Xserver vendor, or read the X, xdm and\n"
- "startx manual pages before proceeding.\n"));
+ Alert(_("Enlightenment cannot connect to the display nominated by\n"
+ "your shell's DISPLAY environment variable. You may set this\n"
+ "variable to indicate which display name Enlightenment is to\n"
+ "connect to. It may be that you do not have an Xserver already\n"
+ "running to serve that Display connection, or that you do not\n"
+ "have permission to connect to that display. Please make sure\n"
+ "all is correct before trying again. Run an Xserver by running\n"
+ "xdm or startx first, or contact your local system\n"
+ "administrator, or Xserver vendor, or read the X, xdm and\n"
+ "startx manual pages before proceeding.\n"));
EExit((void *)1);
}
root.scr = DefaultScreen(disp);
@@ -217,26 +216,22 @@
IMLIB1_SET_CONTEXT(0);
if (!pImlib_Context)
{
- ASSIGN_ALERT(_("Imlib initialisation error"), "", "",
- _("Quit Enlightenment"));
- Alert(_
- ("FATAL ERROR:\n" "\n"
- "Enlightenment is unable to initialise Imlib.\n" "\n"
- "This is unusual. Unable to continue.\n" "Exiting.\n"));
- RESET_ALERT;
+ AlertX(_("Imlib initialisation error"), "", "",
+ _("Quit Enlightenment"),
+ _("FATAL ERROR:\n" "\n"
+ "Enlightenment is unable to initialise Imlib.\n" "\n"
+ "This is unusual. Unable to continue.\n" "Exiting.\n"));
EExit((void *)1);
}
#if USE_FNLIB
pFnlibData = Fnlib_init(pImlib_Context);
if (!pFnlibData)
{
- ASSIGN_ALERT(_("X server setup error"), "", "",
- _("Quit Enlightenment"));
- Alert(_
- ("FATAL ERROR:\n" "\n"
- "Enlightenment is unable to initialise Fnlib.\n" "\n"
- "This is unusual. Unable to continue.\n" "Exiting.\n"));
- RESET_ALERT;
+ AlertX(_("X server setup error"), "", "",
+ _("Quit Enlightenment"),
+ _("FATAL ERROR:\n" "\n"
+ "Enlightenment is unable to initialise Fnlib.\n" "\n"
+ "This is unusual. Unable to continue.\n" "Exiting.\n"));
EExit((void *)1);
}
#endif
@@ -281,16 +276,14 @@
/* warn, if necessary about X version problems */
if (ProtocolVersion(disp) != 11)
{
- ASSIGN_ALERT(_("X server version error"), _("Ignore this error"), "",
- _("Quit Enlightenment"));
- Alert(_
- ("WARNING:\n"
- "This is not an X11 Xserver. It in fact talks the X%i protocol.\n"
- "This may mean Enlightenment will either not function, or\n"
- "function incorrectly. If it is later than X11, then your\n"
- "server is one the author of Enlightenment neither have\n"
- "access to, nor have heard of.\n"), ProtocolVersion(disp));
- RESET_ALERT;
+ AlertX(_("X server version error"), _("Ignore this error"), "",
+ _("Quit Enlightenment"),
+ _("WARNING:\n"
+ "This is not an X11 Xserver. It in fact talks the X%i protocol.\n"
+ "This may mean Enlightenment will either not function, or\n"
+ "function incorrectly. If it is later than X11, then your\n"
+ "server is one the author of Enlightenment neither have\n"
+ "access to, nor have heard of.\n"), ProtocolVersion(disp));
}
/* now we'll set the locale */
setlocale(LC_ALL, "");
@@ -452,34 +445,31 @@
{
if (!isdir(d))
{
- Alert(_
- ("The directory %s is apparently not a directory\n"
- "This is a fatal condition.\n" "Please remove this file\n"), d);
+ Alert(_("The directory %s is apparently not a directory\n"
+ "This is a fatal condition.\n" "Please remove this file\n"), d);
EExit((void *)1);
}
if (!canexec(d))
{
- Alert(_
- ("Do not have execute access to %s\n"
- "This is a fatal condition.\n"
- "Please check the ownership and permissions of this\n"
- "directory and take steps to rectify this.\n"), d);
+ Alert(_("Do not have execute access to %s\n"
+ "This is a fatal condition.\n"
+ "Please check the ownership and permissions of this\n"
+ "directory and take steps to rectify this.\n"), d);
EExit((void *)1);
}
if (!canread(d))
{
- Alert(_
- ("Do not have read access to %s\n" "This is a fatal condition.\n"
- "Please check the ownership and permissions of this\n"
- "directory and take steps to rectify this.\n"), d);
+ Alert(_("Do not have read access to %s\n" "This is a fatal condition.\n"
+ "Please check the ownership and permissions of this\n"
+ "directory and take steps to rectify this.\n"), d);
EExit((void *)1);
}
if (!canwrite(d))
{
- Alert(_
- ("Do not have write access to %s\n" "This is a fatal condition.\n"
- "Please check the ownership and permissions of this\n"
- "directory and take steps to rectify this.\n"), d);
+ Alert(_("Do not have write access to %s\n"
+ "This is a fatal condition.\n"
+ "Please check the ownership and permissions of this\n"
+ "directory and take steps to rectify this.\n"), d);
EExit((void *)1);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- sound.c 28 Feb 2004 15:14:02 -0000 1.22
+++ sound.c 11 Mar 2004 16:58:14 -0000 1.23
@@ -301,12 +301,10 @@
sound_fd = fd;
else
{
- ASSIGN_ALERT(_("Error initialising sound"), _("OK"), " ", " ");
- Alert(_
- ("Audio was enabled for Enlightenment but there was an error\n"
- "communicating with the audio server (Esound). Audio will\n"
- "now be disabled.\n"));
- RESET_ALERT;
+ AlertX(_("Error initialising sound"), _("OK"), " ", " ",
+ _("Audio was enabled for Enlightenment but there was an error\n"
+ "communicating with the audio server (Esound). Audio will\n"
+ "now be disabled.\n"));
conf.sound = 0;
}
#else
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
