summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-05-05 09:22:27 +0000
committerRüdiger Timm <rt@openoffice.org>2006-05-05 09:22:27 +0000
commit1bc508b2ba62a730afa01b86f7e58a23b1e915a7 (patch)
tree2fafa7171652e8133c1c2ee70eae4475023f5573 /fpicker
parentc3790f3fa4c14ae51fedf343bd1493760ca6053b (diff)
INTEGRATION: CWS atkbridge (1.4.26); FILE MERGED
2005/12/07 14:37:07 obr 1.4.26.1: #i42429# has been fixed in at-spi rev. 1.6.6
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/unx/gnome/FPentry.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index 1f48322e187d..ee0768d87f62 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: FPentry.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 23:34:31 $
+ * last change: $Author: rt $ $Date: 2006-05-05 10:22:27 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -158,8 +158,7 @@ void* SAL_CALL component_getFactory(
{
if (
/* crude gtkplug check */ !g_type_from_name( "GdkDisplay" ) ||
- /* old version */ !( gtk_major_version >= 2 && gtk_minor_version >= 4 ) ||
- /* #i42429# */ Application::GetSettings().GetMiscSettings().GetEnableATToolSupport()
+ /* old version */ !( gtk_major_version >= 2 && gtk_minor_version >= 4 )
)
{
return 0;