~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to libbrasero-burn/burn-image-format.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-18 17:53:39 UTC
  • mfrom: (1.1.47 upstream) (1.4.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110518175339-so6a6fejezs5i1pc
Tags: 3.0.0-1ubuntu1
* Rebase from Debian and GNOME3 PPA. Remaining Ubuntu changes:
* debian/control:
  - Build-Depend on dh-autoreconf, libappindicator3-dev and
    liblaunchpad-integration-3.0-dev
  - Recommends: brasero-cdrkit
  - libbrasero-media3-1 Depends on dvd+rw-tools not growisofs and
    Suggests rather than Recommends gstreamer plugin packages
* debian/patches/010_lpi.patch:
  - Launchpad integration patch
* debian/patches/012_appindicator.patch:
  - Use application indicators
* debian/rules:
  - Include autoreconf.mk
* debian/watch:
  - Watch unstable releases also

Show diffs side-by-side

added added

removed removed

Lines of Context:
307
307
                file = g_file_new_for_commandline_arg (img_uri);
308
308
                g_free (img_uri);
309
309
        }
 
310
        else
 
311
                return FALSE;
310
312
 
311
313
        g_free (path);
312
314
 
840
842
}
841
843
 
842
844
gchar *
843
 
brasero_image_format_get_default_path (BraseroImageFormat format)
 
845
brasero_image_format_get_default_path (BraseroImageFormat format,
 
846
                                       const gchar *name)
844
847
{
845
848
        const gchar *suffixes [] = {".iso",
846
849
                                    ".toc",
860
863
        else if (format & BRASERO_IMAGE_FORMAT_CDRDAO)
861
864
                suffix = suffixes [3];
862
865
 
863
 
        path = g_strdup_printf ("%s/brasero%s",
 
866
        path = g_strdup_printf ("%s/%s%s",
864
867
                                g_get_home_dir (),
 
868
                                name? name:"brasero",
865
869
                                suffix);
866
870
 
867
871
        while (g_file_test (path, G_FILE_TEST_EXISTS)) {
868
872
                g_free (path);
869
873
 
870
 
                path = g_strdup_printf ("%s/brasero-%i%s",
 
874
                path = g_strdup_printf ("%s/%s-%i%s",
871
875
                                        g_get_home_dir (),
 
876
                                        name? name:"brasero",
872
877
                                        i,
873
878
                                        suffix);
874
879
                i ++;