← Back to branch summary

~ubuntu-branches/ubuntu/lucid/totem/lucid-updates

« back to all changes in this revision

Viewing changes to src/totem-object.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-05-18 11:26:39 UTC
  • mfrom: (1.11.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100518112639-ropmafpm9nxy25cl
Tags: 2.30.2-0ubuntu1
https://launchpad.net/bugs/514658
* New upstream version:
  - Fix volume being at zero when starting playback (lp: #514658)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/totem-object.c
90
90
 
91
91
#define VOLUME_EPSILON (1e-10)
92
92
 
93
 
#define BVW_VBOX_BORDER_WIDTH 1
94
 
 
95
93
/* casts are to shut gcc up */
96
94
static const GtkTargetEntry target_table[] = {
97
95
        { (gchar*) "text/uri-list", 0, 0 },
2820
2818
        if (totem->controls_visibility == TOTEM_CONTROLS_VISIBLE) {
2821
2819
                if (was_fullscreen == FALSE) {
2822
2820
                        height = allocation.height;
2823
 
                        width = allocation.width;
 
2821
                        width = allocation.width;
2824
2822
                }
2825
2823
 
2826
2824
                gtk_widget_set_sensitive (menubar, TRUE);
2844
2842
                                        &value);
2845
2843
                        handle_size = g_value_get_int (&value);
2846
2844
                        g_value_unset (&value);
2847
 
                        
 
2845
 
2848
2846
                        gtk_widget_show (totem->sidebar);
2849
2847
                        gtk_widget_get_allocation (totem->sidebar, &allocation_sidebar);
2850
2848
                        width += allocation_sidebar.width + handle_size;
2852
2850
                        gtk_widget_hide (totem->sidebar);
2853
2851
                }
2854
2852
 
2855
 
                gtk_container_set_border_width (GTK_CONTAINER (bvw_box),
2856
 
                                BVW_VBOX_BORDER_WIDTH);
2857
 
 
2858
2853
                if (was_fullscreen == FALSE) {
2859
2854
                        GtkAllocation allocation_menubar;
2860
2855
                        GtkAllocation allocation_controlbar;
2863
2858
                        gtk_widget_get_allocation (menubar, &allocation_menubar);
2864
2859
                        gtk_widget_get_allocation (controlbar, &allocation_controlbar);
2865
2860
                        gtk_widget_get_allocation (statusbar, &allocation_statusbar);
2866
 
                        height += allocation.height
2867
 
                                + allocation.height
2868
 
                                + allocation.height
2869
 
                                + 2 * BVW_VBOX_BORDER_WIDTH;
2870
 
                        width += 2 * BVW_VBOX_BORDER_WIDTH;
 
2861
                        height += allocation_menubar.height
 
2862
                                + allocation_controlbar.height
 
2863
                                + allocation_statusbar.height;
2871
2864
                        gtk_window_resize (GTK_WINDOW(totem->win),
2872
2865
                                        width, height);
2873
2866
                }