e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fri Oct 1 15:08:47 PDT 1999 

(Raster)

reload_menus segv fixed :)


SVN revision: 546
This commit is contained in:
Carsten Haitzler 1999-10-01 19:54:23 +00:00
parent 9738b3eda8
commit c33063bac2
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -2660,3 +2660,10 @@ Fri Oct 1 13:35:50 PDT 1999
wrote some code for "first time initialization" cruft.
should generate the user menus in ~/.enlightenment, as well as run dox for the
first time.
-------------------------------------------------------------------------------
Fri Oct 1 15:08:47 PDT 1999
(Raster)
reload_menus segv fixed :)

2
src/actions.c
View File

@ -498,6 +498,8 @@ spawnMenu(void *params)
EDBUG(6, "spawnMenu");
if (!params)
EDBUG_RETURN(0);
if (mode.cur_menu_depth > 0)
EDBUG_RETURN(0);
sscanf((char *)params, "%1000s %1000s", s, s2);
ewin = mode.ewin = GetFocusEwin();
for (i = 0; i < mode.numdesktops; i++)

2
src/main.c
View File

@ -1,7 +1,7 @@
#include "E.h"
#include "timestamp.h"
static void
static void
runDocBrowser(void)
{

18
src/menus.c
View File

@ -507,6 +507,7 @@ void
DestroyMenu(Menu * m)
{
int i, j;
char s[4096];
EDBUG(5, "DestroyMenu");
if (!m)
@ -515,16 +516,9 @@ DestroyMenu(Menu * m)
if (m->win)
EDestroyWindow(disp, m->win);
Esnprintf(s, sizeof(s), "__.%s", m->name);
RemoveTimerEvent(s);
RemoveItem((char *)m, m->win, LIST_FINDBY_POINTER, LIST_TYPE_MENU);
if (m->last_change)
{
char s[4096];
Esnprintf(s, sizeof(s), "__.%s", m->name);
RemoveTimerEvent(s);
}
if (m->name)
Efree(m->name);
@ -533,7 +527,11 @@ DestroyMenu(Menu * m)
if (m->items[i])
{
if (m->items[i]->child)
DestroyMenu(m->items[i]->child);
{
if (FindItem((char *)m->items[i]->child, 0,
LIST_FINDBY_POINTER, LIST_TYPE_MENU))
DestroyMenu(m->items[i]->child);
}
if (m->items[i]->text)
Efree(m->items[i]->text);
if (m->items[i]->params)

12
src/setup.c
View File

@ -2,7 +2,7 @@
#include "E.h"
#include <X11/keysym.h>
void
void
MapUnmap(int start)
{
/* this function will map and unmap all the windows based on the progress
@ -82,7 +82,7 @@ MapUnmap(int start)
EDBUG_RETURN_;
}
void
void
SetupSignals()
{
@ -165,7 +165,7 @@ SetupSignals()
EDBUG_RETURN_;
}
void
void
SetupX()
{
@ -583,7 +583,7 @@ SetupX()
EDBUG_RETURN_;
}
void
void
SetupDirs()
{
char s[1024], ss[1024];
@ -625,7 +625,7 @@ SetupDirs()
EDBUG_RETURN_;
}
void
void
SetupEnv()
{
char s[1024];
@ -831,7 +831,7 @@ MakeExtInitWin(void)
exit(0);
}
void
void
SetupUserInitialization()
{