aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2009-02-17 05:24:50 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-17 05:24:50 +0800
commitfd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a (patch)
tree74aedeee1800287679f3c9cb88f4d52225705035 /src
parent8b42924a86066e2e62a69376aac5dec523145f8a (diff)
downloadgsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.tar
gsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.tar.gz
gsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.tar.bz2
gsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.tar.lz
gsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.tar.xz
gsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.tar.zst
gsoc2013-empathy-fd8da2db3d38010d88c43dfb6bfaf7bda25a5c4a.zip
Manually add the GtkVolumeButton to the toolbar instead of fitting an empty hole defined in Glade
From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2481
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c11
-rw-r--r--src/empathy-call-window.glade13
2 files changed, 9 insertions, 15 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 24d88e646..f8c32a9c8 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -120,9 +120,10 @@ empathy_call_window_setup_toolbar (EmpathyCallWindow *self)
EmpathyCallWindowPriv *priv = GET_PRIV (self);
GtkWidget *hangup;
GtkWidget *mic;
- GtkWidget *volume;
GtkWidget *volume_button;
GtkWidget *camera;
+ GtkWidget *toolbar;
+ GtkToolItem *tool_item;
hangup = glade_xml_get_widget (priv->glade, "hangup");
@@ -132,10 +133,14 @@ empathy_call_window_setup_toolbar (EmpathyCallWindow *self)
mic = glade_xml_get_widget (priv->glade, "microphone");
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (mic), TRUE);
- volume = glade_xml_get_widget (priv->glade, "volume");
+ toolbar = glade_xml_get_widget (priv->glade, "toolbar1");
+
+ tool_item = gtk_tool_item_new ();
volume_button = gtk_volume_button_new ();
- gtk_container_add (GTK_CONTAINER (volume), volume_button);
+ gtk_container_add (GTK_CONTAINER (tool_item), volume_button);
gtk_scale_button_set_value (GTK_SCALE_BUTTON (volume_button), 0.5);
+ gtk_widget_show_all (GTK_WIDGET (tool_item));
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
camera = glade_xml_get_widget (priv->glade, "camera");
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (camera), FALSE);
diff --git a/src/empathy-call-window.glade b/src/empathy-call-window.glade
index 8d1195675..c1238f32e 100644
--- a/src/empathy-call-window.glade
+++ b/src/empathy-call-window.glade
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Feb 16 11:33:04 2009 -->
+<!--Generated with glade3 3.4.5 on Mon Feb 16 12:20:49 2009 -->
<glade-interface>
<widget class="GtkWindow" id="call_window">
<child>
@@ -99,17 +99,6 @@
</packing>
</child>
<child>
- <widget class="GtkToolItem" id="volume">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkToggleToolButton" id="camera">
<property name="visible">True</property>
<property name="label" translatable="yes">Send video</property>