[vte] widget: Move some methods to VteTerminalPrivate
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Move some methods to VteTerminalPrivate
- Date: Sat, 30 Jan 2016 17:19:50 +0000 (UTC)
commit d94d9c882eb4152e0628930b4b2d07df003927f9
Author: Christian Persch <chpe gnome org>
Date: Sat Jan 30 18:19:26 2016 +0100
widget: Move some methods to VteTerminalPrivate
src/vte-private.h | 1 -
src/vte.cc | 5 ++---
src/vteaccess.cc | 3 ++-
src/vteinternal.hh | 2 ++
4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/vte-private.h b/src/vte-private.h
index 27fcadb..478b02d 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -54,7 +54,6 @@
G_BEGIN_DECLS
VteTerminalPrivate *_vte_terminal_get_impl(VteTerminal *terminal);
-void _vte_terminal_accessible_ref(VteTerminal *terminal);
char* _vte_terminal_get_selection(VteTerminal *terminal);
void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
diff --git a/src/vte.cc b/src/vte.cc
index 734583e..bd9ec5c 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -10392,10 +10392,9 @@ VteTerminalPrivate::set_pty(VtePty *new_pty)
/* We need this bit of glue to ensure that accessible objects will always
* get signals. */
void
-_vte_terminal_accessible_ref(VteTerminal *terminal)
+VteTerminalPrivate::subscribe_accessible_events()
{
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
- terminal->pvt->accessible_emit = TRUE;
+ m_accessible_emit = true;
}
char *
diff --git a/src/vteaccess.cc b/src/vteaccess.cc
index 2ace350..edc691e 100644
--- a/src/vteaccess.cc
+++ b/src/vteaccess.cc
@@ -712,7 +712,8 @@ vte_terminal_accessible_initialize (AtkObject *obj, gpointer data)
ATK_OBJECT_CLASS (_vte_terminal_accessible_parent_class)->initialize (obj, data);
- _vte_terminal_accessible_ref(terminal);
+ auto impl = IMPL(terminal);
+ impl->subscribe_accessible_events();
g_signal_connect(terminal, "text-inserted",
G_CALLBACK(vte_terminal_accessible_text_modified),
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 07c4408..b3b3ea0 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1177,6 +1177,8 @@ public:
int index_fallback,
int osc,
char const *terminator);
+
+ void subscribe_accessible_events();
};
#define m_invalidated_all invalidated_all
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]