thooge/keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare for release

Browse Source 
lupdate translations
Always try to clean Klipper history

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@293 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer
2009-03-19 20:54:20 +00:00
parent b350020034
commit 104832fc96
17 changed files with 1134 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/AutoTypeGlobalX11.cpp
View File

@@ -34,7 +34,7 @@ void initAutoType(KeepassMainWindow* mainWin) {
AutoTypeGlobalX11::AutoTypeGlobalX11(KeepassMainWindow* mainWin) : AutoTypeX11(mainWin) {
wm_state = XInternAtom(dpy, "WM_STATE", true);
windowRoot = XRootWindow(dpy, mainWin->x11Info().screen());
focusedWindow = NULL;
focusedWindow = 0;
//windowBlacklist << "kicker" << "KDE Desktop";
classBlacklist << "desktop_window" << "gnome-panel"; // Gnome
classBlacklist << "kdesktop" << "kicker"; // KDE 3
@@ -44,7 +44,7 @@ AutoTypeGlobalX11::AutoTypeGlobalX11(KeepassMainWindow* mainWin) : AutoTypeX11(m
void AutoTypeGlobalX11::perform(IEntryHandle* entry, bool hideWindow, int nr, bool wasLocked){
if (focusedWindow && (!hideWindow || wasLocked)) { // detect if global auto-type
XSetInputFocus(dpy, focusedWindow, RevertToPointerRoot, CurrentTime);
focusedWindow = NULL;
focusedWindow = 0;
}
AutoTypeX11::perform(entry, hideWindow, nr, wasLocked);
}
@@ -205,7 +205,7 @@ void AutoTypeGlobalX11::performGlobal(){
}
if (validEntries.size()==1){
focusedWindow = NULL;
focusedWindow = 0;
perform(validEntries[0],wasLocked,entryNumbers[0],wasLocked);
}
else if (validEntries.size()>1){

14
src/lib/EntryView.cpp
View File

@@ -354,18 +354,8 @@ void KeepassEntryView::OnClipboardTimeOut(){
Clipboard->clear(QClipboard::Selection);
}
#ifdef Q_WS_X11
static bool clearKlipper3 = true;
static bool clearKlipper4 = true;
if (clearKlipper3){
if (QProcess::execute("dcop klipper klipper clearClipboardHistory")!=0)
clearKlipper3 = false;
}
if (clearKlipper4){
if (QProcess::execute("dbus-send --type=method_call --print-reply --dest=org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory")!=0)
clearKlipper4 = false;
}
QProcess::execute("dcop klipper klipper clearClipboardHistory");
QProcess::execute("dbus-send --type=method_call --dest=org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory");
#endif
}