← Back to branch summary

~swem/totem/assignment

« back to all changes in this revision

Viewing changes to src/totem-preferences.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-02-25 19:11:33 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100225191133-7bonpywglovrzohq
Tags: 2.29.91-1
* New upstream development release:
  + debian/patches/90_autotools.patch:
    - Refreshed for the new version.
  + debian/control.in:
    - Update build dependencies and dependencies.
* debian/patches/99_gst-bus_flush.patch:
  + Patch from upstream GIT to fix automatic codec installation
    and random errors showing up from previous tracks.
* debian/control.in:
  + Add ATK build dependency to allow buildds to actually install
    the correct version instead of producing an error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/totem-preferences.c
502
502
void
503
503
totem_setup_preferences (Totem *totem)
504
504
{
505
 
        GtkWidget *menu;
 
505
        GtkWidget *menu, *content_area;
506
506
        GtkAction *action;
507
507
        gboolean show_visuals, auto_resize, is_local, deinterlace, lock_screensaver_on_audio;
508
508
        int connection_speed;
547
547
                        NULL);
548
548
        gtk_dialog_set_has_separator (GTK_DIALOG (totem->prefs), FALSE);
549
549
        gtk_container_set_border_width (GTK_CONTAINER (totem->prefs), 5);
550
 
        gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (totem->prefs)->vbox), 2);
551
 
        gtk_widget_reparent (GTK_WIDGET (item), GTK_DIALOG (totem->prefs)->vbox);
552
 
        gtk_widget_show_all (GTK_DIALOG (totem->prefs)->vbox);
 
550
        content_area = gtk_dialog_get_content_area (GTK_DIALOG (totem->prefs));
 
551
        gtk_box_set_spacing (GTK_BOX (content_area), 2);
 
552
        gtk_widget_reparent (GTK_WIDGET (item), content_area);
 
553
        gtk_widget_show_all (content_area);
553
554
        item = gtk_builder_get_object (totem->xml, "totem_preferences_window");
554
555
        gtk_widget_destroy (GTK_WIDGET (item));
555
556