itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not instantiate cardwidget, devicewidget and rolewidget with a type of EventBox 

RoleWidget::create contains:
    x->get_widget_derived("streamWidget", w);

But streamWidget is defined as following in the glade file:
<object class="GtkEventBox" id="streamWidget">

Where as RoleWidget is derived from [Minimal]StreamWidget, which is derived
from Gtk::VBox, so this is clearly wrong.

Adding:
printf("rolewidget type: %s\n", g_type_name(G_TYPE_FROM_INSTANCE(w->gobj())));
for debugging shows that this really leads to RoleWidget being instantiated
as an EventBox (yet things still work due to sheer luck).

This commit fixes this, by putting the streamWidget id at the right level of
the hierarchy in the glade file (and likewise for cardWidget and deviceWidget).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2014-08-29 09:42:04 +02:00 committed by Tanu Kaskinen
parent b2362f2223
commit e83660bbd6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pavucontrol.glade
View File

@ -12,12 +12,12 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">window1</property> <property name="title" translatable="yes">window1</property>
<child> <child>
<object class="GtkEventBox" id="cardWidget"> <object class="GtkEventBox" id="cardWidgetBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="visible_window">False</property> <property name="visible_window">False</property>
<child> <child>
<object class="GtkVBox" id="cardWidget1"> <object class="GtkVBox" id="cardWidget">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
@ -202,12 +202,12 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">window1</property> <property name="title" translatable="yes">window1</property>
<child> <child>
<object class="GtkEventBox" id="deviceWidget"> <object class="GtkEventBox" id="deviceWidgetBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="visible_window">False</property> <property name="visible_window">False</property>
<child> <child>
<object class="GtkVBox" id="streamWidget2"> <object class="GtkVBox" id="deviceWidget">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
@ -1331,12 +1331,12 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">window1</property> <property name="title" translatable="yes">window1</property>
<child> <child>
<object class="GtkEventBox" id="streamWidget"> <object class="GtkEventBox" id="streamWidgetBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="visible_window">False</property> <property name="visible_window">False</property>
<child> <child>
<object class="GtkVBox" id="streamWidget2"> <object class="GtkVBox" id="streamWidget">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>