diff options
| author | Bastien Nocera <hadess@hadess.net> | 2010-05-05 17:10:37 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2010-05-05 17:14:28 +0100 |
| commit | 5094bc8374a4789baead4603d2153162711b65a4 (patch) | |
| tree | 857f1944f90dc97ccc79fc4f04faae6f2434c7a5 | |
| parent | d2ac95ec42d439a6cf1c0106baa0695dc0ead86a (diff) | |
| download | totem-5094bc8374a4789baead4603d2153162711b65a4.tar.gz | |
Remove use of GConf volume variable
Seeing as it's not set anywhere anymore, and PulseAudio is
supposed to remember the volume of the previous stream.
https://bugzilla.gnome.org/show_bug.cgi?id=617525
| -rw-r--r-- | browser-plugin/totem-plugin-viewer.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c index 64c13387e..cc816a8a2 100644 --- a/browser-plugin/totem-plugin-viewer.c +++ b/browser-plugin/totem-plugin-viewer.c @@ -1804,8 +1804,6 @@ totem_embedded_construct (TotemEmbedded *emb, GtkWidget *menu; BvwUseType type; GError *err = NULL; - GConfClient *gc; - double volume; emb->xml = totem_interface_load ("mozilla-viewer.ui", TRUE, GTK_WINDOW (emb->window), emb); @@ -1947,20 +1945,13 @@ totem_embedded_construct (TotemEmbedded *emb, g_signal_connect (G_OBJECT (popup_button), "button-press-event", G_CALLBACK (on_popup_button_button_pressed), emb); - gc = gconf_client_get_default (); - volume = ((double) gconf_client_get_int (gc, GCONF_PREFIX"/volume", NULL)) / 100.0; - g_object_unref (G_OBJECT (gc)); - emb->volume = GTK_WIDGET (gtk_builder_get_object (emb->xml, "volume_button")); gtk_scale_button_set_adjustment (GTK_SCALE_BUTTON (emb->fs->volume), gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (emb->volume))); gtk_button_set_focus_on_click (GTK_BUTTON (emb->volume), FALSE); - gtk_scale_button_set_value (GTK_SCALE_BUTTON (emb->volume), volume); g_signal_connect (G_OBJECT (emb->volume), "value-changed", G_CALLBACK (cb_vol), emb); - bacon_video_widget_set_volume (emb->bvw, volume); - totem_embedded_volume_changed (emb, volume); emb->statusbar = TOTEM_STATUSBAR (gtk_builder_get_object (emb->xml, "statusbar")); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (emb->statusbar), FALSE); |