GNOME.org
 

[vte] widget: Do not export the accessible object

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

    widget: Do not export the accessible object
    
    Conflicts:
        src/Makefile.am
        src/vte.c
        src/vteaccess.c

 doc/reference/vte-docs.xml     |    5 -----
 doc/reference/vte-sections.txt |   25 -------------------------
 doc/reference/vte.types        |    3 ---
 src/Makefile.am                |    2 +-
 src/vte.c                      |    2 +-
 src/vteaccess.c                |   22 +++++++++++-----------
 src/vteaccess.h                |   12 ++++++------
 7 files changed, 19 insertions(+), 52 deletions(-)
---
diff --git a/doc/reference/vte-docs.xml b/doc/reference/vte-docs.xml
index 66a68d9..868a44c 100644
--- a/doc/reference/vte-docs.xml
+++ b/doc/reference/vte-docs.xml
@@ -61,11 +61,6 @@
     <chapter>
       <xi:include href="xml/vte-version.xml"/>
     </chapter>
-
-    <chapter id="internal-objects">
-      <title>Interna</title>
-      <xi:include href="xml/vte-access.xml"/>
-    </chapter>
   </part>
 
   <chapter id="object-hierarchy">
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index eb3be61..7d77322 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -185,28 +185,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 b779cc5..43b2105 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 vtedeprecated.h
+header_HEADERS = vte.h vtepty.h vtetypebuiltins.h vteversion.h vtedeprecated.h
 
 lib_LTLIBRARIES = libvte- VTE_API_MAJOR_VERSION@  VTE_API_MINOR_VERSION@.la
 
diff --git a/src/vte.c b/src/vte.c
index 9e6d6e2..f561fbd 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -10693,7 +10693,7 @@ vte_terminal_get_accessible(GtkWidget *widget)
                registry = atk_get_default_registry ();
 
                atk_registry_set_factory_type (registry, VTE_TYPE_TERMINAL,
-                       vte_terminal_accessible_factory_get_type ());
+                       _vte_terminal_accessible_factory_get_type ());
                quark_accessible_object = g_quark_from_static_string (
                "gtk-accessible-object");
                first_time = FALSE;
diff --git a/src/vteaccess.c b/src/vteaccess.c
index 3ffbebf..191c98b 100644
--- a/src/vteaccess.c
+++ b/src/vteaccess.c
@@ -71,7 +71,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",
@@ -930,8 +930,8 @@ vte_terminal_initialize (AtkObject *obj, gpointer data)
   g_signal_connect (terminal, "unmap", G_CALLBACK (map_cb), NULL);
 }
 
-/**
- * vte_terminal_accessible_new:
+/*
+ * _vte_terminal_accessible_new:
  * @terminal: a #VteTerminal
  *
  * Creates a new accessibility peer for the terminal widget.
@@ -939,7 +939,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;
@@ -2343,7 +2343,7 @@ vte_terminal_accessible_get_attributes (AtkObject *obj)
 }
 
 static void
-vte_terminal_accessible_class_init(VteTerminalAccessibleClass *klass)
+_vte_terminal_accessible_class_init(VteTerminalAccessibleClass *klass)
 {
        GObjectClass *gobject_class;
        AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
@@ -2365,11 +2365,11 @@ vte_terminal_accessible_class_init(VteTerminalAccessibleClass *klass)
 }
 
 static void
-vte_terminal_accessible_init (VteTerminalAccessible *terminal)
+_vte_terminal_accessible_init (VteTerminalAccessible *terminal)
 {
 }
 
-G_DEFINE_TYPE_WITH_CODE (VteTerminalAccessible, vte_terminal_accessible, GTK_TYPE_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (VteTerminalAccessible, _vte_terminal_accessible, GTK_TYPE_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, vte_terminal_accessible_text_init)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, vte_terminal_accessible_component_init)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, vte_terminal_accessible_action_init))
@@ -2384,27 +2384,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 e89f64b..b9176fc 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]