From f1bf642c982ce32496aa25085dddca36aa72d3c2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 17 Jun 2011 00:11:00 -0400
Subject: [PATCH] We're not a module anymore

So no need to implement module entry points; and libgnome is
dead too, so no need to export functions for it either.
---
 gtk/a11y/gail.c | 71 +------------------------------------------------
 gtk/gtkmain.c   |  4 +--
 2 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c
index 28a99968ee..58c04e5aaa 100644
--- a/gtk/a11y/gail.c
+++ b/gtk/a11y/gail.c
@@ -849,16 +849,9 @@ gail_set_focus_object (AtkObject *focus_obj,
     }
 }
 
-/*
- *   These exported symbols are hooked by gnome-program
- * to provide automatic module initialization and shutdown.
- */
-extern void gnome_accessibility_module_init     (void);
-extern void gnome_accessibility_module_shutdown (void);
-
 static int gail_initialized = FALSE;
 
-static void
+void
 gail_accessibility_module_init (void)
 {
   const char *env_a_t_support;
@@ -924,65 +917,3 @@ gail_accessibility_module_init (void)
   g_type_class_unref (g_type_class_ref (GAIL_TYPE_UTIL));
   g_type_class_unref (g_type_class_ref (GAIL_TYPE_MISC));
 }
-
-/**
- * gnome_accessibility_module_init:
- * @void: 
- * 
- *   This method is invoked by name from libgnome's
- * gnome-program.c to activate accessibility support.
- **/
-void
-gnome_accessibility_module_init (void)
-{
-  gail_accessibility_module_init ();
-}
-
-/**
- * gnome_accessibility_module_shutdown:
- * @void: 
- * 
- *   This method is invoked by name from libgnome's
- * gnome-program.c to de-activate accessibility support.
- **/
-void
-gnome_accessibility_module_shutdown (void)
-{
-  if (!gail_initialized)
-    {
-      return;
-    }
-  gail_initialized = FALSE;
-  atk_remove_focus_tracker (focus_tracker_id);
-
-  fprintf (stderr, "GTK Accessibility Module shutdown\n");
-
-  /* FIXME: de-register the factory types so we can unload ? */
-}
-
-int
-gtk_module_init (gint *argc, char** argv[])
-{
-  const char* env_no_gail;
-  gboolean no_gail = FALSE;
-
-  env_no_gail = g_getenv (NO_GAIL_ENV);
-  if (env_no_gail)
-      no_gail = atoi (env_no_gail);
-
-  if (no_gail)
-      return 0;
-
-  gail_accessibility_module_init ();
-
-  return 0;
-}
-
-const char *
-g_module_check_init (GModule *module)
-{
-  g_module_make_resident (module);
-
-  return NULL;
-}
- 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 55d806baaf..415faac8e0 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -812,7 +812,7 @@ gettext_initialization (void)
 }
 
 /* XXX: Remove me after getting rid of gail */
-extern void gnome_accessibility_module_init     (void);
+extern void gail_accessibility_module_init (void);
 
 static void
 do_post_parse_initialization (int    *argc,
@@ -872,7 +872,7 @@ do_post_parse_initialization (int    *argc,
       _gtk_modules_init (argc, argv, NULL);
     }
 
-  gnome_accessibility_module_init ();
+  gail_accessibility_module_init ();
 }