Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h comms.c config.c evhandlers.c globals.c iconify.c ipc.c
setup.c
Log Message:
Remove some obsolete stuff doing nothing (mode.showicons, ShowIcons, HideIcons,
HandlePager, external_pager_window).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- E.h 11 Jul 2003 17:12:11 -0000 1.122
+++ E.h 11 Jul 2003 17:58:18 -0000 1.123
@@ -1238,7 +1238,6 @@
char numdesktops;
char transientsfollowleader;
char switchfortransientmap;
- char showicons;
char snap;
int edge_snap_dist;
int screen_snap_dist;
@@ -2559,9 +2558,6 @@
void MakeIcon(EWin * ewin);
void DockIt(EWin * ewin);
void DockDestroy(EWin * ewin);
-void HideIcons(void);
-void ShowIcons(void);
-void HandlePager(void);
Iconbox *CreateIconbox(char *name);
void FreeIconbox(Iconbox * ib);
void ShowIconbox(Iconbox * ib);
@@ -3123,7 +3119,6 @@
extern Menu *desk_menu;
extern Menu *group_menu;
extern char no_overwrite;
-extern Window external_pager_window;
extern char clickmenu;
extern Window last_bpress;
extern int child_count;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- comms.c 21 Jun 2003 10:39:20 -0000 1.29
+++ comms.c 11 Jul 2003 17:58:18 -0000 1.30
@@ -1182,8 +1182,7 @@
}
else if (!strcmp(w, "set_controls"))
{
- int i, num, wd;
- Button **blst;
+ int wd;
int a, b;
int ax, ay;
char dragbar_change = 0;
@@ -1385,12 +1384,7 @@
}
else if (!strcmp(w, "SHOWICONS:"))
{
- word(s, wd, w);
- mode.showicons = atoi(w);
- if (mode.showicons)
- ShowIcons();
- else
- HideIcons();
+ /* Obsolete */
}
else if (!strcmp(w, "ALL_NEW_WINDOWS_GET_FOCUS:"))
{
@@ -1480,6 +1474,7 @@
ShowDesktopControls();
}
FixFocus();
+
GetAreaSize(&ax, &ay);
GetCurrentArea(&a, &b);
if (a >= ax)
@@ -1489,21 +1484,6 @@
}
if (b >= ay)
SetCurrentArea(a, ay - 1);
- blst = (Button **) ListItemType(&num, LIST_TYPE_BUTTON);
- if (blst)
- {
- for (i = 0; i < num; i++)
- {
- if (!strcmp(blst[i]->name, "ICON"))
- {
- if (mode.showicons)
- ShowButton(blst[i]);
- else
- HideButton(blst[i]);
- }
- }
- Efree(blst);
- }
}
else if (!strcmp(w, "get_controls"))
{
@@ -1525,7 +1505,7 @@
"DRAGBARORDERING: %i\n" "DRAGBARLENGTH: %i\n"
"DESKSLIDEIN: %i\n" "DESKSLIDESPEED: %i\n" "HIQUALITYBG: %i\n"
"TRANSIENTSFOLLOWLEADER: %i\n" "SWITCHFORTRANSIENTMAP: %i\n"
- "SHOWICONS: %i\n" "AREA_SIZE: %i %i\n"
+ "AREA_SIZE: %i %i\n"
"ALL_NEW_WINDOWS_GET_FOCUS: %i\n"
"NEW_TRANSIENTS_GET_FOCUS: %i\n"
"NEW_TRANSIENTS_GET_FOCUS_IF_GROUP_FOCUSED: %i\n"
@@ -1547,7 +1527,7 @@
desks.dragbar_ordering, desks.dragbar_length, desks.slidein,
desks.slidespeed, desks.hiqualitybg,
mode.transientsfollowleader, mode.switchfortransientmap,
- mode.showicons, a, b, mode.all_new_windows_get_focus,
+ a, b, mode.all_new_windows_get_focus,
mode.new_transients_get_focus,
mode.new_transients_get_focus_if_group_focused,
mode.manual_placement, mode.manual_placement_mouse_pointer,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- config.c 11 Jul 2003 17:44:15 -0000 1.60
+++ config.c 11 Jul 2003 17:58:18 -0000 1.61
@@ -623,7 +623,7 @@
mode.switchfortransientmap = i2;
break;
case CONTROL_SHOWICONS:
- mode.showicons = i2;
+ /* Obsolete */
break;
case CONTROL_ALL_NEW_WINDOWS_GET_FOCUS:
mode.all_new_windows_get_focus = i2;
@@ -3850,7 +3850,6 @@
fprintf(autosavefile, "333 %i\n", (int)mode.numdesktops);
fprintf(autosavefile, "335 %i\n", (int)mode.transientsfollowleader);
fprintf(autosavefile, "336 %i\n", (int)mode.switchfortransientmap);
- fprintf(autosavefile, "337 %i\n", (int)mode.showicons);
GetAreaSize(&a, &b);
fprintf(autosavefile, "407 %i %i\n", a, b);
fprintf(autosavefile, "340 %i\n", (int)mode.all_new_windows_get_focus);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- evhandlers.c 8 Jul 2003 02:32:40 -0000 1.111
+++ evhandlers.c 11 Jul 2003 17:58:18 -0000 1.112
@@ -1097,13 +1097,11 @@
HintsSetClientList();
EDBUG_RETURN_;
}
+
c = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_CLIENT);
if (c)
DeleteClient(c);
- if (win == external_pager_window)
- {
- ShowIcons();
- }
+
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- globals.c 15 Jun 2003 15:27:04 -0000 1.12
+++ globals.c 11 Jul 2003 17:58:19 -0000 1.13
@@ -54,7 +54,6 @@
Menu *desk_menu = NULL;
Menu *group_menu = NULL;
char no_overwrite = 0;
-Window external_pager_window = 0;
char clickmenu = 0;
Window last_bpress = 0;
int child_count = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- iconify.c 22 May 2003 19:15:01 -0000 1.65
+++ iconify.c 11 Jul 2003 17:58:19 -0000 1.66
@@ -365,25 +365,6 @@
DelEwinFromIconbox(ib, ewin);
}
-void
-HideIcons(void)
-{
- /* ummmmmmmmmm don't need this anymore - but it used to hide the icons */
- /* when a the gnome pager came up */
-}
-
-void
-ShowIcons(void)
-{
- /* ummmmmmmmmm don't need this anymore - but it used to show the icons */
- /* when a the gnome pager came up */
-}
-
-void
-HandlePager(void)
-{
-}
-
Iconbox *
CreateIconbox(char *name)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- ipc.c 11 Jul 2003 16:18:41 -0000 1.106
+++ ipc.c 11 Jul 2003 17:58:19 -0000 1.107
@@ -218,7 +218,7 @@
{
IPC_ShowIcons,
"show_icons",
- "Toggle the display of icons on the desktop",
+ "Obsolete - Toggle the display of icons on the desktop",
"Use \"show_icons on\" and \"show_icons off\" to change this setting\n"
"Use \"show_icons ?\" to retrieve the current setting"},
{
@@ -4559,45 +4559,6 @@
void
IPC_ShowIcons(char *params, Client * c)
{
-
- char buf[FILEPATH_LEN_MAX];
-
- buf[0] = 0;
- if (params)
- {
- if (!strcmp(params, "on"))
- {
- mode.showicons = 1;
- ShowIcons();
- }
- else if (!strcmp(params, "off"))
- {
- mode.showicons = 0;
- HideIcons();
- }
- else if (!strcmp(params, "?"))
- {
- Esnprintf(buf, sizeof(buf), "Icons: ");
- if (mode.showicons)
- strcat(buf, "on");
- else
- strcat(buf, "off");
- }
- else
- {
- Esnprintf(buf, sizeof(buf), "Error: unknown icon statee: %s",
- params);
- }
- }
- else
- {
- Esnprintf(buf, sizeof(buf), "Error: no icon state specified");
- }
-
- if (buf[0])
- CommsSend(c, buf);
-
- return;
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- setup.c 8 Jul 2003 02:32:40 -0000 1.86
+++ setup.c 11 Jul 2003 17:58:19 -0000 1.87
@@ -523,7 +523,6 @@
mode.numdesktops = 2;
mode.transientsfollowleader = 1;
mode.switchfortransientmap = 1;
- mode.showicons = 1;
mode.snap = 1;
mode.edge_snap_dist = 8;
mode.screen_snap_dist = 32;
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
