← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to libbrasero-utils/brasero-io.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-utils/brasero-io.c
602
602
        GMount *mounted;
603
603
        GtkWindow *parent;
604
604
        BraseroIOPrivate *priv;
605
 
        GMountOperation *operation;
606
605
        BraseroIOMount mount = { NULL, };
 
606
        GMountOperation *operation = NULL;
607
607
 
608
608
        priv = BRASERO_IO_PRIVATE (self);
609
609
 
610
 
        if (priv->win_callback)
 
610
        if (priv->win_callback) {
611
611
                parent = priv->win_callback (priv->win_user_data);
612
612
 
613
 
        if (parent)
614
 
                operation = gtk_mount_operation_new (parent);
 
613
                if (parent)
 
614
                        operation = gtk_mount_operation_new (parent);
 
615
        }
615
616
 
616
617
        g_file_mount_enclosing_volume (file,
617
618
                                       G_MOUNT_MOUNT_NONE,
619
620
                                       cancel,
620
621
                                       brasero_io_mount_enclosing_volume_cb,
621
622
                                       &mount);
622
 
        g_object_unref (operation);
 
623
        if (operation)
 
624
                g_object_unref (operation);
623
625
 
624
626
        /* sleep and wait operation end */
625
627
        while (!mount.finished && !g_cancellable_is_cancelled (cancel))
2353
2355
                GtkWindow *parent;
2354
2356
 
2355
2357
                parent = priv->win_callback (priv->win_user_data);
2356
 
                xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (gtk_widget_get_window(GTK_WIDGET (parent))));
 
2358
                xid = gdk_x11_window_get_xid (gtk_widget_get_window(GTK_WIDGET (parent)));
2357
2359
                return xid;
2358
2360
        }
2359
2361