summaryrefslogtreecommitdiffstats
path: root/gtk/src/ghb.ui
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-02-01 19:29:55 +0000
committerjstebbins <[email protected]>2013-02-01 19:29:55 +0000
commit478574ed1d6161a49212d29ff3911dfad15da5f3 (patch)
tree6e1c4f4884b1037b10a312cab68040a88111b594 /gtk/src/ghb.ui
parenta47fd8fc599f9abf4e53bafe8cec33b1de466f0c (diff)
LinGui: fix crash caused by bug in newer versions of gtk2
GtkCombobBoxText is not initialized correctly by gtk2. Reading out it's current value fails and returns NULL. So explicitely initialize the text column value and guard against future bugs by checking return value. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5231 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/ghb.ui')
-rw-r--r--gtk/src/ghb.ui14
1 files changed, 1 insertions, 13 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 5228d4ce2..53e65b4cd 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -542,12 +542,6 @@
</popup>
</ui>
</object>
- <object class="GtkListStore" id="device_list">
- <columns>
- <!-- column-name device -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkMenu" id="presets_menu">
<child>
@@ -8436,14 +8430,8 @@ libx264 authors:
<child>
<object class="GtkComboBoxText" id="source_device">
<property name="visible">True</property>
- <property name="model">device_list</property>
+ <property name="entry-text-column">0</property>
<signal handler="dvd_device_changed_cb" name="changed"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
</object>
</child>
</object>