← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2010-07-04 15:14:24 UTC
  • mfrom: (1.3.7 upstream)
  • mto: This revision was merged to the branch mainline in revision 74.
  • Revision ID: james.westby@ubuntu.com-20100704151424-yg69h5sc55xgjp6h
Tags: 2.30.2-1
http://bugs.debian.org/568606
http://bugs.debian.org/465238
* New upstream release.
  - Fixes incorrectly reported size by passing correct arguments to
    g_signal_emit(). Closes: #568606
  - Fixes tracker search support. Closes: #465238
* debian/patches/90_relibtoolize.patch
  - Refresh for new upstream release.
* Switch to source formate 3.0 (quilt)
  - Add debian/source/format.
  - Drop Build-Depends on quilt.
  - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
* Bump-Standards-Version to 3.9.0
  - Use architecture wildcard kfreebsd-any for the libcam-dev Build-Depends.
  - Use Breaks instead of Conflicts as recommended by the new policy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
344
344
                                          FALSE,
345
345
                                          TRUE,
346
346
                                          burn_immediately != 0);
347
 
                return;
 
347
                if (burn_immediately)
 
348
                        return;
348
349
        }
349
350
        else if (burn_project_uri) {
350
351
                brasero_app_open_project (app,
352
353
                                          burn_project_uri,
353
354
                                          FALSE,
354
355
                                          TRUE,
355
 
                                          TRUE);
356
 
 
 
356
                                          burn_immediately != 0 /* This is to keep the current behavior which is open main window */);
357
357
                if (g_remove (burn_project_uri) != 0) {
358
358
                        gchar *path;
359
359
 
373
373
                                          TRUE,
374
374
                                          TRUE,
375
375
                                          burn_immediately != 0);
376
 
                return;
 
376
                if (burn_immediately)
 
377
                        return;
377
378
        }
378
379
 
379
380
#endif
420
421
                        return;
421
422
        }
422
423
        else if (files) {
423
 
                if (g_strv_length (files) == 1
424
 
                &&  brasero_app_open_uri (app, files [0], FALSE))
425
 
                        return;
 
424
                if (g_strv_length (files) != 1
 
425
                ||  brasero_app_open_uri (app, files [0], FALSE) == BRASERO_PROJECT_TYPE_INVALID)
 
426
                        brasero_app_data (app, burner, files, burn_immediately != 0);
426
427
 
427
 
                brasero_app_data (app, burner, files, burn_immediately != 0);
428
428
                if (burn_immediately)
429
429
                        return;
430
430
        }