diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-16 18:37:10 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-16 18:37:10 +0800 |
| commit | ba64e4982bf47cbbb0bd2db754b888ea7affa90a (patch) | |
| tree | 24d3805a869dccb69dba0e7378e9a5d7fb9c2a46 | |
| parent | 18905073c9948920f1804540b332fb0758e2e5a3 (diff) | |
| parent | 2220cb934612b293018e364ae22f1229f1023e0e (diff) | |
| download | gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.tar gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.tar.gz gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.tar.bz2 gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.tar.lz gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.tar.xz gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.tar.zst gsoc2013-empathy-ba64e4982bf47cbbb0bd2db754b888ea7affa90a.zip | |
Merge branch 'call-details-644830'
| -rw-r--r-- | src/empathy-streamed-media-window.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index 3d0224516..390e2ddfa 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -1038,6 +1038,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) gchar *filename; GKeyFile *keyfile; GError *error = NULL; + GtkWidget *scroll; filename = empathy_file_lookup ("empathy-call-window.ui", "src"); gui = empathy_builder_get_file (filename, @@ -1194,8 +1195,14 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) gtk_widget_set_sensitive (priv->dtmf_panel, FALSE); + /* Put the details vbox in a scroll window as it can require a lot of + * horizontal space. */ + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), + priv->details_vbox); + ev_sidebar_add_page (EV_SIDEBAR (priv->sidebar), "details", - _("Details"), priv->details_vbox); + _("Details"), scroll); gtk_widget_show_all (top_vbox); |