Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c borders.c buttons.c evhandlers.c iconify.c
setup.c
Log Message:
Delete unused mode item, move a "private" one.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -3 -r1.160 -r1.161
--- E.h 13 Dec 2003 14:08:35 -0000 1.160
+++ E.h 13 Dec 2003 14:12:22 -0000 1.161
@@ -1288,8 +1288,6 @@
Colormap current_cmap;
char autosave;
char memory_paranoia;
- char destroy;
- char adestroy;
Slideout *slideout;
Window context_win;
char tooltips;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- actions.c 11 Dec 2003 21:13:50 -0000 1.117
+++ actions.c 13 Dec 2003 14:12:22 -0000 1.118
@@ -26,6 +26,8 @@
#include <process.h>
#endif
+static char mode_action_destroy = 0;
+
ActionClass *
CreateAclass(char *name)
{
@@ -291,7 +293,7 @@
if (ActionClassToRemove->tooltipstring)
Efree(ActionClassToRemove->tooltipstring);
Efree(ActionClassToRemove);
- mode.adestroy = 1;
+ mode_action_destroy = 1;
EDBUG_RETURN_;
}
@@ -411,11 +413,11 @@
break;
}
- mode.adestroy = 0;
+ mode_action_destroy = 0;
for (i = 0; i < a->num; i++)
{
- if (!mode.adestroy)
+ if (!mode_action_destroy)
{
act = a->list[i];
ok = 0;
@@ -472,12 +474,12 @@
}
}
}
- if (mode.adestroy)
+ if (mode_action_destroy)
break;
}
if (reset_ewin)
mode.ewin = NULL;
- mode.adestroy = 0;
+ mode_action_destroy = 0;
EDBUG_RETURN(val);
}
@@ -499,7 +501,7 @@
* if so, we'd best not stick around here
*/
- if (mode.adestroy)
+ if (mode_action_destroy)
EDBUG_RETURN(0);
/* If there is another action in this series, (now that
* we're sure we didn't already die) perform it
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- borders.c 9 Dec 2003 20:35:14 -0000 1.107
+++ borders.c 13 Dec 2003 14:12:22 -0000 1.108
@@ -403,7 +403,6 @@
ConformEwinToDesktop(ewin);
ShowEwin(ewin);
ICCCM_DeIconify(ewin);
- mode.destroy = 1;
}
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- buttons.c 7 Dec 2003 09:18:55 -0000 1.23
+++ buttons.c 13 Dec 2003 14:12:22 -0000 1.24
@@ -675,7 +675,6 @@
ButtonDraw(buttons[i]);
if ((buttons[i]->aclass) && (!wasdrag) && (!wasmovres))
EventAclass(ev, buttons[i]->aclass);
- mode.destroy = 0;
last_bpress = 0;
used = 1;
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- evhandlers.c 13 Dec 2003 14:07:14 -0000 1.128
+++ evhandlers.c 13 Dec 2003 14:12:22 -0000 1.129
@@ -1694,7 +1694,6 @@
XSendEvent(disp, bpress_win, False, SubstructureNotifyMask, ev);
}
mode.context_win = click_was_in;
- mode.destroy = 0;
pslideout = mode.slideout;
if (mode.slideout)
{
@@ -1863,7 +1862,6 @@
if (EventAclass(ev, ac))
{
mode.borderpartpress = 0;
- mode.destroy = 0;
if ((mode.slideout) && (pslideout))
HideSlideout(mode.slideout, mode.context_win);
click_was_in = 0;
@@ -1875,8 +1873,6 @@
if (!wasmovres)
PagersEventMouseUp(ev);
-
- mode.destroy = 0;
exit:
if ((mode.slideout) && (pslideout))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- iconify.c 4 Dec 2003 19:02:03 -0000 1.76
+++ iconify.c 13 Dec 2003 14:12:22 -0000 1.77
@@ -321,7 +321,6 @@
ShowEwin(ewin);
ICCCM_DeIconify(ewin);
FocusToEWin(ewin);
- mode.destroy = 1;
if (ewin->has_transients)
{
EWin **lst, *e;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- setup.c 11 Dec 2003 21:13:50 -0000 1.97
+++ setup.c 13 Dec 2003 14:12:22 -0000 1.98
@@ -391,8 +391,6 @@
mode.next_move_x_plus = 0;
mode.next_move_y_plus = 0;
mode.mode = MODE_NONE;
- mode.destroy = 0;
- mode.adestroy = 0;
mode.deskmode = MODE_NONE;
mode.place = 0;
mode.flipp = 0;
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
