From 98803cc8e887b6ef291d8e16bbdf0fd3e78441a6 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 22 Nov 2001 11:56:09 +0000 Subject: [PATCH] switch to class_peek. 2001-11-22 Michael Meeks * atk/atkutil.c (atk_add_key_event_listener): switch to class_peek. * atk/atkobject.c (atk_object_real_get_property): add missing 'break'. 2001-11-21 Michael Meeks * atk/atkrelation.c: pull in string.h for strcmp * atk/atktext.c (atk_text_get_selection): fix bug / warning. * atk/atkutil.c (atk_add_global_event_listener), (atk_get_toolkit_name, atk_get_toolkit_version): constify --- ChangeLog | 18 ++++++++++++++++++ atk/atkobject.c | 1 + atk/atkrelation.c | 1 + atk/atktext.c | 2 +- atk/atkutil.c | 15 ++++++++------- atk/atkutil.h | 13 +++++++------ 6 files changed, 36 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d9352d..a64617c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2001-11-22 Michael Meeks + + * atk/atkutil.c (atk_add_key_event_listener): switch + to class_peek. + + * atk/atkobject.c (atk_object_real_get_property): + add missing 'break'. + +2001-11-21 Michael Meeks + + * atk/atkrelation.c: pull in string.h for strcmp + + * atk/atktext.c (atk_text_get_selection): fix bug / warning. + + * atk/atkutil.c (atk_add_global_event_listener), + (atk_get_toolkit_name, atk_get_toolkit_version): + constify + 2001-11-21 Bill Haneman * atk/atkrelation.c: Added gtk-doc docs for diff --git a/atk/atkobject.c b/atk/atkobject.c index 01bdbcd..17bd975 100755 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -890,6 +890,7 @@ atk_object_real_get_property (GObject *object, break; case PROP_DESCRIPTION: g_value_set_string (value, atk_object_get_description (accessible)); + break; case PROP_ROLE: g_value_set_int (value, atk_object_get_role (accessible)); break; diff --git a/atk/atkrelation.c b/atk/atkrelation.c index deba01e..e1d8944 100755 --- a/atk/atkrelation.c +++ b/atk/atkrelation.c @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include #include #include "atkobject.h" #include "atkrelation.h" diff --git a/atk/atktext.c b/atk/atktext.c index eb4348a..8df3dec 100755 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -728,7 +728,7 @@ atk_text_get_selection (AtkText *text, if (end_offset) real_end_offset = end_offset; else - real_start_offset = &local_end_offset; + real_end_offset = &local_end_offset; iface = ATK_TEXT_GET_IFACE (text); diff --git a/atk/atkutil.c b/atk/atkutil.c index 87caa73..65bb03e 100755 --- a/atk/atkutil.c +++ b/atk/atkutil.c @@ -198,10 +198,12 @@ atk_focus_tracker_notify (AtkObject *object) * Returns: added event listener id, or 0 on failure. **/ guint -atk_add_global_event_listener (GSignalEmissionHook listener, gchar* event_type) +atk_add_global_event_listener (GSignalEmissionHook listener, + const gchar *event_type) { guint retval; AtkUtilClass *klass = g_type_class_ref (ATK_TYPE_UTIL); + if (klass->add_global_event_listener) { retval = klass->add_global_event_listener (listener, event_type); @@ -244,7 +246,7 @@ guint atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data) { guint retval; - AtkUtilClass *klass = g_type_class_ref (ATK_TYPE_UTIL); + AtkUtilClass *klass = g_type_class_peek (ATK_TYPE_UTIL); if (klass->add_key_event_listener) { retval = klass->add_key_event_listener (listener, data); @@ -253,7 +255,6 @@ atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data) { retval = -1; } - g_type_class_unref (klass); return retval; } @@ -301,7 +302,8 @@ atk_get_root(void) * * Returns: name string for the GUI toolkit implementing ATK for this application **/ -gchar* atk_get_toolkit_name(void) +G_CONST_RETURN gchar* +atk_get_toolkit_name (void) { AtkUtilClass *klass = g_type_class_peek (ATK_TYPE_UTIL); if (klass->get_toolkit_name) @@ -321,8 +323,8 @@ gchar* atk_get_toolkit_name(void) * * Returns: version string for the GUI toolkit implementing ATK for this application **/ -gchar* -atk_get_toolkit_version(void) +G_CONST_RETURN gchar* +atk_get_toolkit_version (void) { AtkUtilClass *klass = g_type_class_peek (ATK_TYPE_UTIL); if (klass->get_toolkit_version) @@ -334,4 +336,3 @@ atk_get_toolkit_version(void) return NULL; } } - diff --git a/atk/atkutil.h b/atk/atkutil.h index fe6d6eb..df3df53 100755 --- a/atk/atkutil.h +++ b/atk/atkutil.h @@ -76,14 +76,14 @@ struct _AtkUtilClass { GObjectClass parent; guint (* add_global_event_listener) (GSignalEmissionHook listener, - gchar* event_type); + const gchar *event_type); void (* remove_global_event_listener) (guint listener_id); guint (* add_key_event_listener) (AtkKeySnoopFunc listener, gpointer data); void (* remove_key_event_listener) (guint listener_id); AtkObject* (* get_root) (void); - gchar* (* get_toolkit_name) (void); - gchar* (* get_toolkit_version) (void); + G_CONST_RETURN gchar* (* get_toolkit_name) (void); + G_CONST_RETURN gchar* (* get_toolkit_version) (void); }; GType atk_util_get_type (void); @@ -132,7 +132,8 @@ void atk_focus_tracker_notify (AtkObject *object); * Adds the specified function to the list of functions to be called * when an event of type event_type occurs. */ -guint atk_add_global_event_listener (GSignalEmissionHook listener, gchar* event_type); +guint atk_add_global_event_listener (GSignalEmissionHook listener, + const gchar *event_type); /* * Removes the specified event listener @@ -158,12 +159,12 @@ AtkObject* atk_get_root(void); /* * Returns name string for the GUI toolkit. */ -gchar* atk_get_toolkit_name(void); +G_CONST_RETURN gchar *atk_get_toolkit_name (void); /* * Returns version string for the GUI toolkit. */ -gchar* atk_get_toolkit_version(void); +G_CONST_RETURN gchar *atk_get_toolkit_version (void); #ifdef __cplusplus } -- 2.7.4