mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kdeui: remove redundant X11 atoms creation from KApplicationPrivate::init()
XdndDrop is already created by QApplication for internal purposes, KDE_DESKTOP_WINDOW is a bogus one Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
899f789b07
commit
7d088288c2
1 changed files with 1 additions and 24 deletions
|
@ -78,9 +78,7 @@
|
|||
KApplication* KApplication::KApp = 0L;
|
||||
|
||||
#ifdef Q_WS_X11
|
||||
static Atom atom_DesktopWindow = None;
|
||||
static Atom atom_NetSupported = None;
|
||||
static Atom kde_xdnd_drop = None;
|
||||
static QByteArray* startup_id_tmp = nullptr;
|
||||
#endif
|
||||
|
||||
|
@ -385,31 +383,10 @@ void KApplicationPrivate::init()
|
|||
(void) QApplication::clipboard();
|
||||
|
||||
parseCommandLine();
|
||||
|
||||
#ifdef Q_WS_X11
|
||||
// create all required atoms in _one_ roundtrip to the X server
|
||||
const int max = 20;
|
||||
Atom* atoms[max];
|
||||
char* names[max];
|
||||
Atom atoms_return[max];
|
||||
int n = 0;
|
||||
|
||||
atoms[n] = &atom_DesktopWindow;
|
||||
names[n++] = (char *) "KDE_DESKTOP_WINDOW";
|
||||
|
||||
atoms[n] = &atom_NetSupported;
|
||||
names[n++] = (char *) "_NET_SUPPORTED";
|
||||
|
||||
atoms[n] = &kde_xdnd_drop;
|
||||
names[n++] = (char *) "XdndDrop";
|
||||
|
||||
XInternAtoms( QX11Info::display(), names, n, false, atoms_return );
|
||||
|
||||
for (int i = 0; i < n; i++ )
|
||||
*atoms[i] = atoms_return[i];
|
||||
atom_NetSupported = XInternAtom( QX11Info::display(), "_NET_SUPPORTED", False );
|
||||
#endif
|
||||
|
||||
|
||||
// sanity checking, to make sure we've connected
|
||||
QDBusConnection sessionBus = QDBusConnection::sessionBus();
|
||||
QDBusConnectionInterface *bus = 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue