← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to libbrasero-burn/brasero-session.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:
libbrasero-burn/brasero-session.c
196
196
brasero_burn_session_start_track_monitoring (BraseroBurnSession *self,
197
197
                                             BraseroTrack *track)
198
198
{
199
 
        BraseroBurnSessionPrivate *priv;
200
 
 
201
 
        priv = BRASERO_BURN_SESSION_PRIVATE (self);
202
199
        g_signal_connect (track,
203
200
                          "changed",
204
201
                          G_CALLBACK (brasero_burn_session_track_changed),
1382
1379
                                           const gchar *path)
1383
1380
{
1384
1381
        gchar *retval = NULL;
1385
 
        BraseroBurnSessionPrivate *priv;
1386
 
 
1387
 
        priv = BRASERO_BURN_SESSION_PRIVATE (self);
1388
1382
 
1389
1383
        if (format == BRASERO_IMAGE_FORMAT_CLONE)
1390
1384
                retval = g_strdup_printf ("%s.toc", path);
2059
2053
                return NULL;
2060
2054
 
2061
2055
        track = priv->tracks->data;
2062
 
        if (!BRASERO_TRACK_DISC (track))
 
2056
        if (!BRASERO_IS_TRACK_DISC (track))
2063
2057
                return NULL;
2064
2058
 
2065
2059
        drive = brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track));
2177
2171
                          ...)
2178
2172
{
2179
2173
        va_list args;
2180
 
        BraseroBurnSessionPrivate *priv;
2181
2174
 
2182
2175
        g_return_if_fail (BRASERO_IS_BURN_SESSION (self));
2183
2176
 
2184
 
        priv = BRASERO_BURN_SESSION_PRIVATE (self);
2185
 
 
2186
2177
        va_start (args, format);
2187
2178
        brasero_burn_session_logv (self, format, args);
2188
2179
        va_end (args);
2489
2480
                                   const GValue *value,
2490
2481
                                   GParamSpec *pspec)
2491
2482
{
2492
 
        BraseroBurnSessionPrivate *priv;
2493
 
 
2494
2483
        g_return_if_fail (BRASERO_IS_BURN_SESSION (object));
2495
2484
 
2496
 
        priv = BRASERO_BURN_SESSION_PRIVATE (object);
2497
 
 
2498
2485
        switch (prop_id)
2499
2486
        {
2500
2487
        case PROP_TMPDIR: