kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove X11-specific code for detecting whether a KDE desktop is running; wrong logic,

Browse source 
the question was more whether a konqueror instance is running; but all this for a kError
and a "return 1" is overkill anyway.
CCMAIL: raabe@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=844291
This commit is contained in:
David Faure 2008-08-09 07:59:28 +00:00
parent b95da64122
commit 0ce78b81f5
2 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keditbookmarks/CMakeLists.txt
View file

@ -6,9 +6,6 @@ set(kbookmarkmerger_SRCS kbookmarkmerger.cpp )
kde4_add_executable(kbookmarkmerger ${kbookmarkmerger_SRCS})
target_link_libraries(kbookmarkmerger ${KDE4_KIO_LIBS})
if (Q_WS_X11)
target_link_libraries(kbookmarkmerger ${X11_X11_LIB})
endif (Q_WS_X11)
install(TARGETS kbookmarkmerger ${INSTALL_TARGETS_DEFAULT_ARGS})
@ -44,9 +41,6 @@ kde4_add_kcfg_files(keditbookmarks_KDEINIT_SRCS settings.kcfgc )
kde4_add_kdeinit_executable( keditbookmarks ${keditbookmarks_KDEINIT_SRCS})
target_link_libraries(kdeinit_keditbookmarks ${KDE4_KDE3SUPPORT_LIBS} konq ${KDE4_KPARTS_LIBS})
if (Q_WS_X11)
target_link_libraries(kdeinit_keditbookmarks ${X11_X11_LIB})
endif (Q_WS_X11)
install(TARGETS kdeinit_keditbookmarks ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS keditbookmarks ${INSTALL_TARGETS_DEFAULT_ARGS})

36
keditbookmarks/kbookmarkmerger.cpp
View file

@ -33,32 +33,9 @@
#include <QtCore/QDir>
#include <QtXml/qdom.h>
#include <QtCore/QFile>
#ifdef Q_WS_X11
#include <X11/Xlib.h>
#endif
// The code for this function was taken from kdesktop/kcheckrunning.cpp
static bool kdeIsRunning()
{
#ifdef Q_WS_X11
Display *dpy = XOpenDisplay( NULL );
if ( !dpy ) {
return false;
}
Atom atom = XInternAtom( dpy, "_KDE_RUNNING", False );
return XGetSelectionOwner( dpy, atom ) != None;
#else
return true;
#endif
}
int main( int argc, char**argv )
{
const bool kdeRunning = kdeIsRunning();
KAboutData aboutData( "kbookmarkmerger", "keditbookmarks", ki18n( "KBookmarkMerger" ),
"1.0", ki18n( "Merges bookmarks installed by 3rd parties into the user's bookmarks" ),
KAboutData::License_BSD,
@ -126,15 +103,10 @@ int main( int argc, char**argv )
}
if ( didMergeBookmark ) {
if ( kdeRunning ) {
konqBookmarks->emitChanged( konqBookmarks->root() ); // calls save
//konqBookmarks->notifyChanged( "" );
} else {
if ( !konqBookmarks->save() ) {
kError() << "Failed to write merged bookmarks." << endl;
return 1;
}
}
konqBookmarks->emitChanged( konqBookmarks->root() ); // calls save
// see TODO in emitChanged... if it returns false, it would be nice to return 1
// here.
}
return 0;
}