From: <enl...@li...> - 2003-10-04 13:15:26
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: E.h Makefile.am alert.c dialog.c main.c timestamp.h Removed Files: scursor.c Log Message: Sat Oct 4 14:56:29 CEST 2003 (Kim) Removed unused scursor.c. =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v retrieving revision 1.138 retrieving revision 1.139 diff -u -3 -r1.138 -r1.139 --- E.h 28 Sep 2003 19:36:08 -0000 1.138 +++ E.h 4 Oct 2003 13:14:52 -0000 1.139 @@ -2845,16 +2845,6 @@ void (*func) (int val, void *data)); -Window SC_GetDestWin(void); -void SC_PassEvent(XEvent * ev); -void SC_Main(void); -void SC_Init(void); -void SC_SetWait(void); -void SC_Normal(void); -void SC_SetHotspot(int x, int y); -void SC_SetImage(char *file); -void SC_Kill(void); - /* fx.c exportable functions */ #define FX_OP_START 1 #define FX_OP_STOP 2 =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- Makefile.am 3 Aug 2003 20:49:52 -0000 1.18 +++ Makefile.am 4 Oct 2003 13:14:53 -0000 1.19 @@ -65,7 +65,6 @@ progress.c \ regex.c \ screen.c \ - scursor.c \ session.c \ settings.c \ setup.c \ =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/alert.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- alert.c 15 Jun 2003 15:27:04 -0000 1.22 +++ alert.c 4 Oct 2003 13:14:53 -0000 1.23 @@ -45,20 +45,13 @@ va_list ap; EDBUG(7, "Alert"); - SC_Kill(); + va_start(ap, fmt); -/* - * #ifdef __USE_GNU - */ Evsnprintf(text, 10240, fmt, ap); -/* - * #else - * vsprintf(text, fmt, ap); - * #endif - */ va_end(ap); AUDIO_PLAY("SOUND_ALERT"); ShowAlert(text); + EDBUG_RETURN_; } @@ -66,10 +59,11 @@ AssignTitleText(char *text) { EDBUG(7, "AssignTitleText"); + if (TitleText) Efree(TitleText); - TitleText = NULL; TitleText = duplicate(text); + EDBUG_RETURN_; } @@ -77,11 +71,12 @@ AssignIgnoreText(char *text) { EDBUG(7, "AssignIgnoreText"); + if (IgnoreText) Efree(IgnoreText); - IgnoreText = NULL; IgnoreText = Emalloc(strlen(text) + 6); sprintf(IgnoreText, "(F1) %s", text); + EDBUG_RETURN_; } @@ -89,11 +84,12 @@ AssignRestartText(char *text) { EDBUG(7, "AssignRestartText"); + if (RestartText) Efree(RestartText); - RestartText = NULL; RestartText = Emalloc(strlen(text) + 6); sprintf(RestartText, "(F2) %s", text); + EDBUG_RETURN_; } @@ -101,11 +97,12 @@ AssignExitText(char *text) { EDBUG(7, "AssignExitText"); + if (ExitText) Efree(ExitText); - ExitText = NULL; ExitText = Emalloc(strlen(text) + 6); sprintf(ExitText, "(F3) %s", text); + EDBUG_RETURN_; } =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -3 -r1.62 -r1.63 --- dialog.c 12 Jul 2003 15:04:31 -0000 1.62 +++ dialog.c 4 Oct 2003 13:14:53 -0000 1.63 @@ -285,7 +285,6 @@ char text[10240]; va_list ap; - SC_Kill(); va_start(ap, fmt); Evsnprintf(text, 10240, fmt, ap); va_end(ap); @@ -511,7 +510,6 @@ XClassHint *xch; Snapshot *sn; - SC_Kill(); if (d->title) { xtp.encoding = XA_STRING; =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- main.c 28 Sep 2003 19:21:34 -0000 1.60 +++ main.c 4 Oct 2003 13:14:53 -0000 1.61 @@ -233,9 +233,6 @@ BlumFlimFrub(); ZoomInit(); SetupDirs(); -/* SC_Init(); - * SC_SetHotspot(30, 30); - * SC_SetWait(); */ InitDesktopBgs(); GotoDesktop(0); CommsSetup(); @@ -330,7 +327,6 @@ } mode.startup = 0; - /* SC_Kill(); */ /* ok - paranoia - save current settings to disk */ if (root.scr == 0) autosave(); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/timestamp.h,v retrieving revision 1.533 retrieving revision 1.534 diff -u -3 -r1.533 -r1.534 --- timestamp.h 2 Oct 2003 18:54:18 -0000 1.533 +++ timestamp.h 4 Oct 2003 13:14:53 -0000 1.534 @@ -1 +1 @@ -#define E_CHECKOUT_DATE "$Date: 2003/10/02 18:54:18 $" +#define E_CHECKOUT_DATE "$Date: 2003/10/04 13:14:53 $" |