--Boundary-00=_s361/KlLGRShjBU
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Content-Description: clearsigned data
Content-Disposition: inline

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello Olaf,

On Wednesday 10 December 2003 13:48, Olaf Jan Schmidt wrote:
> Hi!
>
> Here are two patches for KMouth.
>
> The first is a trivial compile fix for the 3.1 branch.
>
Well, as we currently do not have a 3.1 branch of kdeaccessibility I
suppose you wanted to say that it fixes the compilation of the HEAD
kdeaccessibility with KDE 3.1. As the HEAD kdeaccessibility module is
supposed to work with any KDE 3.x version I think it is OK to commit.
(Please mention in the commit message that kdeaccessibility 3.2 is
supposed to work with KDE 3.1.)

> The second fixes the phraselist edit actions, which are disfunctional in
> current CVS. The problem is that there are circular dependencies in the
> order of things needing to be initialised:
>
> - createGUI() requires the actions to be initialised first
> - The phraselist actions require phraseList to be initialised first
> (this was not the case, hence they did not work)
> - phraseList initialisation requires readOptions() first
> - readOptions() requires initialising the "Options" menu actions first
> - readOptions() also initialises the phraselist menu, which requires
> calling createGUI() first
>
> My patch solves this by initialising the actions from the "Options" menu
> earlier and calling createGUI() twice. A cleaner solution might be to
> split readOptions(). Gunnar, is that possible?
>
Your patch has a side effect: it removes the phrase book bar. However,
after a small investigation I saw that you can break the initialization of
the phrase list: initPhraseList() could be done earlier. Can you please
review the attached patch?

Gunnar Schmi Dt
- --
Co-maintainer of the KDE Accessibility Project
Maintainer of the kdeaccessibility package
http://accessibility.kde.org/


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE/163xsxZ93p+gHn4RAjlOAKD9E7MM0oBTJnM4EZnDd6t1ddNRVQCfRweS
PAaTk/Lm45C16dXCKarl1nc=
=tAez
-----END PGP SIGNATURE-----

--Boundary-00=_s361/KlLGRShjBU
Content-Type: text/x-diff;
  charset="utf-8";
  name="kmouth.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="kmouth.diff"

Index: kmouth.cpp
===================================================================
RCS file: /home/kde/kdeaccessibility/kmouth/kmouth.cpp,v
retrieving revision 1.14
diff -u -p -r1.14 kmouth.cpp
--- kmouth.cpp	31 Aug 2003 18:21:03 -0000	1.14
+++ kmouth.cpp	10 Dec 2003 23:36:59 -0000
@@ -44,15 +44,17 @@ KMouthApp::KMouthApp(QWidget* , const ch
 {
    isConfigured = false;
    config=kapp->config();
-   phraseList = 0;
 
    ///////////////////////////////////////////////////////////////////
    // call inits to invoke all other construction parts
    initStatusBar();
+   initPhraseList();
    initActions();
    optionsDialog = new OptionsDialog(this);
    connect (optionsDialog, SIGNAL(configurationChanged ()),
             this, SLOT(slotConfigurationChanged ()));
+   connect (optionsDialog, SIGNAL(configurationChanged ()),
+            phraseList, SLOT(configureCompletion ()));
 
    phrases = new KActionCollection (this);
 
@@ -73,9 +75,6 @@ KMouthApp::KMouthApp(QWidget* , const ch
    delete wizard;
 
    if (isConfigured) {
-      initPhraseList();
-      connect (optionsDialog, SIGNAL(configurationChanged ()),
-               phraseList, SLOT(configureCompletion ()));
       phraseList->configureCompletion();
    }
 

--Boundary-00=_s361/KlLGRShjBU
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
kde-accessibility mailing list
kde-accessibility@kde.org
https://mail.kde.org/mailman/listinfo/kde-accessibility

--Boundary-00=_s361/KlLGRShjBU--