meld r1070 - trunk/glade2

[kaiw svn gnome org]

Author: kaiw
Date: Tue Oct 14 17:16:06 2008
New Revision: 1070
URL: http://svn.gnome.org/viewvc/meld?rev=1070&view=rev

Log:
Fix line wrapping preference that was broken during UIManager porting â Bug 554536

Modified:
   trunk/glade2/meldapp.glade

Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade	(original)
+++ trunk/glade2/meldapp.glade	Tue Oct 14 17:16:06 2008
@@ -923,8 +923,40 @@
                                       <widget class="GtkOptionMenu" id="option_wrap_lines">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="response_id">0</property>
+                                        <property name="history">0</property>
                                         <signal name="changed" handler="on_option_wrap_lines_changed"/>
+
+                                        <child>
+                                          <widget class="GtkMenu" id="menu1">
+
+                                            <child>
+                                              <widget class="GtkMenuItem" id="menu_wrap_none">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">_None</property>
+                                                <property name="use_underline">True</property>
+                                                <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
+                                              </widget>
+                                            </child>
+
+                                            <child>
+                                              <widget class="GtkMenuItem" id="menu_wrap_char">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">_Character</property>
+                                                <property name="use_underline">True</property>
+                                                <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
+                                              </widget>
+                                            </child>
+
+                                            <child>
+                                              <widget class="GtkMenuItem" id="menu_wrap_word">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">_Word</property>
+                                                <property name="use_underline">True</property>
+                                                <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                        </child>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>