Hello community,
here is the log from the commit of package gok
checked in at Fri Feb 1 22:11:08 CET 2008.
--------
--- GNOME/gok/gok.changes 2007-10-11 16:39:38.000000000 +0200
+++ gok/gok.changes 2008-02-01 18:04:49.110420000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 1 18:05:31 CET 2008 - maw@suse.de
+
+- Update to version 1.3.7:
+ + Bugs fixed: bnc#486346, bnc#482796, bnc#481681, and #bnc481099
+ + Minor code cleanups.
+
+-------------------------------------------------------------------
Old:
----
gok-1.3.4.tar.bz2
New:
----
gok-1.3.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gok.spec ++++++
--- /var/tmp/diff_new_pack.J10839/_old 2008-02-01 22:09:38.000000000 +0100
+++ /var/tmp/diff_new_pack.J10839/_new 2008-02-01 22:09:38.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package gok (Version 1.3.4)
+# spec file for package gok (Version 1.3.7)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,10 +12,10 @@
Name: gok
BuildRequires: at-spi-devel docbook-dsssl-stylesheets fdupes gail-devel gnome-speech-devel gnutls-devel gtk-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel perl-XML-Parser scrollkeeper update-desktop-files
-License: LGPL v2 or later
+License: LGPL v2.1 or later
Group: System/GUI/GNOME
-Version: 1.3.4
-Release: 9
+Version: 1.3.7
+Release: 1
Summary: GNOME On-Screen Keyboard
Source: %{name}-%{version}.tar.bz2
Patch: %{name}.patch
@@ -58,7 +58,7 @@
Summary: GNOME On-Screen Keyboard
Group: System/GUI/GNOME
Requires: %{name} = %{version}-%{release}
-Requires: at-spi-devel atk-devel esound-devel gail-devel gtk2-devel libbonobo-devel libgnomeui-devel libwnck-devel
+Requires: at-spi-devel atk-devel gail-devel gtk2-devel libbonobo-devel libesd-devel libgnomeui-devel libwnck-devel
%description devel
The GNOME On-screen Keyboard (GOK) is a dynamic on-screen keyboard for
@@ -172,55 +172,60 @@
%files doc
%defattr(-,root,root)
%{_datadir}/gtk-doc/html/gok
+
%changelog
-* Thu Oct 11 2007 - sbrabec@suse.cz
+* Fri Feb 01 2008 maw@suse.de
+- Update to version 1.3.7:
+ + Bugs fixed: bnc#486346, bnc#482796, bnc#481681, and #bnc481099
+ + Minor code cleanups.
+* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
-* Wed Sep 19 2007 - sbrabec@suse.cz
+* Wed Sep 19 2007 sbrabec@suse.cz
- Updated to version 1.3.4:
* gok_keyboard_branch_byKey: check for null accessible, and null
state
* work toward fixing crasher bug in gok-spy
-* Fri Aug 31 2007 - maw@suse.de
+* Fri Aug 31 2007 maw@suse.de
- Update to version 1.3.2:
+ Bugs (bugzilla.gnome.org) fixed: #413414, #316851, and
partially #457560
+ Updated translations.
-* Wed Aug 08 2007 - maw@suse.de
+* Wed Aug 08 2007 maw@suse.de
- Split off a -lang subpackage.
-* Thu Aug 02 2007 - maw@suse.de
+* Thu Aug 02 2007 maw@suse.de
- Update to version 1.3.1
+ Now works with Mozilla Firefox 3
+ Updated translations
- Use %%fdupes.
-* Tue Jul 10 2007 - maw@suse.de
+* Tue Jul 10 2007 maw@suse.de
- Update to version 1.2.5
- Numerous translations and minor bug fixes.
-* Mon May 14 2007 - coolo@suse.de
+* Mon May 14 2007 coolo@suse.de
- fix desktop file
-* Fri Apr 27 2007 - sbrabec@suse.cz
+* Fri Apr 27 2007 sbrabec@suse.cz
- Do not call meinproc (#227624).
-* Mon Apr 16 2007 - maw@suse.de
+* Mon Apr 16 2007 maw@suse.de
- Create a -devel subpackage (#262572).
-* Mon Apr 09 2007 - maw@suse.de
+* Mon Apr 09 2007 maw@suse.de
- Update to version 1.2.3
- b.g.o 412825 and 323648.
-* Fri Mar 09 2007 - maw@suse.de
+* Fri Mar 09 2007 maw@suse.de
- Update to version 1.2.1.
* libusb support! (see README.libusb) Thanks Ben Konrath!
* Ubuntu crasher fixed! Thanks Bill!
* Bugfixes include: 334273. 350356, 394511, 395040, 159027
-* Tue Jan 16 2007 - sbrabec@suse.cz
+* Tue Jan 16 2007 sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
-* Fri Oct 13 2006 - danw@suse.de
+* Fri Oct 13 2006 danw@suse.de
- Remove dead patches
-* Fri Sep 15 2006 - jhargadon@suse.de
+* Fri Sep 15 2006 jhargadon@suse.de
- update to version 1.2.0
- Returned to the use of new GOption style of command line argument
- Mainly bugfixes dealing with stability including:
350356, 351694, and 351993
- translation updates
-* Tue Aug 15 2006 - jhargadon@suse.de
+* Tue Aug 15 2006 jhargadon@suse.de
- update to version 1.1.1
- new GOption style command line arguments
- Removed illegal memory access, should improve stability.
@@ -232,54 +237,54 @@
- Respond to more children-changed
- Fix for #301377, we can now handle actionable table cells even if
they don't have unique names.
-* Tue Feb 28 2006 - sbrabec@suse.cz
+* Tue Feb 28 2006 sbrabec@suse.cz
- Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14).
-* Sat Feb 18 2006 - sreeves@suse.de
+* Sat Feb 18 2006 sreeves@suse.de
- Update .desktop file (Name, GenericName, Comment, DocPath)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Dec 23 2005 - gekker@suse.de
+* Fri Dec 23 2005 gekker@suse.de
- Add OnlyShowIn=GNOME to .desktop file (#81817)
-* Wed Dec 21 2005 - jpr@suse.de
+* Wed Dec 21 2005 jpr@suse.de
- Fix realloc assignment
-* Wed Nov 02 2005 - dmueller@suse.de
+* Wed Nov 02 2005 dmueller@suse.de
- don't build as root
-* Wed Sep 21 2005 - sbrabec@suse.cz
+* Wed Sep 21 2005 sbrabec@suse.cz
- Fixed missing include.
-* Mon Jun 20 2005 - gekker@suse.de
+* Tue Jun 21 2005 gekker@suse.de
- Update to version 1.0.5
-* Wed Apr 06 2005 - mmj@suse.de
+* Wed Apr 06 2005 mmj@suse.de
- Fix g_strnconcat calls
-* Wed Mar 09 2005 - gekker@suse.de
+* Thu Mar 10 2005 gekker@suse.de
- Update to version 1.0.2 (GNOME 2.10).
-* Mon Mar 07 2005 - ro@suse.de
+* Mon Mar 07 2005 ro@suse.de
- fix build on lib64
-* Thu Mar 03 2005 - gekker@suse.de
+* Fri Mar 04 2005 gekker@suse.de
- Update to version 1.0.1
-* Fri Feb 11 2005 - gekker@suse.de
+* Fri Feb 11 2005 gekker@suse.de
- Update to 0.12.3
-* Sun Feb 06 2005 - gekker@suse.de
+* Sun Feb 06 2005 gekker@suse.de
- Update to version 0.12.1
- Fix the file list
-* Fri Jan 14 2005 - clahey@suse.de
+* Fri Jan 14 2005 clahey@suse.de
- Updated to version 0.12.0.
-* Tue Dec 14 2004 - hvogel@suse.de
+* Tue Dec 14 2004 hvogel@suse.de
- fix desktop file
-* Tue Nov 02 2004 - ro@suse.de
+* Tue Nov 02 2004 ro@suse.de
- locale rename: no -> nb
-* Fri Aug 27 2004 - clahey@suse.de
+* Fri Aug 27 2004 clahey@suse.de
- Cache gok help and show gok in khelpcenter.
-* Mon May 10 2004 - sbrabec@suse.cz
+* Mon May 10 2004 sbrabec@suse.cz
- Updated to version 0.10.2 (GNOME 2.6).
-* Wed Mar 10 2004 - sbrabec@suse.cz
+* Wed Mar 10 2004 sbrabec@suse.cz
- Fixed gconf schemas installation (#33114).
-* Tue Feb 24 2004 - ro@suse.de
+* Tue Feb 24 2004 ro@suse.de
- fix docu build
-* Thu Feb 12 2004 - hhetter@suse.de
+* Thu Feb 12 2004 hhetter@suse.de
- gconf schema (de-)installation in %%post and %%postun
-* Mon Feb 09 2004 - hhetter@suse.de
+* Mon Feb 09 2004 hhetter@suse.de
- updated to version 0.8.4 [GNOME2.4.2]
-* Thu Feb 05 2004 - ro@suse.de
+* Thu Feb 05 2004 ro@suse.de
- fix configure for lib64
-* Fri Oct 10 2003 - sbrabec@suse.cz
+* Fri Oct 10 2003 sbrabec@suse.cz
- Added new SuSE package, version 0.8.3 (GNOME 2.4).
++++++ gok-1.3.4.tar.bz2 -> gok-1.3.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/ChangeLog new/gok-1.3.7/ChangeLog
--- old/gok-1.3.4/ChangeLog 2007-09-14 05:39:09.000000000 +0200
+++ new/gok-1.3.7/ChangeLog 2007-10-15 02:16:34.000000000 +0200
@@ -1,3 +1,50 @@
+2007-10-13 David Bolter
+
+ * configure.in: Version 1.3.7
+
+2007-10-13 David Bolter
+ * gok/main.c: (gok_main_xevie_io): Added variable declaration.
+ Thanks for fix Joseph Sacco, fixes bug #486346.
+
+2007-10-12 David Bolter
+
+ * configure.in: Version 1.3.6
+
+2007-10-12 Christian Kirbach
+
+ * gok/gok-data.c:
+ * gok/gok-input.c:
+ * gok/gok-keyboard.c:
+ * gok/gok-key.c:
+ * gok/gok-scanner.c:
+ * gok/gok-spy.c:
+ * gok/gok-windowlister.c:
+ * gok/gok-utf8-word-complete.c:
+ * gok/keyboard-geometry.c:
+ * gok/main.c:
+ Remove about 70 unused variables.
+
+2007-10-02 David Bolter
+
+ * gok/gok-spy.c: menu changes to work with new firefox menu structures
+
+ Fixes bug #482796
+
+2007-10-01 Lo�c Minier
+
+ * help/gok/C/Makefile.am: Don't distclean legal.xml
+ * Makefile.am: Remove *.kbd files in clean instead of distclean
+
+ Helps distcheck; fixes bug #481681.
+
+2007-09-25 David Bolter
+
+ * gok/gok-keyboard.c,
+ * gok/gok-spy.c: improve editable text checking
+ * gok/gok-spy.h: added gok_spy_is_editable
+
+ Fixes bug #481099
+
2007-09-13 David Bolter
* configure.in: Version 1.3.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/configure new/gok-1.3.7/configure
--- old/gok-1.3.4/configure 2007-09-14 05:01:51.000000000 +0200
+++ new/gok-1.3.7/configure 2007-10-14 01:46:55.000000000 +0200
@@ -2046,7 +2046,7 @@
GOK_MAJOR_VERSION=1
GOK_MINOR_VERSION=3
-GOK_MICRO_VERSION=4
+GOK_MICRO_VERSION=7
GOK_INTERFACE_AGE=10
GOK_BINARY_AGE=11
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/configure.in new/gok-1.3.7/configure.in
--- old/gok-1.3.4/configure.in 2007-09-14 05:00:52.000000000 +0200
+++ new/gok-1.3.7/configure.in 2007-10-14 01:46:37.000000000 +0200
@@ -3,7 +3,7 @@
GOK_MAJOR_VERSION=1
GOK_MINOR_VERSION=3
-GOK_MICRO_VERSION=4
+GOK_MICRO_VERSION=7
GOK_INTERFACE_AGE=10
GOK_BINARY_AGE=11
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-data.c new/gok-1.3.7/gok/gok-data.c
--- old/gok-1.3.4/gok/gok-data.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-data.c 2007-10-10 23:16:54.000000000 +0200
@@ -468,7 +468,6 @@
gboolean gok_data_get_setting (gchar* NameAccessMethod, gchar* NameSetting, gint* Value, gchar** ValueString)
{
gchar* pPlus;
- gint count;
GokSetting* pSetting;
gchar *FirstNameSetting;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-input.c new/gok-1.3.7/gok/gok-input.c
--- old/gok-1.3.4/gok/gok-input.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-input.c 2007-10-10 23:16:54.000000000 +0200
@@ -328,7 +328,6 @@
char *name,
gboolean extended_only)
{
- GokInput *input = NULL;
GSList *device_list = gok_input_get_device_list ();
while (device_list && device_list->data) {
@@ -347,8 +346,6 @@
guint id,
gboolean extended_only)
{
- int i;
- int num_devices;
GSList *devices = gok_input_get_device_list ();
while (devices && devices->data) {
@@ -371,7 +368,6 @@
XEventClass event_list[40];
int number;
GtkWidget *window = gok_main_get_main_window ();
- Display *display;
GdkWindow *root;
GSList *device_list = gok_input_get_device_list ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-keyboard.c new/gok-1.3.7/gok/gok-keyboard.c
--- old/gok-1.3.4/gok/gok-keyboard.c 2007-09-14 04:59:45.000000000 +0200
+++ new/gok-1.3.7/gok/gok-keyboard.c 2007-10-10 23:16:54.000000000 +0200
@@ -111,7 +111,6 @@
static int m_MinSectionTop = G_MAXINT;
static int m_MinSectionLeft = G_MAXINT;
-static GokKeyboard *_core_compose_keyboard;
/* private prototypes */
static gboolean gok_keyboard_focus_object (Accessible *accessible);
@@ -289,6 +288,7 @@
return m_SectionRowStart[i];
}
+#ifdef DEBUG
static gint
gok_keyboard_section_row_columns (XkbGeometryPtr pGeom, XkbRowPtr rowp)
{
@@ -301,6 +301,7 @@
}
return ncols;
}
+#endif
static gint
gok_keyboard_get_section_column (gint i)
@@ -389,7 +390,6 @@
{
GokKey *pKey, *pKeyLast = keyboard->pKeyFirst;
gint row, firstrow, lastrow;
- gint col;
gboolean use_column = TRUE;
g_assert (keyboard);
@@ -825,7 +825,6 @@
gok_keyboard_get_alpha ()
{
GokKeyboard *pKeyboard;
- GokKey *pKey;
gok_log_enter();
pKeyboard = gok_keyboard_compose_create (ALPHA_KEYBOARD, KEYBOARD_LAYOUT_NORMAL);
/* The third string is not used in the C locale but corresponds to a shift
@@ -909,7 +908,6 @@
* instead of in the order in which they are added
*/
GokKeyboard *pKeyboard;
- GokKey *pKey;
gok_log_enter();
pKeyboard = gok_keyboard_compose_create (FREQ_KEYBOARD, KEYBOARD_LAYOUT_UPPERL);
@@ -950,7 +948,7 @@
static GokKeyboard*
gok_keyboard_get_compose ()
{
- const gchar *compose_name;
+ const gchar *compose_name = NULL;
switch (gok_data_get_compose_keyboard_type ())
{
@@ -1604,7 +1602,6 @@
**/
void gok_keyboard_calculate_font_size (GokKeyboard* pKeyboard)
{
- GokKeyboard* pKeyboardTemp;
GokKey* pKey;
gint sizeFont;
@@ -1894,8 +1891,6 @@
gint borderHeight = 0;
GdkRectangle rectFrame;
GdkRectangle rectTemp;
- GokButton* pGokButton;
- GtkButton* pButton;
gboolean bKeySizeChanged = FALSE;
gboolean expand = FALSE;
@@ -2327,6 +2322,7 @@
return is_branched;
break;
case KEYTYPE_BRANCHGUIACTIONS:
+ case KEYTYPE_BRANCHHYPERTEXT:
gok_log("branch gui_actions");
is_branched = gok_keyboard_branch_gui_actions (gok_main_get_current_keyboard (),
pKey->accessible_node, pKey->action_ndx);
@@ -2345,9 +2341,6 @@
}
return is_branched;
break;
- case KEYTYPE_BRANCHHYPERTEXT:
- gok_log ("HYPERTEXT!");
- break;
default:
/* should not be here */
gok_log ("Unknown branch type");
@@ -2610,7 +2603,8 @@
pKey->FontSizeGroup = FONT_SIZE_GROUP_UNIQUE;
/* should only be in the list if it's editable...*/
pKey->Type = KEYTYPE_BRANCHTEXT;
- if (AccessibleStateSet_contains (pStateSet, SPI_STATE_EDITABLE)) {
+ if (gok_spy_is_editable (pNodeAccessible->paccessible))
+ {
pKey->Style = gok_style_if_enabled (pStateSet, KEYSTYLE_BRANCHTEXT);
is_active = TRUE;
}
@@ -3139,10 +3133,9 @@
gboolean
gok_keyboard_branch_gui_actions (GokKeyboard *keyboard, AccessibleNode* node, gint action_ndx)
{
- AccessibleAction* paaction, *child_action;
+ AccessibleAction* paaction;
Accessible* parent = NULL;
AccessibleStateSet *stateset = NULL;
- gint i = 0;
gboolean branched = FALSE;
paaction = NULL;
@@ -3164,9 +3157,8 @@
Accessible_unref (parent);
/* Editable text fields: branch to the composer if we've successfully invoked an action */
- if (!branched && Accessible_isEditableText (node->paccessible) &&
+ if (!branched && gok_spy_is_editable (node->paccessible) &&
((stateset = Accessible_getStateSet (node->paccessible)) != NULL) &&
- (AccessibleStateSet_contains (stateset, SPI_STATE_EDITABLE)) &&
(gok_keyboard_focus_object (node->paccessible)))
{
gok_log ("branching to Compose kbd...\n");
@@ -3206,7 +3198,6 @@
gboolean
gok_keyboard_branch_gui_valuator (AccessibleNode* node)
{
- AccessibleValue* value;
AccessibleComponent *component;
GokKeyboard *valuator_kbd;
gok_log_enter();
@@ -3729,8 +3720,6 @@
gok_keyboard_dock (GokKey *pKey)
{
GokKeyboardDirection dir = GOK_DIRECTION_NONE;
- GokDockType old_type = gok_data_get_dock_type ();
- gint top = 0, bottom = 0;
if (pKey && pKey->pGeneral)
dir = *(GokKeyboardDirection *) pKey->pGeneral;
@@ -3966,9 +3955,6 @@
GokKey* gok_keyboard_output_key(GokKeyboard *keyboard, GokKey* pKey)
{
GokOutput delim_output;
- GokKeyboard* pPredictedKeyboard;
- GokKeyboard* pKeyboardTemp;
- GokKey* pKeyTemp;
const gchar *str;
gok_log_enter();
@@ -4036,6 +4022,7 @@
case KEYTYPE_BRANCHTOOLBARS:
case KEYTYPE_BRANCHCOMBO:
case KEYTYPE_BRANCHGUI:
+ case KEYTYPE_BRANCHHYPERTEXT:
/* case KEYTYPE_HYPERLINK:*/
gok_keyboard_branch_byKey (gok_main_get_current_keyboard (), pKey);
break;
@@ -4046,7 +4033,6 @@
KEYBOARD_SHAPE_UNSPECIFIED);
break;
- case KEYTYPE_BRANCHHYPERTEXT: /*TODO branch to browser keyboard; also TODO*/
case KEYTYPE_BRANCHTEXT:
if (pKey->accessible_node &&
pKey->accessible_node->paccessible) {
@@ -4632,7 +4618,6 @@
gok_keyboard_find_key_at (GokKeyboard *pKeyboard, gint x, gint y, GokKey *prev)
{
GokKey *pKey = NULL;
- gint row, col, n_rows, n_cols;
if (prev && gok_key_contains_point (prev, x, y)) {
return prev;
@@ -4720,7 +4705,6 @@
{
GokKey* pKey;
gint count;
- gint length;
gboolean add_word_pending = add_word && (g_utf8_strlen (add_word, -1) > 2);
int i;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-key.c new/gok-1.3.7/gok/gok-key.c
--- old/gok-1.3.4/gok/gok-key.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-key.c 2007-10-10 23:16:54.000000000 +0200
@@ -56,8 +56,7 @@
gint m_Group = 0; /* FIXME: statics are bad */
-#undef GOK_UTF8_DEBUG
-
+#ifdef GOK_UTF8_DEBUG
static void
gok_key_print_utf8_debug (gchar *buf)
{
@@ -82,6 +81,7 @@
}
fprintf (stderr, "\n");
}
+#endif
/* returned string must be freed */
static gchar *
@@ -319,8 +319,6 @@
unsigned int
gok_key_get_numlock_mask (Display *display)
{
- struct gok_modifier_keymask *m;
-
if (_numlock_mask == 0xFFFF) {
_numlock_mask = XkbKeysymToModifiers (display, XK_Num_Lock);
}
@@ -332,7 +330,6 @@
gok_key_get_xkb_type_index (XkbDescPtr xkb, KeyCode keycode, guint group)
{
int num_groups = XkbKeyNumGroups (xkb, keycode);
- int index;
if (!xkb)
return 1;
if (group >= num_groups)
@@ -421,9 +418,8 @@
gok_key_label_from_keycode (KeyCode keycode, Display *display, guint level, guint group)
{
char buf[20];
- int extra_rtn, nbytes, state = 0;
+ int extra_rtn, nbytes = 0;
KeySym keysym = 0;
- XkbStateRec xkb_state;
long ucs;
gunichar unichar;
@@ -504,7 +500,6 @@
guint group = gok_key_get_effective_group ();
gint type = gok_key_get_xkb_type_index (xkb, keycode, group);
guint modmask = 0;
- GokModifier *modifier;
/* FIXME: assumes modifier bindings don't depend on current modmask! */
gint level = gok_key_level_for_type (display, gok_keyboard_get_xkb_desc (), type, &modmask);
KeySym keysym = XkbKeycodeToKeysym (display, (KeyCode) keycode,
@@ -560,13 +555,11 @@
{
GokKey *pKey;
gchar *label;
- gchar name[XkbKeyNameLength + 1];
gchar keycode_name[8];
int keycode;
XkbBoundsRec *pBounds;
- int width, height, len;
+ int len;
gboolean is_modifier = FALSE;
- unsigned int numlock_mask;
int group, level;
pKey = gok_key_new (prevKey, NULL, pKeyboard);
@@ -826,11 +819,6 @@
xmlNode* pNodeWrapperChild;
GokOutput* pNewOutput;
GokOutput* pOutputTemp;
- gboolean settings_locked;
- guint modmask =
- SPI_KEYMASK_SHIFT | SPI_KEYMASK_SHIFTLOCK | SPI_KEYMASK_ALT |
- SPI_KEYMASK_CONTROL | SPI_KEYMASK_MOD1 | SPI_KEYMASK_MOD2 | SPI_KEYMASK_MOD3 | SPI_KEYMASK_MOD4 |
- SPI_KEYMASK_MOD5; /* ASSUMPTION: this includes numlock mask */
g_assert (pKey != NULL);
g_assert (pNode != NULL);
@@ -1279,7 +1267,6 @@
if (pLabelText != NULL)
{
- int len = strlen (pLabelText);
pNewLabel->Text = g_strdup (pLabelText);
}
@@ -1520,7 +1507,6 @@
GtkWidget *
gok_key_status_image (GokKey *key)
{
- GokUIState state = key->ComponentState;
GtkWidget *image = NULL;
gchar *icon_name, *file;
@@ -1610,8 +1596,6 @@
gchar* gok_key_get_label (GokKey* pKey)
{
gchar* pTextReturned;
- gchar* pToken;
- gchar buffer[150];
GokKeyLabel* pKeyLabel;
gboolean bFoundLabel;
int type = XkbAlphabeticIndex, keycode;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-scanner.c new/gok-1.3.7/gok/gok-scanner.c
--- old/gok-1.3.4/gok/gok-scanner.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-scanner.c 2007-10-10 23:16:54.000000000 +0200
@@ -3437,7 +3437,6 @@
gok_scanner_current_state_uses_corepointer (void)
{
gboolean retval = FALSE;
- GokAccessMethod *method;
if (m_pEffectsLeftButtonDown ||
m_pEffectsLeftButtonUp ||
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-spy.c new/gok-1.3.7/gok/gok-spy.c
--- old/gok-1.3.4/gok/gok-spy.c 2007-08-27 23:12:49.000000000 +0200
+++ new/gok-1.3.7/gok/gok-spy.c 2007-10-10 23:16:54.000000000 +0200
@@ -70,6 +70,7 @@
/*
* private prototypes
+1;5B
*/
static void gok_spy_focus_listener (const AccessibleEvent *event,
void *user_data);
@@ -100,7 +101,7 @@
void *user_data);
static gboolean gok_spy_is_visible (Accessible *accessible);
-
+
static void gok_spy_free_nodes (GSList *nodelist);
static void gok_spy_resolve_namesakes (GSList *nodelist);
@@ -184,8 +185,6 @@
*/
void gok_spy_accessible_ref(Accessible* accessible)
{
- char *s;
-
gok_log_enter ();
if (accessible != NULL)
@@ -193,6 +192,7 @@
explicitrefs++;
Accessible_ref (accessible);
#if defined(ENABLE_LOGGING_NORMAL)
+ char *s;
s = Accessible_getName (accessible);
if (s == NULL)
{
@@ -215,14 +215,13 @@
void gok_spy_accessible_implicit_ref(Accessible* accessible)
{
- char *s;
-
gok_log_enter ();
if (accessible != NULL)
{
implicitrefs++;
#if defined(ENABLE_LOGGING_NORMAL)
+ char *s;
s = Accessible_getName (accessible);
if (s == NULL)
{
@@ -245,13 +244,12 @@
void gok_spy_accessible_unref(Accessible* accessible)
{
- char *s;
-
gok_log_enter ();
if (accessible != NULL)
{
#if defined(ENABLE_LOGGING_NORMAL)
+ char *s;
s = Accessible_getName (accessible);
if (s == NULL)
{
@@ -596,8 +594,7 @@
return node->flags.data.is_ui;
break;
case GOK_SPY_SEARCH_EDITABLE_TEXT:
- if (Accessible_isEditableText (node->paccessible))
- return TRUE;
+ return gok_spy_is_editable (node->paccessible);
break;
case GOK_SPY_SEARCH_CHILDREN:
case GOK_SPY_SEARCH_COMBO:
@@ -653,14 +650,13 @@
int child_count = Accessible_getChildCount (search_root);
while (i < child_count)
{
- AccessibleRole role = SPI_ROLE_INVALID;
child = Accessible_getChildAtIndex (search_root, i);
if (child)
{
gok_spy_accessible_implicit_ref (child);
- if (Accessible_isEditableText (child))
+ if (gok_spy_is_editable (child))
{
- return child;
+ return child;
}
else
{
@@ -1120,7 +1116,6 @@
gboolean gok_spy_check_queues(void)
{
EventNode* en = NULL;
- char *s;
GokKeyboard *current_kbd;
gok_log_enter();
@@ -1138,6 +1133,7 @@
#if defined(ENABLE_LOGGING_NORMAL)
if (en && en->event && en->event->source != NULL)
{
+ char *s;
s = Accessible_getName (en->event->source);
if (s == NULL)
{
@@ -1272,20 +1268,10 @@
AccessibleStateSet* ass = NULL;
gok_log_enter();
-
- switch (Accessible_getRole (accessible))
- {
- case SPI_ROLE_MENU:
- case SPI_ROLE_MENU_BAR:
- case SPI_ROLE_MENU_ITEM:
- case SPI_ROLE_CHECK_MENU_ITEM:
- case SPI_ROLE_RADIO_MENU_ITEM:
- bmenu = TRUE;
- break;
- default:
- bmenu = FALSE;
- }
- ass = Accessible_getStateSet(accessible);
+
+ bmenu = gok_spy_is_menu_role(Accessible_getRole(accessible));
+ /* no longer consider SPI_ROLE_MENU_BAR -- to work better with ff3*/
+
if (ass != NULL)
{
/* state heuristic:
@@ -1327,6 +1313,19 @@
}
gboolean
+gok_spy_is_editable (Accessible *accessible)
+{
+ gboolean retval = FALSE;
+ if (accessible && Accessible_isEditableText(accessible)) {
+ AccessibleStateSet *states = Accessible_getStateSet (accessible);
+ if (AccessibleStateSet_contains (states, SPI_STATE_EDITABLE))
+ retval = TRUE;
+ AccessibleStateSet_unref (states);
+ }
+ return retval;
+}
+
+gboolean
gok_spy_is_menu_role (AccessibleRole role)
{
return ((role == SPI_ROLE_MENU_ITEM) ||
@@ -1373,7 +1372,7 @@
interesting = TRUE;
break;
default:
- if (Accessible_isEditableText (accessible) ||
+ if (gok_spy_is_editable (accessible) ||
/*Accessible_isHypertext (accessible) ||*/
Accessible_isTable (accessible) ||
(!gok_spy_is_menu_role (role) &&
@@ -1567,8 +1566,6 @@
Accessible* pAccessible,
AccessibleNodeFlags flags)
{
- AccessibleNode* pLastNode = NULL;
- AccessibleNode* pNewNode = NULL;
AccessibleRelation** relations = NULL;
Accessible* targetAccessible = NULL;
AccessibleRole role;
@@ -1862,7 +1859,7 @@
if (gs) {
g_free (gs);
}
- if (Accessible_isEditableText (pAccessible)) {
+ if (gok_spy_is_editable (pAccessible)) {
pName = g_strdup ("Text Entry (empty)");
}
}
@@ -1996,13 +1993,14 @@
}
/* We consider it safe enough to provide a name for nameless Selections */
- if ((pName == NULL) && Accessible_isSelection(pAccessible)) {
+ /* removed for ff3
+ if ((pName == NULL) && Accessible_isSelection(pAccessible)) {
gchar* rolename;
rolename = Accessible_getRoleName (pAccessible);
pName = g_strdup (rolename);
nodes = gok_spy_add_node (nodes, pAccessible, flags, 0, pName);
SPI_freeString (rolename);
- }
+ }*/
if ((pName == NULL) && gok_main_get_debug_nameless()) {
@@ -2349,7 +2347,6 @@
return FALSE;
}
else {
- gboolean retval;
gok_log("gok_data_get_drive_corepointer() is FALSE");
return gok_scanner_current_state_uses_core_mouse_button(button);
}
@@ -2417,8 +2414,6 @@
*/
void gok_spy_modifier_listener(const AccessibleEvent *event, void *user_data)
{
- const struct gok_modifier_keymask *m;
-
keyboardmods = event->detail2;
gok_log_enter();
@@ -2511,7 +2506,7 @@
static gboolean
gok_spy_find_and_append_toolbar_items (Accessible *root, AccessibleNodeFlags flags)
{
- Accessible *child, *tmp;
+ Accessible *child;
gint i, nchildren;
gboolean retval = FALSE;
@@ -2625,7 +2620,7 @@
{
ui_flags.data.gui = flags.data.is_ui = TRUE;
}
- if (keyboard_ui_flags.data.editable_text && Accessible_isEditableText (child))
+ if (keyboard_ui_flags.data.editable_text && gok_spy_is_editable (child))
{
ui_flags.data.editable_text = TRUE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-spy.h new/gok-1.3.7/gok/gok-spy.h
--- old/gok-1.3.4/gok/gok-spy.h 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-spy.h 2007-09-25 17:46:14.000000000 +0200
@@ -87,6 +87,9 @@
gulong gok_spy_get_modmask (void);
gboolean gok_spy_is_menu_role (AccessibleRole role);
+
+gboolean gok_spy_is_editable (Accessible* paccessible);
+
/* gboolean gok_spy_is_desktop(Accessible* pAccessible); */
/* gboolean gok_spy_accessible_is_desktopChild(Accessible* accessible); */
Accessible* gok_spy_get_active_frame (void );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-utf8-word-complete.c new/gok-1.3.7/gok/gok-utf8-word-complete.c
--- old/gok-1.3.4/gok/gok-utf8-word-complete.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-utf8-word-complete.c 2007-10-10 23:16:54.000000000 +0200
@@ -104,7 +104,6 @@
{
gchar *contents;
gchar **dictionary_lines = NULL;
- gint i;
GError *error = NULL;
GokUTF8WordComplete *utf8_complete = GOK_UTF8WORDCOMPLETE (complete);
@@ -215,10 +214,9 @@
{
gchar **word_predict_list;
gchar *normalized, *tmp;
- gint i, n, m = num_predictions;
+ gint n;
GList *predictions;
GokUTF8WordComplete *utf8_complete = GOK_UTF8WORDCOMPLETE (complete);
- gpointer data;
/* validate the given values */
if (word == NULL || num_predictions < 1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/gok-windowlister.c new/gok-1.3.7/gok/gok-windowlister.c
--- old/gok-1.3.4/gok/gok-windowlister.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/gok-windowlister.c 2007-10-10 23:16:54.000000000 +0200
@@ -131,7 +131,6 @@
void
_modified_wnck_window_activate (WnckWindow *window)
{
- Screen *screen;
Window xid;
XWindowAttributes attrs;
@@ -148,7 +147,6 @@
_modified_wnck_workspace_activate (WnckWorkspace *space,
WnckWindow *window)
{
- Screen *screen;
Window xid;
XWindowAttributes attrs;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/keyboard-geometry.c new/gok-1.3.7/gok/keyboard-geometry.c
--- old/gok-1.3.4/gok/keyboard-geometry.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/keyboard-geometry.c 2007-10-10 23:16:54.000000000 +0200
@@ -180,12 +180,11 @@
int main (int argc, char **argv)
{
- XEvent xev;
XkbDescPtr kbd;
XkbGeometryPtr geom;
int ir, xkb_base_event_type, reason_return;
char *display_name = getenv ("DISPLAY");
- int i, j, k, row, col;
+ int i, j, row, col;
unsigned int mods = 0;
if (!display_name) display_name = ":0.0";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/gok/main.c new/gok-1.3.7/gok/main.c
--- old/gok-1.3.4/gok/main.c 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/gok/main.c 2007-10-12 23:49:12.000000000 +0200
@@ -1011,7 +1011,6 @@
void
gok_main_set_cursor (GdkCursor *cursor)
{
- GdkPixmap *source;
GdkColor color = { 0, 0, 0, 0 };
static GdkCursor *nilCursor = NULL;
if (!cursor) {
@@ -1228,8 +1227,8 @@
GIOCondition condition,
gpointer data)
{
- XEvent xevie_event;
#ifdef HAVE_XEVIE
+ XEvent xevie_event;
while (xevie_dpy && XPending (xevie_dpy)) {
XMotionEvent *motion_event;
gboolean has_active_key = gok_scanner_key_is_active ();
@@ -1828,7 +1827,6 @@
{
GtkWidget *window1;
GtkWidget *fixed1;
- GtkWidget *event1;
gok_log_enter();
@@ -2836,7 +2834,6 @@
{
gint x=-1, y=-1, w=0, h=0;
gint px, py;
- GdkModifierType mask;
GtkWidget *widget = gok_main_get_main_window ();
gok_scanner_get_pointer_location (&px, &py);
if (widget->window) {
@@ -3155,8 +3152,6 @@
if (always || gok_scanner_current_state_uses_corepointer ())
{
GtkWidget* button;
- gint response_id;
- gboolean returnCode = TRUE;
if (opt_out && okfunc) (*okfunc) ();
@@ -3219,8 +3214,6 @@
if (!accessibility_on) {
GtkWidget* button;
- gint response_id;
- gboolean returnCode = TRUE;
acd = gtk_message_dialog_new (
NULL,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/help/gok/C/Makefile.am new/gok-1.3.7/help/gok/C/Makefile.am
--- old/gok-1.3.4/help/gok/C/Makefile.am 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/help/gok/C/Makefile.am 2007-09-26 00:46:06.000000000 +0200
@@ -1,4 +1,3 @@
-DISTCLEANFILES = legal.xml
figdir =
docname = gok
lang = C
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/help/gok/C/Makefile.in new/gok-1.3.7/help/gok/C/Makefile.in
--- old/gok-1.3.4/help/gok/C/Makefile.in 2007-09-14 05:03:37.000000000 +0200
+++ new/gok-1.3.7/help/gok/C/Makefile.in 2007-10-14 01:46:57.000000000 +0200
@@ -303,7 +303,6 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-DISTCLEANFILES = legal.xml
figdir =
docname = gok
lang = C
@@ -421,7 +420,6 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/Makefile.am new/gok-1.3.7/Makefile.am
--- old/gok-1.3.4/Makefile.am 2007-07-18 21:20:26.000000000 +0200
+++ new/gok-1.3.7/Makefile.am 2007-09-26 00:46:06.000000000 +0200
@@ -168,6 +168,7 @@
rm -rf gokwebdoc
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+CLEANFILES = $(kbd_files)
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
@@ -177,5 +178,4 @@
gok-with-references.schemas.in \
gok-with-references.schemas \
$(schema_DATA) \
- $(xam_files) \
- $(kbd_files)
+ $(xam_files)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/Makefile.in new/gok-1.3.7/Makefile.in
--- old/gok-1.3.4/Makefile.in 2007-09-14 05:03:38.000000000 +0200
+++ new/gok-1.3.7/Makefile.in 2007-10-14 01:46:57.000000000 +0200
@@ -371,6 +371,7 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = gok.schemas
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+CLEANFILES = $(kbd_files)
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
@@ -380,8 +381,7 @@
gok-with-references.schemas.in \
gok-with-references.schemas \
$(schema_DATA) \
- $(xam_files) \
- $(kbd_files)
+ $(xam_files)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -885,6 +885,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/po/ChangeLog new/gok-1.3.7/po/ChangeLog
--- old/gok-1.3.4/po/ChangeLog 2007-09-14 05:00:08.000000000 +0200
+++ new/gok-1.3.7/po/ChangeLog 2007-09-25 16:59:24.000000000 +0200
@@ -1,3 +1,7 @@
+2007-09-18 Duarte Loreto
+
+ * pt.po: Fixed typos in Portuguese translation.
+
2007-09-17 Theppitak Karoonboonyanan
* th.po: Updated Thai translation.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/po/oc.po new/gok-1.3.7/po/oc.po
--- old/gok-1.3.4/po/oc.po 2007-08-27 23:13:28.000000000 +0200
+++ new/gok-1.3.7/po/oc.po 2007-10-10 22:32:50.000000000 +0200
@@ -1462,7 +1462,7 @@
#. translators: "table" as in row/column data structure
#: ../gok/gok-keyboard.c:2812 ../gok/gok-spy.c:1784
msgid "Table"
-msgstr "Taula"
+msgstr "Tablèu"
#: ../gok/gok-keyboard.c:2817 ../main.kbd.in.h:9
msgid "Toolbars"
@@ -1478,9 +1478,7 @@
#: ../gok/gok-keyboard.c:3658
msgid "translator-credits"
-msgstr ""
-"La còla occitana de revirada d'Ubuntu, 2007 - ubuntu-l10n-oci@lists.ubuntu."
-"com"
+msgstr "Yannig Marchegay (Kokoyaya) \n"
"Language-Team: Portuguese \n"
"MIME-Version: 1.0\n"
@@ -536,7 +536,9 @@
#: ../gok.desktop.in.h:2
msgid "Type and navigate applications using alternative input devices"
-msgstr "Introduza texto e navegue nas aplicações utilizando dispositivos de entrada alternativos"
+msgstr ""
+"Introduza texto e navegue nas aplicações utilizando dispositivos de entrada "
+"alternativos"
#: ../gok.glade2.h:1
msgid "*"
@@ -720,7 +722,7 @@
#: ../gok.glade2.h:44
msgid "Activate when _pressed"
-msgstr "Activar quando _primido"
+msgstr "Activar quando _premido"
#: ../gok.glade2.h:45
msgid "Activate when _released"
@@ -951,7 +953,7 @@
#: ../gok.glade2.h:101
msgid "Press"
-msgstr "Primir"
+msgstr "Premir"
#: ../gok.glade2.h:102
msgid "Previous Key"
@@ -1462,7 +1464,7 @@
#.
#: ../gok/gok-keyboard.c:865
msgid "level 0|abcdefghijklmnopqrstuvwxyz1234567890-=[];'#\\,./"
-msgstr "nível 0|abcdefghijklmnopqrstuvwxyz1234567890-=[];'#\\,./"
+msgstr "level 0|abcdefghijklmnopqrstuvwxyz1234567890-=[];'#\\,./"
#. The substring "level 1|" should not be translated.
#. * For languages/locales which use 'upper case', this string should
@@ -1470,7 +1472,7 @@
#.
#: ../gok/gok-keyboard.c:870
msgid "level 1|ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"3$%^&*()_+{}:@~<>?"
-msgstr "nível 1|ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"3$%^&*()_+{}:@~<>?"
+msgstr "level 1|ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"3$%^&*()_+{}:@~<>?"
#. Not used in C locale: this string can contain a third set of characters
#. * at another 'shift level'. It can be used to provide a second/alternate
@@ -1483,13 +1485,13 @@
#.
#: ../gok/gok-keyboard.c:877 ../gok/gok-keyboard.c:933
msgid "level 2|"
-msgstr "nível 2|"
+msgstr "level 2|"
#. For locales which need an even larger character set, or offer uppercase versions
#. * of the 'level2' characters, add them to 'level 3'
#: ../gok/gok-keyboard.c:880 ../gok/gok-keyboard.c:934
msgid "level 3|"
-msgstr "nível 3|"
+msgstr "level 3|"
#.
#. * Note to Translators: the following strings should contain your LANG/locale's
@@ -1504,51 +1506,51 @@
#.
#: ../gok/gok-keyboard.c:928
msgid "level 0|etaonrishdlfcmugypwbvkxjqz`1234567890-=\\[];'<,./"
-msgstr "nível 0|etaonrishdlfcmugypwbvkxjqz`1234567890-=\\[];'<,./"
+msgstr "level 0|etaonrishdlfcmugypwbvkxjqz`1234567890-=\\[];'<,./"
#: ../gok/gok-keyboard.c:929
msgid "level 1|ETAONRISHDLFCMUGYPWBVKXJQZ~!@#$%^&*()_+|{}:\"><>?"
-msgstr "nível 1|ETAONRISHDLFCMUGYPWBVKXJQZ~!@#$%^&*()_+|{}:\"><>?"
+msgstr "level 1|ETAONRISHDLFCMUGYPWBVKXJQZ~!@#$%^&*()_+|{}:\"><>?"
#. change the name of the window to the keyboard name
#: ../gok/gok-keyboard.c:1920
msgid "GOK - "
msgstr "GOK - "
-#: ../gok/gok-keyboard.c:2824
+#: ../gok/gok-keyboard.c:2807
msgid "GUI"
msgstr "GUI"
#. translators: "table" as in row/column data structure
-#: ../gok/gok-keyboard.c:2829 ../gok/gok-spy.c:1746
+#: ../gok/gok-keyboard.c:2812 ../gok/gok-spy.c:1784
msgid "Table"
msgstr "Tabela"
-#: ../gok/gok-keyboard.c:2834 ../main.kbd.in.h:9
+#: ../gok/gok-keyboard.c:2817 ../main.kbd.in.h:9
msgid "Toolbars"
msgstr "Barras de Ferramentas"
-#: ../gok/gok-keyboard.c:2838
+#: ../gok/gok-keyboard.c:2821
msgid "Applications"
msgstr "Aplicações"
-#: ../gok/gok-keyboard.c:2848
+#: ../gok/gok-keyboard.c:2831
msgid "Menu"
msgstr "Menu"
-#: ../gok/gok-keyboard.c:3747
+#: ../gok/gok-keyboard.c:3658
msgid "translator-credits"
msgstr "Duarte Loreto "
-#: ../gok/gok-keyboard.c:3770 ../main.kbd.in.h:4
+#: ../gok/gok-keyboard.c:3681 ../gok/main.c:1852 ../main.kbd.in.h:4
msgid "GOK"
msgstr "GOK"
-#: ../gok/gok-keyboard.c:3772
+#: ../gok/gok-keyboard.c:3683
msgid "Dynamic virtual keyboards for the GNOME desktop"
msgstr "Teclados virtuais dinâmicos para o ambiente de trabalho GNOME"
-#: ../gok/gok-keyboard.c:3781
+#: ../gok/gok-keyboard.c:3692
msgid "Full Credits"
msgstr "Créditos Detalhados"
@@ -1583,12 +1585,12 @@
msgstr "erro ao ler a descrição"
#. translators: abbreviated version of "Vertical Scrollbar"
-#: ../gok/gok-spy.c:1664
+#: ../gok/gok-spy.c:1701
msgid "V Scrollbar"
msgstr "Rolamento V"
#. translators: abbreviated version of "Horizontal Scrollbar"
-#: ../gok/gok-spy.c:1669
+#: ../gok/gok-spy.c:1706
msgid "H Scrollbar"
msgstr "Rolamento H"
@@ -2048,7 +2050,7 @@
#: ../inverse-scanning.xml.in.h:28 ../singlekey-inverse-scanning.xml.in.h:26
msgid "Press and hold a switch to scan. Press another switch to select."
msgstr ""
-"Mantenha primido um interruptor para examinar. Prima outro interruptor para "
+"Mantenha premido um interruptor para examinar. Prima outro interruptor para "
"seleccionar."
#. User interface for the access method
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gok-1.3.4/README new/gok-1.3.7/README
--- old/gok-1.3.4/README 2007-09-14 05:01:11.000000000 +0200
+++ new/gok-1.3.7/README 2007-10-15 02:16:43.000000000 +0200
@@ -1,4 +1,4 @@
-Version 1.3.4
+Version 1.3.7
GNOME On-screen Keyboard (GOK)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org