From 24c1494c4c84ccbfd51c3d384d48dfcb4e679673 Mon Sep 17 00:00:00 2001
From: billh <billh@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Mon, 30 Jun 2003 21:20:01 +0000
Subject: [PATCH] Version 1.3.5; internationalization fixes.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@456 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---
 ChangeLog                                     | 12 ++++++++++++
 atk-bridge/bridge.c                           |  4 ++--
 configure.in                                  |  8 ++++----
 registryd/Accessibility_Registry.server.in.in |  4 ++--
 registryd/deviceeventcontroller.c             | 10 +++++++---
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f620d0b..8375f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-30  Bill Haneman <bill.haneman@sun.com>
+
+	* configure.in: Revved to 1.3.5.
+	
+	* registryd/Accessibility_Registry.server.in.in:
+	Marked up appropriate strings for translation.
+	
+	* atk-bridge/bridge.c: Marked a couple of
+	user-visible warnings for translation.  Questionable
+	whether they are really useful, but possibly so.
+
+	
 2003-06-28  Christian Rose  <menthos@menthos.com>
 
 	* configure.in: Added "sv" to ALL_LINGUAS.
diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 1d3c732..411022b 100644
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -308,7 +308,7 @@ spi_atk_bridget_get_dec (void)
 
   if (BONOBO_EX (&ev))
     {
-      g_warning ("failure: no deviceeventcontroller found\n");
+      g_warning (_("failure: no device event controller found.\n"));
       registry_died = TRUE;
       device_event_controller = CORBA_OBJECT_NIL;
     }
@@ -803,7 +803,7 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent  *keystroke,
 #endif
   if (!event)
     {
-      g_print ("WARNING: NULL key event!");
+      g_print (_("WARNING: NULL key event reported."));
     }
   
   keystroke->id        = (CORBA_long) event->keyval;
diff --git a/configure.in b/configure.in
index b2475ae..a34fdcd 100644
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,9 @@ AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=3
-AT_SPI_MICRO_VERSION=4
-AT_SPI_INTERFACE_AGE=4
-AT_SPI_BINARY_AGE=4
+AT_SPI_MICRO_VERSION=5
+AT_SPI_INTERFACE_AGE=5
+AT_SPI_BINARY_AGE=5
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
 AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
 AC_SUBST(AT_SPI_MAJOR_VERSION)
@@ -16,7 +16,7 @@ AC_SUBST(AT_SPI_BINARY_AGE)
 # libtool versioning
 LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
 LT_CURRENT=9
-LT_REVISION=4
+LT_REVISION=5
 LT_AGE=9
 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)
diff --git a/registryd/Accessibility_Registry.server.in.in b/registryd/Accessibility_Registry.server.in.in
index 368186b..8c3b262 100644
--- a/registryd/Accessibility_Registry.server.in.in
+++ b/registryd/Accessibility_Registry.server.in.in
@@ -5,8 +5,8 @@
 			<item value="IDL:Bonobo/Unknown:1.0"/>
 			<item value="IDL:Accessibility/Registry:1.0"/>
 		</oaf_attribute>
-		<oaf_attribute name="name" type="string" value="AT-SPI Registry"/>
+		<oaf_attribute name="name" type="string" _value="AT-SPI Registry"/>
 		<oaf_attribute name="description" type="string"
-		 value="Accessibility Registry"/>
+		 _value="Accessibility Registry"/>
 	</oaf_server>
 </oaf_info>
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index aa2da0a..e7f17c8 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -536,10 +536,14 @@ spi_dec_init_mouse_listener (SpiRegistry *registry)
   if (display)
     {
       if (XGrabButton (display, AnyButton, AnyModifier,
-		   gdk_x11_get_default_root_xwindow (),
-		   True, ButtonPressMask | ButtonReleaseMask,
-		   GrabModeSync, GrabModeAsync, None, None) != Success)
+		       gdk_x11_get_default_root_xwindow (),
+		       True, ButtonPressMask | ButtonReleaseMask,
+		       GrabModeSync, GrabModeAsync, None, None) != Success) {
+#ifdef SPI_DEBUG
 	fprintf (stderr, "WARNING: could not grab mouse buttons!\n");
+#endif
+	;
+      }
       XSync (display, False);
 #ifdef SPI_DEBUG
       fprintf (stderr, "mouse buttons grabbed\n");
-- 
2.7.4