empathy r2481 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Feb 16 21:24:50 2009
New Revision: 2481
URL: http://svn.gnome.org/viewvc/empathy?rev=2481&view=rev

Log:
Manually add the GtkVolumeButton to the toolbar instead of fitting an empty hole defined in Glade

From: Guillaume Desmottes <gdesmott gnome org>

Modified:
   trunk/src/empathy-call-window.c
   trunk/src/empathy-call-window.glade

Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c	(original)
+++ trunk/src/empathy-call-window.c	Mon Feb 16 21:24:50 2009
@@ -120,9 +120,10 @@
   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 @@
   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);

Modified: trunk/src/empathy-call-window.glade
==============================================================================
--- trunk/src/empathy-call-window.glade	(original)
+++ trunk/src/empathy-call-window.glade	Mon Feb 16 21:24:50 2009
@@ -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>