diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/main.c | 103 | ||||
| -rw-r--r-- | src/tabpopup.c | 4 |
3 files changed, 1 insertions, 108 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 35c520c..718156d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmetacity-private.la SUBDIRS=wm-tester tools themes -INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DMETACITY_LIBDIR=\"$(libdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 +INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 EGGFILES= \ eggaccelerators.c \ @@ -30,11 +30,6 @@ #include "prefs.h" #include <glib-object.h> -#include <gmodule.h> -#ifdef HAVE_GCONF -#include <gconf/gconf-client.h> -#endif - #include <stdlib.h> #include <sys/types.h> @@ -75,90 +70,6 @@ version (void) exit (0); } -#define GNOME_ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility" - -static char * -find_accessibility_module (const char *libname) -{ - char *path; - char *fname; - char *retval; - - retval = NULL; - - fname = g_strconcat (libname, "." G_MODULE_SUFFIX, NULL); - path = g_strconcat (METACITY_LIBDIR"/gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL); - - if (g_file_test (path, G_FILE_TEST_EXISTS)) - retval = path; - - if (path) - retval = path; - else - g_free (path); - - g_free (fname); - - return retval; -} - -static gboolean -accessibility_invoke_module (const char *libname, - gboolean init) -{ - GModule *handle; - void (*invoke_fn) (void); - const char *method; - gboolean retval = FALSE; - char *module_name; - - if (init) - method = "gnome_accessibility_module_init"; - else - method = "gnome_accessibility_module_shutdown"; - - module_name = find_accessibility_module (libname); - - if (!module_name) - { - g_warning ("Accessibility: failed to find module '%s' which " - "is needed to make this application accessible", - libname); - - } - else if (!(handle = g_module_open (module_name, G_MODULE_BIND_LAZY))) - { - g_warning ("Accessibility: failed to load module '%s': '%s'", - libname, g_module_error ()); - - } - else if (!g_module_symbol (handle, method, (gpointer *)&invoke_fn)) - { - g_warning ("Accessibility: error library '%s' does not include " - "method '%s' required for accessibility support", - libname, method); - g_module_close (handle); - - } - else - { - retval = TRUE; - invoke_fn (); - } - - g_free (module_name); - - return retval; -} - -static gboolean -accessibility_invoke (gboolean init) -{ - accessibility_invoke_module ("libgail", init); - accessibility_invoke_module ("libatk-bridge", init); - return TRUE; -} - static void meta_print_compilation_info (void) { @@ -475,20 +386,6 @@ main (int argc, char **argv) if (!meta_display_open ()) meta_exit (META_EXIT_ERROR); - { - gboolean do_init_a11y; - do_init_a11y = FALSE; - -#ifdef HAVE_GCONF - do_init_a11y = gconf_client_get_bool ( - gconf_client_get_default (), - GNOME_ACCESSIBILITY_KEY, NULL); -#endif - - if (do_init_a11y) - accessibility_invoke (TRUE); - } - g_main_run (meta_main_loop); { diff --git a/src/tabpopup.c b/src/tabpopup.c index 33f3203..a92b021 100644 --- a/src/tabpopup.c +++ b/src/tabpopup.c @@ -154,7 +154,6 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, GList *tmp; GtkWidget *frame; int max_label_width; /* the actual max width of the labels we create */ - AtkObject *obj; int max_chars_per_title; /* max chars we allow in a label */ GdkScreen *screen; @@ -281,9 +280,6 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, table); popup->label = gtk_label_new (""); - obj = gtk_widget_get_accessible (popup->label); - atk_object_set_role (obj, ATK_ROLE_STATUSBAR); - gtk_misc_set_padding (GTK_MISC (popup->label), 3, 3); gtk_box_pack_end (GTK_BOX (vbox), popup->label, FALSE, FALSE, 0); |