| bbd5f447 | 2014-12-04 08:42:32 | Timothy Pearson |
Remove unneeded check and handler for broken TQt DnD Application of patch 0037-dnd-timestamp-fix.patch to TQt3 verified before removal |
||
|
M tdecore/tdeapplication.cpp |
||
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 0f84807..aa0e1e0 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -200,7 +200,6 @@
#ifdef Q_WS_X11
static Atom atom_DesktopWindow;
static Atom atom_NetSupported;
-static Atom kde_xdnd_drop;
#endif
#if defined(Q_WS_X11) && defined(COMPOSITE)
@@ -1020,9 +1019,6 @@
atoms[n] = &atom_NetSupported;
names[n++] = (char *) "_NET_SUPPORTED";
-
- atoms[n] = &kde_xdnd_drop;
- names[n++] = (char *) "XdndDrop";
XInternAtoms( tqt_xdisplay(), names, n, false, atoms_return );
@@ -2173,43 +2169,6 @@
#ifdef Q_WS_X11
bool TDEApplication::x11EventFilter( XEvent *_event )
{
- switch ( _event->type ) {
- case ClientMessage:
- {
-#if KDE_IS_VERSION( 3, 90, 90 )
-#warning This should be already in Qt, check.
-#endif
- // Workaround for focus stealing prevention not working when dragging e.g. text from KWrite
- // to KDesktop -> the dialog asking for filename doesn't get activated. This is because
- // Qt-3.2.x doesn't have concept of tqt_x_user_time at all, and Qt-3.3.0b1 passes the timestamp
- // in the XdndDrop message in incorrect field (and doesn't update tqt_x_user_time either).
- // Patch already sent, future Qt version should have this fixed.
- if( _event->xclient.message_type == kde_xdnd_drop )
- { // if the message is XdndDrop
- if( _event->xclient.data.l[ 1 ] == 1 << 24 // and it's broken the way it's in Qt-3.2.x
- && _event->xclient.data.l[ 2 ] == 0
- && _event->xclient.data.l[ 4 ] == 0
- && _event->xclient.data.l[ 3 ] != 0 )
- {
- if( GET_QT_X_USER_TIME() == 0
- || NET::timestampCompare( _event->xclient.data.l[ 3 ], GET_QT_X_USER_TIME() ) > 0 )
- { // and the timestamp looks reasonable
- SET_QT_X_USER_TIME(_event->xclient.data.l[ 3 ]); // update our tqt_x_user_time from it
- }
- }
- else // normal DND, only needed until Qt updates tqt_x_user_time from XdndDrop
- {
- if( GET_QT_X_USER_TIME() == 0
- || NET::timestampCompare( _event->xclient.data.l[ 2 ], GET_QT_X_USER_TIME() ) > 0 )
- { // the timestamp looks reasonable
- SET_QT_X_USER_TIME(_event->xclient.data.l[ 2 ]); // update our tqt_x_user_time from it
- }
- }
- }
- }
- default: break;
- }
-
if ( kapp_block_user_input ) {
switch ( _event->type ) {
case ButtonPress:
|
||
| d80ccaf9 | 2014-12-04 09:01:44 | Timothy Pearson |
Fix printing of debug information on KDED crash |
||
|
M kded/kded.cpp |
||
diff --git a/kded/kded.cpp b/kded/kded.cpp
index c7a0aa2..e1b3b6b 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -441,13 +441,17 @@
void Kded::crashHandler(int)
{
DCOPClient::emergencyClose();
- if (_self) // Don't restart if we were closing down
- system("kded");
-tqWarning("Last DCOP call before KDED crash was from application '%s'\n"
+ if (_self) { // Don't restart if we were closing down
+ tqWarning("Last DCOP call before KDED crash was from application '%s'\n"
"to object '%s', function '%s'.",
DCOPClient::postMortemSender(),
DCOPClient::postMortemObject(),
DCOPClient::postMortemFunction());
+ tqWarning("Restarting KDED...\n");
+ if (system("kded") < 0) {
+ tqWarning("Unable to restart KDED!\n");
+ }
+ }
}
void Kded::installCrashHandler()
|
||
| e0b1bfb0 | 2014-12-04 09:03:25 | Timothy Pearson |
Fix a number of build warnings |
||
|
M admin M tdecore/network/khttpproxysocketdevice.cpp M tdecore/network/kserversocket.cpp M tdecore/network/tdesocketbuffer.cpp M tdeio/bookmarks/kbookmark.cc M tdeio/bookmarks/kbookmarkmanager.cc M tdeio/tdeio/forwardingslavebase.cpp M tdeio/tdeio/job.cpp M tdeio/tdeio/kzip.cpp M tdeio/tdeio/slavebase.cpp M tdeio/tdeio/slaveinterface.cpp |
||
diff --git a/admin b/admin
index 04db460..4dd97fa 160000
--- a/admin
+++ b/admin
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit 4dd97fad9e0c3f39abfd16d13e5b4c93d508513c
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index e4529f2..0c49475 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -170,11 +170,14 @@
bool KHttpProxySocketDevice::parseServerReply()
{
// make sure we're connected
- if (!TDESocketDevice::connect(d->proxy))
- if (error() == InProgress)
+ if (!TDESocketDevice::connect(d->proxy)) {
+ if (error() == InProgress) {
return true;
- else if (error() != NoError)
+ }
+ else if (error() != NoError) {
return false;
+ }
+ }
if (!d->request.isEmpty())
{
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index 16a48cd..e04d74b 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -292,7 +292,7 @@
}
else if (!listen())
// error happened during listen
- return false;
+ return 0L;
}
// check to see if we're doing a timeout
diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp
index 33b8fe7..13c7c04 100644
--- a/tdecore/network/tdesocketbuffer.cpp
+++ b/tdecore/network/tdesocketbuffer.cpp
@@ -183,7 +183,7 @@
{
// calculate how much we'll copy
size_t to_copy = (*it).size() - offset;
- if (to_copy > maxlen)
+ if (to_copy > (size_t)maxlen)
to_copy = maxlen;
// do the copying
@@ -234,12 +234,12 @@
return 0;
TQMutexLocker locker(&m_mutex);
-
+
TQValueListIterator<TQByteArray> it = m_list.begin(),
end = m_list.end();
TQIODevice::Offset offset = m_offset;
TQ_LONG written = 0;
-
+
// walk the buffer
while (it != end && (len || len == -1))
{
@@ -249,8 +249,9 @@
// question is: how big should that buffer be? 2 kB should be enough
TQ_ULONG bufsize = 1460;
- if (len != -1 && len < bufsize)
+ if ((len != -1) && ((TQ_ULONG)len < bufsize)) {
bufsize = len;
+ }
TQByteArray buf(bufsize);
TQ_LONG count = 0;
@@ -263,7 +264,7 @@
}
// see if we can still fit more
- if (count < bufsize && it != end)
+ if ((TQ_ULONG)count < bufsize && it != end)
{
// getting here means this buffer (*it) is larger than
// (bufsize - count) (even for count == 0).
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index 8bbaa5e..0da05be 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -296,16 +296,21 @@
TQString KBookmark::icon() const
{
TQString icon = element.attribute("icon");
- if ( icon.isEmpty() )
+ if ( icon.isEmpty() ) {
// Default icon depends on URL for bookmarks, and is default directory
// icon for groups.
- if ( isGroup() )
+ if ( isGroup() ) {
icon = "bookmark_folder";
- else
- if ( isSeparator() )
+ }
+ else {
+ if ( isSeparator() ) {
icon = "eraser"; // whatever
- else
+ }
+ else {
icon = KMimeType::iconForURL( url() );
+ }
+ }
+ }
return icon;
}
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 60d4f29..47f8c15 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -255,6 +255,7 @@
{
TQDomElement e = n.toElement();
if ( !e.isNull() )
+ {
if ( e.tagName() == "TEXT" )
{
e.setTagName("title");
@@ -280,6 +281,7 @@
convertToXBEL( e );
}
else
+ {
if ( e.tagName() == "BOOKMARK" )
{
e.setTagName("bookmark"); // so much difference :-)
@@ -294,7 +296,11 @@
titleElem.appendChild( e.ownerDocument().createTextNode( text ) );
}
else
+ {
kdWarning(7043) << "Unknown tag " << e.tagName() << endl;
+ }
+ }
+ }
n = n.nextSibling();
}
}
diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp
index e86aaef..c4e4daa 100644
--- a/tdeio/tdeio/forwardingslavebase.cpp
+++ b/tdeio/tdeio/forwardingslavebase.cpp
@@ -69,7 +69,6 @@
kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing=="
<< listing << endl;
** Diff limit reached (max: 250 lines) **
|
||