[mousetweaks] Fix context menu in click-type selection window

[Gerd Kohlberger <gerdk src gnome org>]

commit 3ad313e8b2e8e0b993d9bbb3777024c2513103cf
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Sun May 31 09:47:07 2009 +0200

    Fix context menu in click-type selection window
    
    The menu got lost during the migration to GtkBuilder. This commit
    also raises the minimum dependency of gtk+ to 2.16.
---
 configure.ac        |    2 +-
 data/mousetweaks.ui |   36 +++++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index bccf4dd..47b37ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ GNOME_DOC_INIT
 dnl *** dependencies ***
 
 PKG_CHECK_MODULES(DEPENDENCIES,
-	gtk+-2.0 >= 2.13.1
+	gtk+-2.0 >= 2.16
 	gconf-2.0 >= 2.16.0
 	dbus-glib-1 >= 0.7
 	cspi-1.0
diff --git a/data/mousetweaks.ui b/data/mousetweaks.ui
index 9f072c6..b48abf3 100644
--- a/data/mousetweaks.ui
+++ b/data/mousetweaks.ui
@@ -1,12 +1,7 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkUIManager" id="uimanager"/>
-  <object class="GtkMenu" id="popup">
-    <property name="visible">True</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-  </object>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="ctw">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">4</property>
@@ -202,4 +197,31 @@
       </object>
     </child>
   </object>
+  <object class="GtkMenu" id="popup">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkRadioMenuItem" id="icon">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Show Icons only</property>
+        <property name="draw_as_radio">True</property>
+        <property name="group">both</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="text">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Show Text only</property>
+        <property name="draw_as_radio">True</property>
+        <property name="group">both</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="both">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Show Icons and Text</property>
+        <property name="active">True</property>
+        <property name="draw_as_radio">True</property>
+      </object>
+    </child>
+  </object>
 </interface>