diff options
| author | Guillaume Desmottes <gdesmott@gnome.org> | 2009-02-17 05:24:50 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2009-02-17 05:24:50 +0800 |
| commit | 71b8046e41b9aa874563754d1ad47590f15c1b10 (patch) | |
| tree | 74aedeee1800287679f3c9cb88f4d52225705035 | |
| parent | 3a188478a8be5fda6ec7db849bad28d9d11e11bf (diff) | |
| download | gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.tar gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.tar.gz gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.tar.bz2 gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.tar.lz gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.tar.xz gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.tar.zst gsoc2013-empathy-71b8046e41b9aa874563754d1ad47590f15c1b10.zip | |
Manually add the GtkVolumeButton to the toolbar instead of fitting an empty hole defined in Glade
From: Guillaume Desmottes <gdesmott@gnome.org>
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2481 4ee84921-47dd-4033-b63a-18d7a039a3e4
| -rw-r--r-- | src/empathy-call-window.c | 11 | ||||
| -rw-r--r-- | src/empathy-call-window.glade | 13 |
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> |