From 4b7ec202caa32d87da850db15e0ddc8644fb7c5b Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Mon, 20 May 2013 22:07:56 -0400
Subject: [PATCH] Some cleanup

---
 usr/lib/linuxmint/mintMenu/mintMenu.glade | 17 +++++++------
 usr/lib/linuxmint/mintMenu/mintMenu.py    |  2 +-
 usr/lib/linuxmint/mintMenu/mintMenu.ui    | 29 -----------------------
 3 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 usr/lib/linuxmint/mintMenu/mintMenu.ui

diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.glade b/usr/lib/linuxmint/mintMenu/mintMenu.glade
index dd97faa..641a9b8 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenu.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.glade
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<glade-interface>
+<interface>
   <!-- interface-requires gtk+ 2.10 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="mainWindow">
+  <object class="GtkWindow" id="mainWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK</property>
     <property name="type">popup</property>
     <property name="resizable">False</property>
@@ -11,19 +11,18 @@
     <property name="skip_pager_hint">True</property>
     <property name="decorated">False</property>
     <property name="deletable">False</property>
-    <signal name="key_press_event" handler="gtk_widget_hide"/>
     <child>
-      <widget class="GtkAlignment" id="border">
+      <object class="GtkAlignment" id="border">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkHBox" id="paneholder">
+          <object class="GtkHBox" id="paneholder">
             <property name="visible">True</property>
             <child>
               <placeholder/>
             </child>
-          </widget>
+          </object>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index c6c50b0..536e3ea 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -78,7 +78,7 @@ class MainWindow( object ):
         self.toggle = toggleButton
         # Load UI file and extract widgets   
         builder = Gtk.Builder()
-        builder.add_from_file(os.path.join( self.path, "mintMenu.ui" ))
+        builder.add_from_file(os.path.join( self.path, "mintMenu.glade" ))
         self.window     = builder.get_object( "mainWindow" )
         self.paneholder = builder.get_object( "paneholder" )
         self.border     = builder.get_object( "border" )
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.ui b/usr/lib/linuxmint/mintMenu/mintMenu.ui
deleted file mode 100644
index a1a1b55..0000000
--- a/usr/lib/linuxmint/mintMenu/mintMenu.ui
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 2.10 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="mainWindow">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK</property>
-    <property name="type">popup</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">menu</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="decorated">False</property>
-    <property name="deletable">False</property>
-    <signal handler="gtk_widget_hide" name="key_press_event"/>
-    <child>
-      <object class="GtkAlignment" id="border">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkHBox" id="paneholder">
-            <property name="visible">True</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>