GNOME.org
 

[vte/vte-next: 32/47] Do not export the accessible object

commit 221f135ff45e464e1dbab62e655f093ba4ec0e5f
Author: Christian Persch <chpe gnome org>
Date:   Mon May 2 22:26:21 2011 +0200

    Do not export the accessible object

 doc/reference/vte-sections.txt |   25 -------------------------
 doc/reference/vte.types        |    3 ---
 src/Makefile.am                |    2 +-
 src/vte.c                      |    2 +-
 src/vteaccess.c                |   18 +++++++++---------
 src/vteaccess.h                |   12 ++++++------
 6 files changed, 17 insertions(+), 45 deletions(-)
---
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index d7c6e46..a60d4fd 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -177,28 +177,3 @@ VTE_MICRO_VERSION
 VTE_CHECK_VERSION
 
 </SECTION>
-
-<SECTION>
-<FILE>vte-access</FILE>
-<TITLE>VteTerminalAccessible</TITLE>
-VteTerminalAccessible
-vte_terminal_accessible_new
-<SUBSECTION Standard>
-VTE_IS_TERMINAL_ACCESSIBLE
-VTE_IS_TERMINAL_ACCESSIBLE_CLASS
-VTE_IS_TERMINAL_ACCESSIBLE_FACTORY
-VTE_IS_TERMINAL_ACCESSIBLE_FACTORY_CLASS
-VTE_TERMINAL_ACCESSIBLE
-VTE_TERMINAL_ACCESSIBLE_CLASS
-VTE_TERMINAL_ACCESSIBLE_FACTORY
-VTE_TERMINAL_ACCESSIBLE_FACTORY_CLASS
-VTE_TERMINAL_ACCESSIBLE_FACTORY_GET_CLASS
-VTE_TERMINAL_ACCESSIBLE_GET_CLASS
-vte_terminal_accessible_get_type
-VTE_TYPE_TERMINAL_ACCESSIBLE
-vte_terminal_accessible_factory_get_type
-VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY
-VteTerminalAccessibleFactory
-VteTerminalAccessibleFactoryClass
-vte_terminal_accessible_factory_new
-</SECTION>
diff --git a/doc/reference/vte.types b/doc/reference/vte.types
index 112cbb9..b7c73a0 100644
--- a/doc/reference/vte.types
+++ b/doc/reference/vte.types
@@ -4,14 +4,11 @@
 #include <gtk/gtk.h>
 #include "vte.h"
 #include "vteversion.h"
-#include "vteaccess.h"
 #include "vtepty.h"
 #include "vtetypebuiltins.h"
 
 vte_pty_get_type
 vte_terminal_get_type
-vte_terminal_accessible_get_type
-vte_terminal_accessible_factory_get_type
 
 vte_pty_error_get_type
 vte_pty_flags_get_type
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c19561..837cd22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = iso2022.txt
 # The library
 
 headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte
-header_HEADERS = vte.h vteaccess.h vtepty.h vtetypebuiltins.h vteversion.h
+header_HEADERS = vte.h vtepty.h vtetypebuiltins.h vteversion.h
 
 lib_LTLIBRARIES = libvte VTE_LIBRARY_SUFFIX_U@.la
 
diff --git a/src/vte.c b/src/vte.c
index e4b8f56..e5694c1 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -10760,7 +10760,7 @@ vte_terminal_get_accessible(GtkWidget *widget)
 		if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) {
 			atk_registry_set_factory_type (registry,
 						       VTE_TYPE_TERMINAL,
-						       vte_terminal_accessible_factory_get_type ());
+						       _vte_terminal_accessible_factory_get_type ());
 		}
 		first_time = FALSE;
 	}
diff --git a/src/vteaccess.c b/src/vteaccess.c
index 6a30c39..59bcc3a 100644
--- a/src/vteaccess.c
+++ b/src/vteaccess.c
@@ -68,7 +68,7 @@ static gunichar vte_terminal_accessible_get_character_at_offset(AtkText *text,
 								gint offset);
 static gpointer vte_terminal_accessible_parent_class;
 
-G_DEFINE_TYPE(VteTerminalAccessibleFactory, vte_terminal_accessible_factory, ATK_TYPE_OBJECT_FACTORY)
+G_DEFINE_TYPE(VteTerminalAccessibleFactory, _vte_terminal_accessible_factory, ATK_TYPE_OBJECT_FACTORY)
 
 static const char *vte_terminal_accessible_action_names[] = {
         "menu",
@@ -839,8 +839,8 @@ vte_terminal_initialize (AtkObject *obj, gpointer data)
 	obj->role = ATK_ROLE_TERMINAL;
 }
 
