← Back to branch summary

~ubuntu-branches/ubuntu/vivid/brasero/vivid-proposed

« back to all changes in this revision

Viewing changes to src/brasero-file-chooser.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:
src/brasero-file-chooser.c
284
284
                        parent = gtk_widget_get_parent (widget);
285
285
                        gtk_widget_get_requisition (parent, &request);
286
286
                        width = request.width;
287
 
                        gtk_widget_size_request (parent, &request);
 
287
                        gtk_widget_get_preferred_size (parent, &request, NULL);
288
288
                        if (request.width >= width)
289
289
                                gtk_widget_set_size_request (parent,
290
290
                                                             request.width,
428
428
                                if (packing == GTK_PACK_START) {
429
429
                                        GtkRequisition total_request, footer_request;
430
430
 
431
 
                                        gtk_widget_size_request (GTK_WIDGET (vbox),
432
 
                                                                 &total_request);
433
 
                                        gtk_widget_size_request (GTK_WIDGET (iter_vbox->data),
434
 
                                                                 &footer_request);
 
431
                                        gtk_widget_get_preferred_size (GTK_WIDGET (vbox),
 
432
                                                                 &total_request, NULL);
 
433
                                        gtk_widget_get_preferred_size (GTK_WIDGET (iter_vbox->data),
 
434
                                                                 &footer_request, NULL);
435
435
                                        *((gint *) footer) = total_request.height - footer_request.height;
436
436
                                        break;
437
437
                                }