-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp index 75a8189..49115d8 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.cpp +++ b/x11/libqpe-x11/qpe/qpeapplication.cpp | |||
@@ -715,49 +715,49 @@ void QPEApplication::prepareForTermination( bool willrestart ) | |||
715 | #ifndef SINGLE_APP | 715 | #ifndef SINGLE_APP |
716 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); | 716 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); |
717 | } | 717 | } |
718 | processEvents(); // ensure the message goes out. | 718 | processEvents(); // ensure the message goes out. |
719 | sleep( 1 ); // You have 1 second to comply. | 719 | sleep( 1 ); // You have 1 second to comply. |
720 | #endif | 720 | #endif |
721 | } | 721 | } |
722 | int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { | 722 | int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { |
723 | qWarning("X11 ClientMessage %d %d", event->type, ClientMessage); | 723 | qWarning("X11 ClientMessage %d %d", event->type, ClientMessage); |
724 | if ( event->type == ClientMessage ) { | 724 | if ( event->type == ClientMessage ) { |
725 | if ( (event->xclient.message_type == d->wm_protocols) && | 725 | if ( (event->xclient.message_type == d->wm_protocols) && |
726 | (event->xclient.data.l[0] == d->wm_context_accept ) ) { | 726 | (event->xclient.data.l[0] == d->wm_context_accept ) ) { |
727 | qWarning("accepted!!!"); | 727 | qWarning("accepted!!!"); |
728 | /* | 728 | /* |
729 | * I'm not sure if we should use activeWidget | 729 | * I'm not sure if we should use activeWidget |
730 | * or activeModalWidget | 730 | * or activeModalWidget |
731 | * a QDialog could be not modal too | 731 | * a QDialog could be not modal too |
732 | */ | 732 | */ |
733 | if ( w->inherits("QDialog" ) ) { | 733 | if ( w->inherits("QDialog" ) ) { |
734 | qWarning("inherits QDialog!!!"); | 734 | qWarning("inherits QDialog!!!"); |
735 | QDialog* dia = (QDialog*)w; | 735 | QDialog* dia = (QDialog*)w; |
736 | /* | 736 | /* |
737 | * call it directly or via QTimer::singleShot? | 737 | * call it directly or via QTimer::singleShot? |
738 | */ | 738 | */ |
739 | QTimer::singleShot(0, dia, SLOT(reject() ) ); | 739 | QTimer::singleShot(0, dia, SLOT(accept() ) ); |
740 | return 0; | 740 | return 0; |
741 | } | 741 | } |
742 | 742 | ||
743 | } | 743 | } |
744 | } | 744 | } |
745 | return QApplication::x11ClientMessage(w, event, b ); | 745 | return QApplication::x11ClientMessage(w, event, b ); |
746 | } | 746 | } |
747 | 747 | ||
748 | #define KeyPress XKeyPress | 748 | #define KeyPress XKeyPress |
749 | #define KeyRelease XKeyRelease | 749 | #define KeyRelease XKeyRelease |
750 | 750 | ||
751 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 751 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
752 | 752 | ||
753 | // The libraries with the skiff package (and possibly others) have | 753 | // The libraries with the skiff package (and possibly others) have |
754 | // completely useless implementations of builtin new and delete that | 754 | // completely useless implementations of builtin new and delete that |
755 | // use about 50% of your CPU. Here we revert to the simple libc | 755 | // use about 50% of your CPU. Here we revert to the simple libc |
756 | // functions. | 756 | // functions. |
757 | 757 | ||
758 | void* operator new[]( size_t size ) | 758 | void* operator new[]( size_t size ) |
759 | { | 759 | { |
760 | return malloc( size ); | 760 | return malloc( size ); |
761 | } | 761 | } |
762 | 762 | ||
763 | void* operator new( size_t size ) | 763 | void* operator new( size_t size ) |