View | Details | Raw Unified | Return to bug 155355
Collapse All | Expand All

(-)kio/kio/krun.cpp.sav (-2 / +7 lines)
Lines 693-703 pid_t KRun::run( const KService& _servic Link Here
693
693
694
pid_t KRun::run( const KService& _service, const KURL::List& _urls, bool tempFiles )
694
pid_t KRun::run( const KService& _service, const KURL::List& _urls, bool tempFiles )
695
{
695
{
696
    return run( _service, _urls, 0, tempFiles );
697
}
698
699
pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles )
700
{
696
  if (!_service.desktopEntryPath().isEmpty() &&
701
  if (!_service.desktopEntryPath().isEmpty() &&
697
      !KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath()))
702
      !KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath()))
698
  {
703
  {
699
     kdWarning() << "No authorization to execute " << _service.desktopEntryPath() << endl;
704
     kdWarning() << "No authorization to execute " << _service.desktopEntryPath() << endl;
700
     KMessageBox::sorry(0, i18n("You are not authorized to execute this service."));
705
     KMessageBox::sorry(window, i18n("You are not authorized to execute this service."));
701
     return 0;
706
     return 0;
702
  }
707
  }
703
708
Lines 735-741 pid_t KRun::run( const KService& _servic Link Here
735
  if (i != 0)
740
  if (i != 0)
736
  {
741
  {
737
     kdDebug(7010) << error << endl;
742
     kdDebug(7010) << error << endl;
738
     KMessageBox::sorry( 0L, error );
743
     KMessageBox::sorry( window, error );
739
     return 0;
744
     return 0;
740
  }
745
  }
741
746
(-)kio/kio/krun.h.sav (+13 lines)
Lines 192-197 public: Link Here
192
   * @param _service the service to run
192
   * @param _service the service to run
193
   * @param _urls the list of URLs, can be empty (app launched
193
   * @param _urls the list of URLs, can be empty (app launched
194
   *        without argument)
194
   *        without argument)
195
   * @param window The top-level widget of the app that invoked this object.
196
   * @param tempFiles if true and _urls are local files, they will be deleted
197
   *        when the application exits.
198
   * @return the process id, or 0 on error
199
   * @since 3.5.2
200
   */
201
  static pid_t run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles = false );
202
  /**
203
   * Open a list of URLs with a certain service (application).
204
   *
205
   * @param _service the service to run
206
   * @param _urls the list of URLs, can be empty (app launched
207
   *        without argument)
195
   * @param tempFiles if true and _urls are local files, they will be deleted
208
   * @param tempFiles if true and _urls are local files, they will be deleted
196
   *        when the application exits.
209
   *        when the application exits.
197
   * @return the process id, or 0 on error
210
   * @return the process id, or 0 on error

Return to bug 155355