-/**
- * vte_terminal_accessible_new:
+/*
+ * _vte_terminal_accessible_new:
  * @terminal: a #VteTerminal
  *
  * Creates a new accessibility peer for the terminal widget.
@@ -848,7 +848,7 @@ vte_terminal_initialize (AtkObject *obj, gpointer data)
  * Returns: the new #AtkObject
  */
 AtkObject *
-vte_terminal_accessible_new(VteTerminal *terminal)
+_vte_terminal_accessible_new(VteTerminal *terminal)
 {
 	AtkObject *accessible;
 	GObject *object;
@@ -1989,7 +1989,7 @@ vte_terminal_accessible_class_init(gpointer *klass)
 }
 
 GType
-vte_terminal_accessible_get_type(void)
+_vte_terminal_accessible_get_type(void)
 {
 	static GType terminal_accessible_type = 0;
 
@@ -2092,27 +2092,27 @@ vte_terminal_accessible_factory_create_accessible(GObject *obj)
 	g_assert(VTE_IS_TERMINAL(obj));
 
 	terminal = VTE_TERMINAL(obj);
-	accessible = GTK_ACCESSIBLE(vte_terminal_accessible_new(terminal));
+	accessible = GTK_ACCESSIBLE(_vte_terminal_accessible_new(terminal));
 	g_assert(accessible != NULL);
 
 	return ATK_OBJECT(accessible);
 }
 
 static void
-vte_terminal_accessible_factory_class_init(VteTerminalAccessibleFactoryClass *klass)
+_vte_terminal_accessible_factory_class_init(VteTerminalAccessibleFactoryClass *klass)
 {
 	AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS(klass);
 	/* Override the one method we care about. */
 	class->create_accessible = vte_terminal_accessible_factory_create_accessible;
 }
 static void
-vte_terminal_accessible_factory_init(VteTerminalAccessibleFactory *self)
+_vte_terminal_accessible_factory_init(VteTerminalAccessibleFactory *self)
 {
 	/* nothing to initialise */
 }
 
 AtkObjectFactory *
-vte_terminal_accessible_factory_new(void)
+_vte_terminal_accessible_factory_new(void)
 {
 	_vte_debug_print(VTE_DEBUG_ALLY,
 			"Creating a new VteTerminalAccessibleFactory.\n");
diff --git a/src/vteaccess.h b/src/vteaccess.h
index 7204d37..c40dcf9 100644
--- a/src/vteaccess.h
+++ b/src/vteaccess.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define VTE_TYPE_TERMINAL_ACCESSIBLE            (vte_terminal_accessible_get_type ())
+#define VTE_TYPE_TERMINAL_ACCESSIBLE            (_vte_terminal_accessible_get_type ())
 #define VTE_TERMINAL_ACCESSIBLE(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessible))
 #define VTE_TERMINAL_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE, VteTerminalAccessibleClass))
 #define VTE_IS_TERMINAL_ACCESSIBLE(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_TERMINAL_ACCESSIBLE))
@@ -55,11 +55,11 @@ struct _VteTerminalAccessibleClass {
 	 * is worked out at run-time. */
 };
 
-GType vte_terminal_accessible_get_type(void);
+GType _vte_terminal_accessible_get_type(void);
 
-AtkObject *vte_terminal_accessible_new(VteTerminal *terminal);
+AtkObject *_vte_terminal_accessible_new(VteTerminal *terminal);
 
-#define VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY            (vte_terminal_accessible_factory_get_type ())
+#define VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY            (_vte_terminal_accessible_factory_get_type ())
 #define VTE_TERMINAL_ACCESSIBLE_FACTORY(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactory))
 #define VTE_TERMINAL_ACCESSIBLE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY, VteTerminalAccessibleFactoryClass))
 #define VTE_IS_TERMINAL_ACCESSIBLE_FACTORY(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), VTE_TYPE_TERMINAL_ACCESSIBLE_FACTORY))
@@ -77,9 +77,9 @@ struct _VteTerminalAccessibleFactoryClass {
 	AtkObjectFactoryClass parent;
 };
 
-GType vte_terminal_accessible_factory_get_type(void);
+GType _vte_terminal_accessible_factory_get_type(void);
 
-AtkObjectFactory *vte_terminal_accessible_factory_new(void);
+AtkObjectFactory *_vte_terminal_accessible_factory_new(void);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]