From 845af41895ccaf488fd3ab5c3a4be8cca788b24d Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 30 Nov 2012 22:10:45 -0500
Subject: [PATCH] bug 817766 - remove an unused member from MaiUtil remove some
 unused macros and make MaiUtil and MaiUtilClass typedefs r=surkov

---
 accessible/src/atk/UtilInterface.cpp | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/accessible/src/atk/UtilInterface.cpp b/accessible/src/atk/UtilInterface.cpp
index e2cde6244fc1..2e80ebedbbb4 100644
--- a/accessible/src/atk/UtilInterface.cpp
+++ b/accessible/src/atk/UtilInterface.cpp
@@ -16,28 +16,8 @@
 using namespace mozilla;
 using namespace mozilla::a11y;
 
-struct MaiUtil
-{
-  AtkUtil parent;
-  GList* listener_list;
-};
-
-struct MaiUtilClass
-{
-  AtkUtilClass parent_class;
-};
-
-#define MAI_TYPE_UTIL              (mai_util_get_type ())
-#define MAI_UTIL(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                                    MAI_TYPE_UTIL, MaiUtil))
-#define MAI_UTIL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                                    MAI_TYPE_UTIL, MaiUtilClass))
-#define MAI_IS_UTIL(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                                    MAI_TYPE_UTIL))
-#define MAI_IS_UTIL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                    MAI_TYPE_UTIL))
-#define MAI_UTIL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                                    MAI_TYPE_UTIL, MaiUtilClass))
+typedef AtkUtil MaiUtil;
+typedef AtkUtilClass MaiUtilClass;
 
 #define MAI_VERSION MOZILLA_VERSION
 #define MAI_NAME "Gecko"