← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to kinit/kinit.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kinit/kinit.cpp
641
641
 
642
642
        setup_tty( tty );
643
643
 
644
 
        QByteArray executable = execpath.data();
 
644
        QByteArray executable = execpath;
645
645
#ifdef Q_WS_MAC
646
 
        QString bundlepath = s_instance->dirs()->findExe( execpath.data() );
 
646
        QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(executable));
647
647
        if (!bundlepath.isEmpty())
648
648
           executable = QFile::encodeName(bundlepath);
649
649
#endif
1560
1560
#endif
1561
1561
 
1562
1562
   display.replace(':','_');
 
1563
#ifdef __APPLE__
 
1564
   display.replace('/','_');
 
1565
#endif
1563
1566
   // WARNING, if you change the socket name, adjust kwrapper too
1564
1567
   const QString socketFileName = QString::fromLatin1("kdeinit4_%1").arg(QLatin1String(display));
1565
1568
   QByteArray socketName = QFile::encodeName(KStandardDirs::locateLocal("socket", socketFileName, *s_instance));