[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/kernel
From:       David Faure <faure () kde ! org>
Date:       2008-05-27 21:01:10
Message-ID: 1211922070.769936.20543.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 813491 by dfaure:

Fix #103775 again: in kde3 the loading of cmdline option definitions before \
newInstance was solved by duplicating a lot of code; in kde4 there's no more \
process() virtual method for handling incoming calls, so we need a hook for kontact. \
Also, make sure to always load the args like in kde3, even if empty, otherwise we'll \
reparse the args that were set when launching the app in the first place (e.g. \
kontact --module foo).


 M  +7 -4      kuniqueapplication_p.h  


--- trunk/KDE/kdelibs/kdeui/kernel/kuniqueapplication_p.h #813490:813491
@@ -66,11 +66,14 @@
     if (!asn_id.isEmpty())
       parent()->setStartupId(asn_id);
 
-    if (!args.isEmpty()) {
-      QDataStream ds(args);
-      KCmdLineArgs::loadAppArgs(ds);
-    }
+    // This hook allows the application to set up KCmdLineArgs using \
addCmdLineOptions +    // before we load the app args. Normally not necessary, but \
needed by kontact +    // since it switches to other sets of options when called as \
e.g. kmail or korganizer +    QMetaObject::invokeMethod(parent(), \
"loadCommandLineOptionsForNewInstance");  
+    QDataStream ds(args);
+    KCmdLineArgs::loadAppArgs(ds);
+
     int ret = parent()->newInstance();
     // Must be done out of the newInstance code, in case it is overloaded
     parent()->d->firstInstance = false;


[prev in list] [next in list] [prev in thread] [next in thread]