Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c borders.c config.c file.c
Log Message:
Fix some missing initialisations/assignments.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- actions.c 12 Jul 2003 15:04:30 -0000 1.106
+++ actions.c 28 Sep 2003 19:08:25 -0000 1.107
@@ -792,16 +792,19 @@
{
int n;
- n = fread(s, 1, FILEPATH_LEN_MAX, f);
+ n = fread(s, 1, FILEPATH_LEN_MAX - 1, f);
/* True64 bug workaround */
if (n == 0)
- fread(s, 1, FILEPATH_LEN_MAX, f);
- s[FILEPATH_LEN_MAX - 1] = 0;
- l = strlen(s);
- s[l - 1] = 0;
- sscanf(s, "%4000s", exe);
+ n = fread(s, 1, FILEPATH_LEN_MAX - 1, f);
+ if (n > 1)
+ {
+ s[n] = 0;
+ l = strlen(s);
+ s[l - 1] = 0;
+ sscanf(s, "%4000s", exe);
+ runApp(exe, s);
+ }
pclose(f);
- runApp(exe, s);
}
EDBUG_RETURN(0);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- borders.c 12 Jul 2003 15:04:30 -0000 1.97
+++ borders.c 28 Sep 2003 19:08:26 -0000 1.98
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors
*
@@ -1230,6 +1229,7 @@
CalcEwinWinpart(ewin, i);
for (i = 0; i < ewin->border->num_winparts; i++)
RealiseEwinWinpart(ewin, i);
+
reshape = 0;
for (i = 0; i < ewin->border->num_winparts; i++)
{
@@ -1251,6 +1251,7 @@
PropagateShapes(ewin->win);
ewin->shapedone = 1;
}
+
EDBUG_RETURN_;
}
@@ -1432,6 +1433,7 @@
ewin->client.aspect_max = 65535.0;
ewin->client.w_inc = 1;
ewin->client.h_inc = 1;
+ ewin->client.grav = 0;
ewin->client.base_w = 0;
ewin->client.base_h = 0;
ewin->client.width.min = 0;
@@ -1484,6 +1486,7 @@
ewin->neverfocus = 0;
ewin->neverraise = 0;
ewin->focusclick = 0;
+ ewin->ewmh_flags = 0;
ewin->menu = NULL;
ewin->dialog = NULL;
ewin->shownmenu = 0;
@@ -1570,11 +1573,14 @@
}
}
if (ewin == mode.focuswin)
+ {
#if 0 /* Clean up if OK -- Remove FocusToNone */
- FocusToNone();
+ FocusToNone();
#else
- FocusToEWin(NULL);
+ mode.focuswin = NULL;
+ FocusToEWin(NULL);
#endif
+ }
if (ewin->pager)
PagerKill(ewin->pager);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- config.c 17 Aug 2003 10:15:15 -0000 1.65
+++ config.c 28 Sep 2003 19:08:27 -0000 1.66
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors
*
@@ -217,6 +216,7 @@
while (GetLine(s, sizeof(s), ConfigFile))
{
+ i1 = i2 = 0;
fields = sscanf(s, "%i %i", &i1, &i2);
if (i1 == CONFIG_CLOSE)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- file.c 22 May 2003 19:15:00 -0000 1.47
+++ file.c 28 Sep 2003 19:08:27 -0000 1.48
@@ -271,15 +271,11 @@
EDBUG(9, "moddate");
if ((!s) || (!*s))
EDBUG_RETURN(0);
- if (!stat(s, &st) < 0)
+ if (stat(s, &st) < 0)
EDBUG_RETURN(0);
if (st.st_mtime > st.st_ctime)
- {
- EDBUG_RETURN(st.st_mtime);
- }
- else
- EDBUG_RETURN(st.st_ctime);
- EDBUG_RETURN(0);
+ EDBUG_RETURN(st.st_mtime);
+ EDBUG_RETURN(st.st_ctime);
}
int
@@ -355,7 +351,7 @@
EDBUG(9, "permissions");
if ((!s) || (!*s))
EDBUG_RETURN(0);
- if (!stat(s, &st) < 0)
+ if (stat(s, &st) < 0)
EDBUG_RETURN(0);
EDBUG_RETURN(st.st_mode);
}
@@ -368,7 +364,7 @@
EDBUG(9, "owner");
if ((!s) || (!*s))
EDBUG_RETURN(0);
- if (!stat(s, &st) < 0)
+ if (stat(s, &st) < 0)
EDBUG_RETURN(0);
EDBUG_RETURN(st.st_uid);
}
@@ -381,7 +377,7 @@
EDBUG(9, "group");
if ((!s) || (!*s))
EDBUG_RETURN(0);
- if (!stat(s, &st) < 0)
+ if (stat(s, &st) < 0)
EDBUG_RETURN(0);
EDBUG_RETURN(st.st_gid);
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
