Rename TDE-specific atoms to avoid stomping on KDE atom names

4 files changed, 17 insertions, 17 deletions

diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 71ce93175..6ab2ee941 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -230,8 +230,8 @@ LockProcess::LockProcess()
 
     // Set up atoms
     kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
-    kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_DESKTOP", False);
-    kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_BLACK", False);
+    kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
+    kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_BLACK", False);
 
     kapp->installX11EventFilter(this);
 
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index cc3f7c437..a7d3d7333 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -371,7 +371,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 
   // Signal that we want to be transparent to the desktop, not to windows behind us...
   Atom kde_wm_transparent_to_desktop;
-  kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_DESKTOP", False);
+  kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
   XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
 }
 
diff --git a/twin/atoms.cpp b/twin/atoms.cpp
index 0d4ee6195..de2dfff9f 100644
--- a/twin/atoms.cpp
+++ b/twin/atoms.cpp
@@ -68,19 +68,19 @@ Atoms::Atoms()
     names[n++] = (char*) "_NET_WM_TAKE_ACTIVITY";
     
     atoms[n] = &net_wm_window_opacity;
-    names[n++] = (char*) "_KDE_WM_WINDOW_OPACITY";
+    names[n++] = (char*) "_TDE_WM_WINDOW_OPACITY";
 
     atoms[n] = &net_wm_window_shadow;
-    names[n++] = (char*) "_KDE_WM_WINDOW_SHADOW";
+    names[n++] = (char*) "_TDE_WM_WINDOW_SHADOW";
 
     atoms[n] = &net_wm_window_shade;
-    names[n++] = (char*) "_KDE_WM_WINDOW_SHADE";
+    names[n++] = (char*) "_TDE_WM_WINDOW_SHADE";
     
     atoms[n] = &net_wm_window_shapable;
-    names[n++] = (char*) "_KDE_WM_WINDOW_SHAPABLE";
+    names[n++] = (char*) "_TDE_WM_WINDOW_SHAPABLE";
     
     atoms[n] = &net_wm_window_decohash;
-    names[n++] = (char*) "_KDE_WM_WINDOW_DECOHASH";
+    names[n++] = (char*) "_TDE_WM_WINDOW_DECOHASH";
     
     atoms[n] = &net_wm_system_modal_notification;
     names[n++] = (char*) "_KDE_WM_MODAL_SYS_NOTIFICATION";
diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c
index 751f86eaf..150c06bb8 100644
--- a/twin/kompmgr/kompmgr.c
+++ b/twin/kompmgr/kompmgr.c
@@ -239,13 +239,13 @@ Bool            winTypeShadow[NUM_WINTYPES];
 Bool            winTypeFade[NUM_WINTYPES];
 
 /* opacity property name; sometime soon I'll write up an EWMH spec for it */
-#define OPACITY_PROP	"_KDE_WM_WINDOW_OPACITY"
-#define SHADOW_PROP	"_KDE_WM_WINDOW_SHADOW"
-#define SHADE_PROP	"_KDE_WM_WINDOW_SHADE"
-#define SHAPABLE_PROP	"_KDE_WM_WINDOW_SHAPABLE"
-#define DECOHASH_PROP	"_KDE_WM_WINDOW_DECOHASH"
-#define DIM_PROP	"_KDE_WM_WINDOW_DIM"
-#define DESKCHANGE_PROP "_KDE_WM_DESKTOP_CHANGE"
+#define OPACITY_PROP	"_TDE_WM_WINDOW_OPACITY"
+#define SHADOW_PROP	"_TDE_WM_WINDOW_SHADOW"
+#define SHADE_PROP	"_TDE_WM_WINDOW_SHADE"
+#define SHAPABLE_PROP	"_TDE_WM_WINDOW_SHAPABLE"
+#define DECOHASH_PROP	"_TDE_WM_WINDOW_DECOHASH"
+#define DIM_PROP	"_TDE_WM_WINDOW_DIM"
+#define DESKCHANGE_PROP "_TDE_WM_DESKTOP_CHANGE"
 
 #define TRANSLUCENT	0xe0000000
 #define OPAQUE		0xffffffff
@@ -3546,8 +3546,8 @@ main (int argc, char **argv)
         dimAtom = XInternAtom (dpy, DIM_PROP, False);
         deskChangeAtom = XInternAtom (dpy, DESKCHANGE_PROP, False);
 	winTypeAtom = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE", False);
-	winTDETTDAtom = XInternAtom (dpy, "_KDE_TRANSPARENT_TO_DESKTOP", False);
-	winTDETTBAtom = XInternAtom (dpy, "_KDE_TRANSPARENT_TO_BLACK", False);
+	winTDETTDAtom = XInternAtom (dpy, "_TDE_TRANSPARENT_TO_DESKTOP", False);
+	winTDETTBAtom = XInternAtom (dpy, "_TDE_TRANSPARENT_TO_BLACK", False);
 	winType[WINTYPE_DESKTOP] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
 	winType[WINTYPE_DOCK] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
 	winType[WINTYPE_TOOLBAR] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);