← Back to branch summary

~ubuntu-branches/ubuntu/maverick/k3b/maverick

« back to all changes in this revision

Viewing changes to src/k3bsystemproblemdialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-02-08 16:38:36 UTC
  • mfrom: (1.1.22 upstream) (2.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100208163836-3iiu9xef2yzmfbmi
Tags: 1.70.0~beta1+svn1087124-0ubuntu1
https://launchpad.net/bugs/459058
* Merge with Debian Unstable, remaining changes:
  - Do not add build-depend on libdvdread-dev
  - Keep Kubuntu VCS entries
  - Suggest, not recommend libk3b6-extracodecs
  - Keep conflicts/replaces on older k3b versions
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff, the above two patches
    take care of this for us (without string changes, too)
  - Disable 112_dont_require_mp3.diff, it causes the package to FTBFS
  - Keep Kubuntu l10n stuff in debian/rules
* New upstream svn snapshot:
  - Depend on polkit-kde-1 or policykit-1-gnome instead of
    kdebase-workspace-bin now that K3b Setup has been ported to KAuth which
    uses Polkit-1 (LP: #459058)
  - Remove dependency on libpolkit-qt-dev for the above
  - Drop 114_fix_ftbfs_kfreebsd.diff and 113_add_kfreebsd_support.diff,
    applied upstream
  - Update .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/k3bsystemproblemdialog.cpp
175
175
        problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL,
176
176
                                           i18n("No optical drive found."),
177
177
                                           i18n("K3b did not find any optical device in your system."),
178
 
#ifdef Q_OS_LINUX
 
178
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
179
179
                                           i18n("Make sure HAL daemon is running, it is used by K3b for finding devices.")
 
180
#else
 
181
                                           QString()
180
182
#endif
181
183
                                           ) );
182
184
    }
208
210
                                                   i18n("Install a more recent version of the cdrtools.") ) );
209
211
            }
210
212
 
 
213
/*
211
214
#ifdef Q_OS_LINUX
212
215
 
213
216
            //
240
243
                                                   i18n("Click \"Modify Permissions...\" to solve this problem.") ) );
241
244
#endif // CDRECORD_SUID_ROOT_CHECK
242
245
#endif
 
246
*/
243
247
        }
244
248
 
245
249
        if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
248
252
                                               i18n("K3b uses cdrdao to actually write CDs."),
249
253
                                               i18n("Install the cdrdao package.") ) );
250
254
        }
 
255
/*
251
256
        else {
252
257
#ifdef Q_OS_LINUX
253
258
#ifdef CDRECORD_SUID_ROOT_CHECK
261
266
#endif // CDRECORD_SUID_ROOT_CHECK
262
267
#endif
263
268
        }
 
269
*/
264
270
    }
265
271
 
266
272
 
491
497
            break;
492
498
        }
493
499
    }
 
500
    /*
494
501
    if( !haveMp3Decoder ) {
495
502
        problems.append( K3b::SystemProblem( K3b::SystemProblem::WARNING,
496
503
                                           i18n("MP3 Audio Decoder plugin not found."),
502
509
                                                "due to the missing libmad). Some distributions allow installation of MP3 support "
503
510
                                                "via an online update tool.") ) );
504
511
    }
 
512
    */
505
513
 
506
514
#ifdef HAVE_ICONV_H
507
515
    char* codec = nl_langinfo( CODESET );
565
573
    if( problems.isEmpty() ) {
566
574
        kDebug() << "          - none - ";
567
575
        if( level == AlwaysNotify ) {
568
 
            K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
 
576
//            K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
569
577
        }
570
578
    }
571
579
    else {