diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-02 21:21:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-02 21:21:15 +0000 |
| commit | 96900dbce3aaa1fcac74a07a71482c5c6fcd3cab (patch) | |
| tree | bf3fc68d0dcc660fce0e21171373a2d4e2395707 /interfaces | |
| parent | 5f99bff82d3413803bcc652999f4f631058179d6 (diff) | |
| download | tdelibs-96900dbce3aaa1fcac74a07a71482c5c6fcd3cab.tar.gz tdelibs-96900dbce3aaa1fcac74a07a71482c5c6fcd3cab.zip | |
* Large set of SuSE patches to fix bugs and add functionality
* kdemm is included but not used by knotify as it does not work out of the box
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171141 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'interfaces')
| -rw-r--r-- | interfaces/kimproxy/library/kimproxy.cpp | 2 | ||||
| -rw-r--r-- | interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp index d3cf1ef24..44f828a02 100644 --- a/interfaces/kimproxy/library/kimproxy.cpp +++ b/interfaces/kimproxy/library/kimproxy.cpp @@ -204,7 +204,7 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject() // FIXME: make this work when the sender object id is set to KIMIFace if ( !connectDCOPSignal( 0, 0, method, method, false ) ) - KMessageBox::information( 0, TQString( "Couldn't connect DCOP signal.\nWon't receive any status notifications!" ) ); + kdWarning() << "Couldn't connect DCOP signal. Won't receive any status notifications!" << endl; } KIMProxy::~KIMProxy( ) diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 11fa58f27..79ef97e42 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -13,7 +13,7 @@ #include <kmimetype.h> #include <kparts/componentfactory.h> -#include <kplayobjectfactory.h> +#include <kdemm/factory.h> #include <config-kfile.h> @@ -58,7 +58,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) { KGlobal::locale()->insertCatalogue("kfileaudiopreview"); - TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); + TQStringList formats = KDE::Multimedia::Factory::self()->playableMimeTypes(); // ### TQStringList::ConstIterator it = formats.begin(); for ( ; it != formats.end(); ++it ) |