aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-23 22:45:19 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-23 22:50:45 +0800
commite56440d55856fb0c3d3f88a6a31e362f563a3030 (patch)
treeaf15d88b826f1514fe961b8603a15663d4ea5461
parent4e100e3643f5fd5c7a1e37aabd2e2d481b27e35d (diff)
downloadgsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.tar
gsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.tar.gz
gsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.tar.bz2
gsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.tar.lz
gsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.tar.xz
gsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.tar.zst
gsoc2013-empathy-e56440d55856fb0c3d3f88a6a31e362f563a3030.zip
In gtk2 GtkProgressBar doesn't implement GTK_ORIENTABLE
-rw-r--r--src/empathy-call-window.c5
-rw-r--r--src/empathy-streamed-media-window.c8
2 files changed, 3 insertions, 10 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5e28002b8..77653ffff 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -586,8 +586,9 @@ empathy_call_window_create_audio_input (EmpathyCallWindow *self)
priv->volume_progress_bar = gtk_progress_bar_new ();
- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->volume_progress_bar),
- GTK_ORIENTATION_VERTICAL);
+ gtk_progress_bar_set_orientation (
+ GTK_PROGRESS_BAR (priv->volume_progress_bar),
+ GTK_PROGRESS_BOTTOM_TO_TOP);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->volume_progress_bar),
0);
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index 9635c6de5..e203bdc5f 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -602,17 +602,9 @@ empathy_streamed_media_window_create_audio_input (EmpathyStreamedMediaWindow *se
priv->volume_progress_bar = gtk_progress_bar_new ();
- /* FIXME: Once we unconditionally depend on GTK+ 3, we can remove the fallback
- * for GTK+ 2 here. GtkProgressBar doesn't implement GtkOrientable in GTK+ 2,
- * unfortunately. */
-#ifndef HAVE_GTK3
gtk_progress_bar_set_orientation (
GTK_PROGRESS_BAR (priv->volume_progress_bar),
GTK_PROGRESS_BOTTOM_TO_TOP);
-#else
- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->volume_progress_bar),
- GTK_ORIENTATION_VERTICAL);
-#endif
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->volume_progress_bar),
0);