2 files changed, 7 insertions, 56 deletions

diff --git a/libjava/gnu/java/util/prefs/EventDispatcher.h b/libjava/gnu/java/util/prefs/EventDispatcher.h
deleted file mode 100644
index 235aabb5ccf..00000000000
--- a/libjava/gnu/java/util/prefs/EventDispatcher.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_java_util_prefs_EventDispatcher__
-#define __gnu_java_util_prefs_EventDispatcher__
-
-#pragma interface
-
-#include <java/lang/Thread.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace java
-    {
-      namespace util
-      {
-        namespace prefs
-        {
-            class EventDispatcher;
-        }
-      }
-    }
-  }
-}
-
-class gnu::java::util::prefs::EventDispatcher : public ::java::lang::Thread
-{
-
-  EventDispatcher();
-public:
-  virtual void run();
-  static void dispatch(::java::lang::Runnable *);
-private:
-  static ::java::lang::Thread * dispatchThread;
-  static ::java::util::ArrayList * queue;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_java_util_prefs_EventDispatcher__
diff --git a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h b/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
index 5d0945a32dc..e0e37d7f136 100644
--- a/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
+++ b/libjava/gnu/java/util/prefs/gconf/GConfNativePeer.h
@@ -7,8 +7,6 @@
 #pragma interface
 
 #include <java/lang/Object.h>
-#include <gcj/array.h>
-
 extern "Java"
 {
   namespace gnu
@@ -35,8 +33,6 @@ class gnu::java::util::prefs::gconf::GConfNativePeer : public ::java::lang::Obje
 public:
   GConfNativePeer();
   jboolean nodeExist(::java::lang::String *);
-  void startWatchingNode(::java::lang::String *);
-  void stopWatchingNode(::java::lang::String *);
   jboolean setString(::java::lang::String *, ::java::lang::String *);
   jboolean unset(::java::lang::String *);
   ::java::lang::String * getKey(::java::lang::String *);
@@ -52,19 +48,15 @@ private:
   static void init_class();
   static void finalize_class();
 public: // actually protected
-  static jboolean gconf_client_dir_exists(::java::lang::String *);
-  static void gconf_client_add_dir(::java::lang::String *);
-  static void gconf_client_remove_dir(::java::lang::String *);
-  static jboolean gconf_client_set_string(::java::lang::String *, ::java::lang::String *);
-  static ::java::lang::String * gconf_client_get_string(::java::lang::String *);
-  static jboolean gconf_client_unset(::java::lang::String *);
-  static void gconf_client_suggest_sync();
-  static ::java::util::List * gconf_client_all_nodes(::java::lang::String *);
-  static ::java::util::List * gconf_client_all_keys(::java::lang::String *);
+  static jboolean gconf_dir_exists(::java::lang::String *);
+  static jboolean gconf_set_string(::java::lang::String *, ::java::lang::String *);
+  static ::java::lang::String * gconf_get_string(::java::lang::String *);
+  static jboolean gconf_unset(::java::lang::String *);
+  static void gconf_suggest_sync();
+  static ::java::util::List * gconf_all_nodes(::java::lang::String *);
+  static ::java::util::List * gconf_all_keys(::java::lang::String *);
   static ::java::lang::String * gconf_escape_key(::java::lang::String *);
   static ::java::lang::String * gconf_unescape_key(::java::lang::String *);
-private:
-  static JArray< ::java::lang::Object * > * semaphore;
 public:
   static ::java::lang::Class class$;
 };