From 3d1fed09597b26c49a1caed12906e6f2411a316b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Quentin?=
<jquentin@jquentin-laptop-kub2.(none)>
Date: Tue, 14 Jul 2009 10:50:29 -0400
Subject: [PATCH] commit to merge master
---
sflphone-client-kde/src/SFLPhone.cpp | 2 +-
sflphone-client-kde/src/sflphone_kdeview.cpp | 4 +++-
sflphone-client-kde/src/ui/sflphone_kdeview_base.ui | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp
index ff1147a9fe..3e3e71ef34 100644
--- a/sflphone-client-kde/src/SFLPhone.cpp
+++ b/sflphone-client-kde/src/SFLPhone.cpp
@@ -178,7 +178,7 @@ void SFLPhone::quitButton()
if(view->listWidget_callList->count() > 0 && instance.getRegistrationCount() <= 1)
{
qDebug() << "Attempting to quit when still having some calls open.";
- view->getErrorWindow()->showMessage(i18n("You still have some calls open. Please close all calls before quitting."));
+// view->getErrorWindow()->showMessage(i18n("You still have some calls open. Please close all calls before quitting."));
}
instance.Unregister(getpid());
qApp->quit();
diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp
index 3e144e160e..08c32b772d 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/src/sflphone_kdeview.cpp
@@ -134,7 +134,6 @@ sflphone_kdeView::~sflphone_kdeView()
delete configDialog;
delete wizard;
delete callList;
- delete errorWindow;
}
void sflphone_kdeView::loadWindow()
@@ -1456,6 +1455,9 @@ void sflphone_kdeView::enableAddressBook()
qDebug() << "\nenableAddressBook\n";
lineEdit_addressBook->clear();
lineEdit_addressBook->setEnabled(true);
+ AddressBook * ab = StdAddressBook::self(true);
+ disconnect(ab, SIGNAL(addressBookChanged(AddressBook *)),
+ this, SLOT(enableAddressBook()));
}
bool sflphone_kdeView::loadAddressBook()
diff --git a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
index 831907f407..894853e34b 100644
--- a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
+++ b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
@@ -29,7 +29,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="page_callList">
<layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -67,10 +67,10 @@
<item>
<widget class="KLineEdit" name="lineEdit_addressBook">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="text">
- <string>Address book loading...</string>
+ <string/>
</property>
<property name="showClearButton" stdset="0">
<bool>true</bool>
--
GitLab