Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h Makefile.am actions.c arrange.c borders.c conf.h config.c
evhandlers.c hints.c ipc.c main.c session.c settings.c setup.c
size.c
Removed Files:
kde.c
Log Message:
Bye bye KDE(1).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- E.h 5 Nov 2003 17:24:41 -0000 1.141
+++ E.h 8 Nov 2003 10:54:03 -0000 1.142
@@ -936,9 +936,6 @@
Snapshot *snap;
int icon_pmap_w, icon_pmap_h;
Pixmap icon_pmap, icon_mask;
-#if ENABLE_KDE
- char kde_hint;
-#endif
int head;
}
EWin;
@@ -1286,14 +1283,6 @@
char nogroup;
GroupConfig group_config;
char group_swapmove;
-#if ENABLE_KDE
- Window kde_dock;
- int kde_support;
- int kde_x1;
- int kde_x2;
- int kde_y1;
- int kde_y2;
-#endif
char clickalways;
char keybinds_changed;
char firsttime;
@@ -1751,31 +1740,6 @@
}
DrawQueue;
-#if ENABLE_KDE
-/* some kde hint enums here */
-
-typedef enum
-{
- StickyFlag = (1 << 0),
- MaximizedFlag = (1 << 1),
- IconifiedFlag = (1 << 2),
- AllFlags = 7
-}
-KStates;
-
-typedef enum
-{
- AddWindow,
- RemoveWindow,
- FocusWindow,
- RaiseWindow,
- LowerWindow,
- ChangedClient,
- IconChange
-}
-KMessage;
-#endif
-
/* only used for remember list dialog callback funcs (SettingsDialog()
* in in settings.c)... snaps are attached to windows, not a global list */
typedef struct _remwinlist
@@ -2361,22 +2325,6 @@
void GNOME_ProcessClientMessage(XClientMessageEvent * event);
#endif
-#if ENABLE_KDE
-/* kde.c functions */
-void KDE_Init(void);
-void KDE_Shutdown(void);
-void KDE_RemoveModule(Window win);
-void KDE_ClientChange(Window win, Atom a);
-void KDE_ProcessClientMessage(XClientMessageEvent * event);
-void KDE_HintChange(Atom a);
-void KDE_SetRootArea(void);
-void KDE_UpdateFocusedWindow(void);
-void KDE_SetNumDesktops(void);
-void KDE_NewWindow(EWin * ewin);
-void KDE_RemoveWindow(EWin * ewin);
-void KDE_UpdateClient(EWin * ewin);
-#endif
-
#if ENABLE_EWMH
/* ewmh.c functions */
void EWMH_Init(Window win_wm_check);
@@ -2942,7 +2890,6 @@
void SettingsIcons(void);
void SettingsAutoRaise(void);
void SettingsTooltips(void);
-void SettingsKDE(void);
void SettingsAudio(void);
void SettingsSpecialFX(void);
void SettingsBackground(Background * bg);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 4 Oct 2003 13:14:53 -0000 1.19
+++ Makefile.am 8 Nov 2003 10:54:03 -0000 1.20
@@ -1,6 +1,6 @@
SUBDIRS = themes
-EXTRA_DIST = README ChangeLog ewmh.c gnome.c kde.c
+EXTRA_DIST = README ChangeLog ewmh.c gnome.c
bin_PROGRAMS = enlightenment
@@ -9,9 +9,6 @@
endif
if ENABLE_GNOME
SRCS_GNOME = gnome.c
-endif
-if ENABLE_KDE
-SRCS_KDE = kde.c
endif
enlightenment_SOURCES = \
E.h \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- actions.c 5 Nov 2003 17:24:41 -0000 1.110
+++ actions.c 8 Nov 2003 10:54:03 -0000 1.111
@@ -1471,57 +1471,10 @@
}
Efree(blst);
}
-#if ENABLE_KDE
- if (mode.kde_support)
- {
- fixed = Erealloc(fixed, sizeof(RectBox) * (k + 2));
- ret = Erealloc(ret, sizeof(RectBox) * ((num + j) + 1 + k + 2));
- fixed[k].data = NULL;
- fixed[k].p = 50;
- fixed[k].x = 0;
- fixed[k].y = 0;
- if (mode.kde_y1 == 0)
- {
- fixed[k].w = mode.kde_x1;
- }
- else
- {
- fixed[k].w = root.w;
- }
- if (mode.kde_x1 == 0)
- {
- fixed[k].h = mode.kde_y1;
- }
- else
- {
- fixed[k].h = root.h;
- }
- k++;
-
- fixed[k].data = NULL;
- if ((mode.kde_x2 == root.w) && (mode.kde_y2 < root.h))
- fixed[k].x = 0;
- else
- fixed[k].x = mode.kde_x2;
- fixed[k].w = mode.kde_x2 - root.w;
- if (mode.kde_x2 < root.w)
- {
- fixed[k].y = 0;
- fixed[k].h = root.h;
- }
- else
- {
- fixed[k].y = mode.kde_y2;
- fixed[k].h = mode.kde_y2 - root.h;
- }
- fixed[k].p = 50;
- k++;
-
- }
-#endif
ArrangeRects(fixed, k, floating, j, ret, 0, 0, root.w, root.h, method,
0);
+
for (i = 0; i < (j + k); i++)
{
if (ret[i].data)
@@ -3419,10 +3372,6 @@
SettingsAutoRaise();
else if (!strcmp(s, "tooltips"))
SettingsTooltips();
-#if ENABLE_KDE
- else if (!strcmp(s, "kde"))
- SettingsKDE();
-#endif
else if (!strcmp(s, "audio"))
SettingsAudio();
else if (!strcmp(s, "fx"))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/arrange.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- arrange.c 5 Nov 2003 17:24:42 -0000 1.56
+++ arrange.c 8 Nov 2003 10:54:03 -0000 1.57
@@ -927,20 +927,8 @@
newrect.w = ewin->w;
newrect.h = ewin->h;
newrect.p = ewin->layer;
-#if ENABLE_KDE
- if (mode.kde_support)
- {
- ArrangeRects(fixed, j, &newrect, 1, ret,
- mode.kde_x1, mode.kde_y1, mode.kde_x2, mode.kde_y2,
- ARRANGE_BY_SIZE, 1);
-
- }
- else
-#endif
- {
- ArrangeRects(fixed, j, &newrect, 1, ret,
- 0, 0, root.w, root.h, ARRANGE_BY_SIZE, 1);
- }
+ ArrangeRects(fixed, j, &newrect, 1, ret,
+ 0, 0, root.w, root.h, ARRANGE_BY_SIZE, 1);
for (i = 0; i < j + 1; i++)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- borders.c 5 Nov 2003 17:24:42 -0000 1.101
+++ borders.c 8 Nov 2003 10:54:03 -0000 1.102
@@ -1511,9 +1511,6 @@
ewin->snap = NULL;
ewin->icon_pmap = 0;
ewin->icon_mask = 0;
-#if ENABLE_KDE
- ewin->kde_hint = 0;
-#endif
att.event_mask =
StructureNotifyMask | ResizeRedirectMask | ButtonPressMask |
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/conf.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- conf.h 5 Nov 2003 17:24:42 -0000 1.27
+++ conf.h 8 Nov 2003 10:54:03 -0000 1.28
@@ -133,7 +133,7 @@
#define CONTROL_GROUP_STICK 1363
#define CONTROL_GROUP_SHADE 1364
#define CONTROL_GROUP_MIRROR 1365
-#define CONTROL_KDESUPPORT 1366
+#define CONTROL_KDESUPPORT 1366 /* Obsolete */
#define CONTROL_CLICK_ALWAYS 1367
#define CONTROL_SHOWROOTTOOLTIP 1368
#define CONTROL_PAGER_BUTTONS 1369
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- config.c 5 Nov 2003 17:24:42 -0000 1.68
+++ config.c 8 Nov 2003 10:54:03 -0000 1.69
@@ -806,9 +806,8 @@
sscanf(s, "%*s %d %d ", &mode.dockstartx, &mode.dockstarty);
break;
case CONTROL_KDESUPPORT:
-#if ENABLE_KDE
- /* Taking out the case causes complaints when starting with old config. */
- mode.kde_support = i2;
+#if 0
+ /* Ignore */
#endif
break;
case CONTROL_SHOWROOTTOOLTIP:
@@ -3895,9 +3894,6 @@
fprintf(autosavefile, "1364 %i\n", (int)mode.group_config.shade);
fprintf(autosavefile, "1365 %i\n", (int)mode.group_config.mirror);
fprintf(autosavefile, "1372 %i\n", (int)mode.group_swapmove);
-#if ENABLE_KDE
- fprintf(autosavefile, "1366 %i\n", (int)mode.kde_support);
-#endif
fprintf(autosavefile, "1367 %i\n", (int)mode.clickalways);
fprintf(autosavefile, "1368 %i\n", (int)mode.showroottooltip);
fprintf(autosavefile, "1369 %i %i %i\n", (int)mode.pager_sel_button,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- evhandlers.c 5 Nov 2003 17:24:43 -0000 1.119
+++ evhandlers.c 8 Nov 2003 10:54:04 -0000 1.120
@@ -999,11 +999,6 @@
mode.context_win = win;
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_RemoveModule(win);
-#endif
-
if (ewin)
{
Pager *p;
@@ -1089,6 +1084,7 @@
Pixmap pm;
GrabX();
+
pm = ewin->client.icon_pmap;
if (ewin->client.title)
strncpy(title, ewin->client.title, 10240);
@@ -1103,20 +1099,14 @@
ICCCM_GetGeoms(ewin, ev->xproperty.atom);
SessionGetInfo(ewin, ev->xproperty.atom);
SyncBorderToEwin(ewin);
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_ClientChange(win, ev->xproperty.atom);
-#endif
+
if (ewin->client.title)
if (strncmp(title, ewin->client.title, 10240))
{
UpdateBorderInfo(ewin);
CalcEwinSizes(ewin);
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_UpdateClient(ewin);
-#endif
}
+
if ((ewin->iconified) && (pm != ewin->client.icon_pmap))
{
Iconbox **ib;
@@ -1147,19 +1137,8 @@
else if (win == root.win)
{
/* we're in the root window, not in a client */
-#if ENABLE_KDE
- if (mode.kde_support)
- {
- KDE_HintChange(ev->xproperty.atom);
- }
-#endif
}
-#if ENABLE_KDE
- else if (mode.kde_support)
- {
- KDE_ClientChange(win, ev->xproperty.atom);
- }
-#endif
+
EDBUG_RETURN_;
}
@@ -1474,17 +1453,8 @@
{
AddToFamily(ev->xmap.window);
HintsSetClientList();
-#if ENABLE_KDE
- if (mode.kde_support)
- {
- EWin *ewin;
-
- ewin =
- FindItem(NULL, ev->xmap.window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
- KDE_NewWindow(ewin);
- }
-#endif
}
+
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hints.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- hints.c 18 Aug 2003 22:03:10 -0000 1.10
+++ hints.c 8 Nov 2003 10:54:04 -0000 1.11
@@ -38,9 +38,6 @@
EDBUG(6, "HintsInit");
win = ECreateWindow(root.win, -200, -200, 5, 5, 0);
ICCCM_Init();
-#if ENABLE_KDE
- /* ??? */
-#endif
#if ENABLE_GNOME
GNOME_SetHints(win);
#endif
@@ -70,10 +67,6 @@
HintsSetDesktopConfig(void)
{
EDBUG(6, "HintsSetDesktopConfig");
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_SetNumDesktops();
-#endif
#if ENABLE_GNOME
GNOME_SetDeskCount();
GNOME_SetDeskNames();
@@ -103,10 +96,6 @@
HintsSetCurrentDesktop(void)
{
EDBUG(6, "HintsSetCurrentDesktop");
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_SetRootArea();
-#endif
#if ENABLE_GNOME
GNOME_SetCurrentDesk();
#endif
@@ -134,10 +123,6 @@
HintsSetActiveWindow(EWin * ewin)
{
EDBUG(6, "HintsSetActiveWindow");
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_UpdateFocusedWindow();
-#endif
#if ENABLE_EWMH
EWMH_SetActiveWindow(ewin);
#endif
@@ -148,10 +133,6 @@
HintsSetWindowDesktop(EWin * ewin)
{
EDBUG(6, "HintsSetWindowDesktop");
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_UpdateClient(ewin);
-#endif
#if ENABLE_GNOME
GNOME_SetEwinDesk(ewin);
#endif
@@ -176,10 +157,6 @@
HintsSetWindowState(EWin * ewin)
{
EDBUG(6, "HintsSetWindowState");
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_UpdateClient(ewin);
-#endif
#if ENABLE_GNOME
GNOME_SetHint(ewin);
#endif
@@ -193,21 +170,9 @@
void
HintsSetWindowHints(EWin * ewin)
{
-#if ENABLE_KDE
- int kde_support = 0;
-#endif
EDBUG(6, "HintsSetWindowHints");
-#if ENABLE_KDE
- kde_support = mode.kde_support;
- if (mode.kde_support)
- KDE_UpdateClient(ewin);
- mode.kde_support = 0;
-#endif
HintsSetWindowDesktop(ewin);
HintsSetWindowState(ewin);
-#if ENABLE_KDE
- mode.kde_support = kde_support;
-#endif
EDBUG_RETURN_;
}
@@ -236,10 +201,6 @@
HintsDelWindowHints(EWin * ewin)
{
EDBUG(6, "HintsDelWindowHints");
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_RemoveWindow(ewin);
-#endif
#if ENABLE_GNOME
GNOME_DelHints(ewin);
#endif
@@ -260,10 +221,6 @@
#if ENABLE_GNOME
GNOME_GetHints(ewin, atom_change);
#endif
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_UpdateFocusedWindow();
-#endif
#if ENABLE_EWMH
EWMH_ProcessPropertyChange(ewin, atom_change);
#endif
@@ -292,13 +249,6 @@
#if ENABLE_GNOME
else if (!memcmp(name, "_WIN_", 5))
GNOME_ProcessClientMessage(event);
-#endif
-#if ENABLE_KDE
- else if (!memcmp(name, "KWM_", 4))
- {
- if (mode.kde_support)
- KDE_ProcessClientMessage(event);
- }
#endif
XFree(name);
EDBUG_RETURN_;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- ipc.c 5 Nov 2003 17:24:44 -0000 1.113
+++ ipc.c 8 Nov 2003 10:54:04 -0000 1.114
@@ -87,10 +87,6 @@
static void IPC_GeneralInfo(char *params, Client * c);
static void IPC_Modules(char *params, Client * c);
static void IPC_DockConfig(char *params, Client * c);
-
-#if ENABLE_KDE
-static void IPC_KDE(char *params, Client * c);
-#endif
static void IPC_MemDebug(char *params, Client * c);
static void IPC_Remember(char *params, Client * c);
static void IPC_CurrentTheme(char *params, Client * c);
@@ -524,13 +520,6 @@
" group <groupid> stick <on/off/?>\n"
" group <groupid> shade <on/off/?>\n"
" group <groupid> mirror <on/off/?>\n"},
-#if ENABLE_KDE
- {
- IPC_KDE,
- "kde", NULL,
- "Turns on and off KDE support",
- "use \"kde on\" and \"kde off\" to enable/disable support"},
-#endif
{
IPC_MemDebug,
"dump_mem_debug", NULL,
@@ -566,7 +555,7 @@
"open up a config window",
"usage:\n" " configpanel <panelname>\n"
" where panelname is one of the following: focus, moveresize,\n"
- " desktops, area, placement, icons, autoraise, tooltips, kde,\n"
+ " desktops, area, placement, icons, autoraise, tooltips,\n"
" audio, fx, bg, group_defaults, remember"},
{
IPC_RememberList,
@@ -604,7 +593,6 @@
"icons", "icons settings dialog",
"autoraise", "autoraise settings dialog",
"tooltips", "tooltips settings dialog",
- "kde", "kde settings dialog",
"audio", "audio settings dialog",
"fx", "special effects settings dialog",
"bg", "background settings dialog",
@@ -753,50 +741,6 @@
if (buf[0])
CommsSend(c, buf);
}
-
-#if ENABLE_KDE
-static void
-IPC_KDE(char *params, Client * c)
-{
- char buf[FILEPATH_LEN_MAX];
-
- buf[0] = 0;
-
- if (params)
- {
- if (!strcmp(params, "on"))
- {
- if (!mode.kde_support)
- KDE_Init();
- }
- else if (!strcmp(params, "off"))
- {
- if (mode.kde_support)
- KDE_Shutdown();
- }
- else if (!strcmp(params, "?"))
- {
- if (mode.kde_support)
- {
- Esnprintf(buf, sizeof(buf), "kde: active");
- }
- else
- {
- Esnprintf(buf, sizeof(buf), "kde: inactive");
- }
- }
- else
- {
- Esnprintf(buf, sizeof(buf), "Error: unknown state specified");
- }
- }
- else
- Esnprintf(buf, sizeof(buf), "Error: no state specified");
-
- if (buf[0])
- CommsSend(c, buf);
-}
-#endif
static void
IPC_Modules(char *params, Client * c)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- main.c 5 Nov 2003 17:24:44 -0000 1.62
+++ main.c 8 Nov 2003 10:54:04 -0000 1.63
@@ -304,12 +304,6 @@
}
HintsSetClientList();
-#if ENABLE_KDE
- /* start up any kde crap we might need to start up */
- if (mode.kde_support)
- KDE_Init();
-#endif
-
/* sync just to make sure */
XSync(disp, False);
queue_up = DRAW_QUEUE_ENABLE;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- session.c 5 Nov 2003 17:24:46 -0000 1.42
+++ session.c 8 Nov 2003 10:54:04 -0000 1.43
@@ -188,7 +188,6 @@
return default_save_prefix();
}
-/* This code covers X11R6 and X11R5 clients (xterm, KDE, ...). */
static void
SaveWindowStates(void)
{
@@ -581,11 +580,6 @@
}
else if (!strcmp(s, "restart_wm"))
{
-#if ENABLE_KDE
- /* kill off kde */
- if (mode.kde_support)
- KDE_Shutdown();
-#endif
AUDIO_PLAY("SOUND_EXIT");
if (sound_fd >= 0)
close(sound_fd);
@@ -631,11 +625,7 @@
return;
}
}
-#if ENABLE_KDE
- /* kill off kde */
- if (mode.kde_support)
- KDE_Shutdown();
-#endif
+
AUDIO_PLAY("SOUND_EXIT");
EExit(0);
}
@@ -1189,11 +1179,6 @@
else if (!strcmp(s, "restart_wm"))
{
AUDIO_PLAY("SOUND_WAIT");
-#if ENABLE_KDE
- /* kill off kde */
- if (mode.kde_support)
- KDE_Shutdown();
-#endif
XCloseDisplay(disp);
disp = NULL;
Esnprintf(s, sizeof(s), "exec %s -display %s", atword(params, 2), dstr);
@@ -1275,13 +1260,10 @@
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else if (!strcmp((char *)s, "error"))
- EExit(0);
+ {
+ EExit(0);
+ }
-#if ENABLE_KDE
- /* kill off kde */
- if (mode.kde_support)
- KDE_Shutdown();
-#endif
restarting = False;
SaveSession(1);
AUDIO_PLAY("SOUND_EXIT");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- settings.c 5 Nov 2003 17:24:46 -0000 1.75
+++ settings.c 8 Nov 2003 10:54:04 -0000 1.76
@@ -1780,91 +1780,6 @@
ShowDialog(d);
}
-#if ENABLE_KDE
-static char tmp_kde;
-static void CB_ConfigureKDE(int val, void *data);
-static void
-CB_ConfigureKDE(int val, void *data)
-{
- if (val < 2)
- {
- if (tmp_kde != mode.kde_support)
- {
- mode.kde_support = tmp_kde;
- if (mode.kde_support)
- KDE_Init();
- else if (!mode.kde_support)
- KDE_Shutdown();
- }
- }
- autosave();
- data = NULL;
-}
-
-void
-SettingsKDE(void)
-{
- Dialog *d;
- DItem *table, *di;
-
- if ((d = FindItem("CONFIGURE_KDE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
- {
- AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
- ShowDialog(d);
- return;
- }
- AUDIO_PLAY("SOUND_SETTINGS_KDE");
-
- tmp_kde = mode.kde_support;
-
- d = CreateDialog("CONFIGURE_KDE");
- DialogSetTitle(d, _("KDE Settings"));
-
- table = DialogInitItem(d);
- DialogItemTableSetOptions(table, 2, 0, 0, 0);
-
- if (mode.dialog_headers)
- {
- di = DialogAddItem(table, DITEM_IMAGE);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemImageSetFile(di, "pix/kde.png");
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemTextSetText(di, _("Enlightenment KDE\n" "Settings Dialog\n"));
-
- di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 2);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSeparatorSetOrientation(di, 0);
- }
-
- di = DialogAddItem(table, DITEM_CHECKBUTTON);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetColSpan(di, 2);
- DialogItemCheckButtonSetText(di, _("Enable KDE Support"));
- DialogItemCheckButtonSetState(di, tmp_kde);
- DialogItemCheckButtonSetPtr(di, &tmp_kde);
-
- di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 2);
- DialogItemSetPadding(di, 2, 2, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSeparatorSetOrientation(di, 0);
-
- DialogAddButton(d, _("OK"), CB_ConfigureKDE, 1);
- DialogAddButton(d, _("Apply"), CB_ConfigureKDE, 0);
- DialogAddButton(d, _("Close"), CB_ConfigureKDE, 1);
- DialogSetExitFunction(d, CB_ConfigureKDE, 2, d);
- DialogBindKey(d, "Escape", CB_SettingsEscape, 0, d);
- DialogBindKey(d, "Return", CB_ConfigureKDE, 0, d);
- ShowDialog(d);
-}
-#endif
-
static char tmp_dialog_headers;
static void CB_ConfigureMiscellaneous(int val, void *data);
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- setup.c 5 Nov 2003 17:24:46 -0000 1.93
+++ setup.c 8 Nov 2003 10:54:04 -0000 1.94
@@ -447,13 +447,6 @@
mode.manual_placement = 0;
mode.raise_on_next_focus = 1;
mode.raise_after_next_focus = 1;
-#if ENABLE_KDE
- mode.kde_support = 0;
- mode.kde_x1 = 0;
- mode.kde_y1 = 0;
- mode.kde_x2 = root.w;
- mode.kde_y2 = root.h;
-#endif
#ifdef WITH_TARTY_WARP
mode.display_warp = 1;
#else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/size.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- size.c 5 Nov 2003 17:24:46 -0000 1.29
+++ size.c 8 Nov 2003 10:54:04 -0000 1.30
@@ -94,20 +94,6 @@
x2 += x1;
y2 += y1;
-#if ENABLE_KDE
- if (mode.kde_support)
- {
- if (x1 < mode.kde_x1)
- x1 = mode.kde_x1;
- if (x2 > mode.kde_x2)
- x2 = mode.kde_x2;
- if (y1 < mode.kde_y1)
- y1 = mode.kde_y1;
- if (y2 > mode.kde_y2)
- y2 = mode.kde_y2;
- }
-#endif
-
if (type == MAX_ABSOLUTE)
{
/* Simply ignore all windows */
@@ -182,10 +168,6 @@
ewin->toggle = 1;
exit:;
-#if ENABLE_KDE
- if (mode.kde_support)
- KDE_UpdateClient(ewin);
-#endif
}
void
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
