← Back to branch summary

~ubuntu-branches/ubuntu/trusty/me-tv/trusty

« back to all changes in this revision

Viewing changes to src/scan_dialog.cc

  • Committer: Bazaar Package Importer
  • Author(s): Teis Dreijer
  • Date: 2010-02-14 11:29:00 UTC
  • mfrom: (1.1.11 upstream) (3.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100214112900-krutrmpz248vz1ji
Tags: 1.1.6-2
http://bugs.debian.org/568782
* Updated debian/control
  - Removed libgnomem-2.6-dev and libgnomeuimm-2.6-dev
    from Build-Depends (Closes: #568782)
  - Added libgconfmm-2.6-dev to Build-Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scan_dialog.cc
33
33
}
34
34
 
35
35
ScanThread::ScanThread(Dvb::Frontend& scan_frontend, const Glib::ustring& file) :
36
 
        Thread("Scan"), scanner(), initial_tuning_file(file), frontend(scan_frontend)
 
36
        Thread("Scan"), initial_tuning_file(file), frontend(scan_frontend)
37
37
{
38
38
}
39
39
 
70
70
        Glib::ustring result;
71
71
        gboolean done = false;
72
72
        guint i = 0;
73
 
        
74
 
        StringSplitter splitter(SCAN_DIRECTORIES, ":", false, 100);
 
73
 
 
74
        std::vector<Glib::ustring> parts;
 
75
        split_string(parts, SCAN_DIRECTORIES, ":", false, 100);
75
76
 
76
77
        while (!done)
77
78
        {
78
 
                if (i >= splitter.get_count())
 
79
                if (i >= parts.size())
79
80
                {
80
81
                        done = true;
81
82
                }
82
83
                else
83
84
                {
84
 
                        Glib::ustring scan_directory = splitter.get_value(i);
 
85
                        Glib::ustring scan_directory = parts[i];
85
86
                        
86
87
                        g_debug("Checking '%s'", scan_directory.c_str());
87
88
                
385
386
                        throw Exception(_("No tuning file has been selected"));
386
387
                }
387
388
 
 
389
                g_debug("Initial tuning file: '%s'", initial_tuning_file.c_str());
 
390
                
388
391
                Gtk::Button* button = NULL;
389
392
                builder->get_widget("button_scan_wizard_next", button);
390
393
                button->hide();
391
394
                notebook_scan_wizard->next_page();
392
395
 
393
 
                g_debug("Initial tuning file: '%s'", initial_tuning_file.c_str());
394
 
 
395
396
                progress_bar_scan->set_text(_("Starting scanner"));
396
397
                scan_thread = new ScanThread(frontend, initial_tuning_file);
397
398
                Dvb::Scanner& scanner = scan_thread->get_scanner();