Remove broken definitions - mostly functions that take function pointers.

2009-03-25  Murray Cumming  <murrayc@murrayc.com>

* glib/src/glib_enums.defs:
* glib/src/glib_functions.defs: Remove broken definitions - mostly 
functions that take function pointers. I wonder why I did not notice 
this before.

svn path=/trunk/; revision=805

4 files changed, 10 insertions, 92 deletions

diff --git a/ChangeLog b/ChangeLog
index 548ebc7a..c8a2b1d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/glib_enums.defs:
+	* glib/src/glib_functions.defs: Remove broken definitions - mostly 
+	functions that take function pointers. I wonder why I did not notice 
+	this before.
+
 2009-03-23  Daniel Elstner  <danielk@openismus.com>
 
 	* glib/src/keyfile.{ccg,hg}: Conditionalize all exception-handling
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index 5b24f161..dc01dbdf 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -473,37 +473,6 @@
   )
 )
 
-(define-enum-extended TokenType
-  (in-module "G")
-  (c-name "GTokenType")
-  (values
-    '("eof" "G_TOKEN_EOF" "0")
-    '("left-paren" "G_TOKEN_LEFT_PAREN" "'('")
-    '("right-paren" "G_TOKEN_RIGHT_PAREN" "')'")
-    '("left-curly" "G_TOKEN_LEFT_CURLY" "'{'")
-    '("right-curly" "G_TOKEN_RIGHT_CURLY" "']'")
-    '("left-brace" "G_TOKEN_LEFT_BRACE" "'['")
-    '("right-brace" "G_TOKEN_RIGHT_BRACE" "']'")
-    '("equal-sign" "G_TOKEN_EQUAL_SIGN" "'='")
-    '("comma" "G_TOKEN_COMMA" "','")
-    '("none" "G_TOKEN_NONE" "256")
-    '("error" "G_TOKEN_ERROR" "257")
-    '("char" "G_TOKEN_CHAR" "258")
-    '("binary" "G_TOKEN_BINARY" "259")
-    '("octal" "G_TOKEN_OCTAL" "260")
-    '("int" "G_TOKEN_INT" "261")
-    '("hex" "G_TOKEN_HEX" "262")
-    '("float" "G_TOKEN_FLOAT" "263")
-    '("string" "G_TOKEN_STRING" "264")
-    '("symbol" "G_TOKEN_SYMBOL" "265")
-    '("identifier" "G_TOKEN_IDENTIFIER" "266")
-    '("identifier-null" "G_TOKEN_IDENTIFIER_NULL" "267")
-    '("comment-single" "G_TOKEN_COMMENT_SINGLE" "268")
-    '("comment-multi" "G_TOKEN_COMMENT_MULTI" "269")
-    '("last" "G_TOKEN_LAST" "270")
-  )
-)
-
 ;; From /opt/gnome2/include/glib-2.0/glib/gshell.h
 
 (define-enum-extended ShellError
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index 3877c5aa..b86a9d8c 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -2151,18 +2151,6 @@
   )
 )
 
-(define-method 
-  (of-object "GIConv")
-  (c-name "g_iconv")
-  (return-type "gsize")
-  (parameters
-    '("gchar**" "inbuf")
-    '("gsize*" "inbytes_left")
-    '("gchar**" "outbuf")
-    '("gsize*" "outbytes_left")
-  )
-)
-
 (define-method close
   (of-object "GIConv")
   (c-name "g_iconv_close")
@@ -9228,25 +9216,6 @@
   (return-type "int")
 )
 
-(define-function g_test_add_func
-  (c-name "g_test_add_func")
-  (return-type "none")
-  (parameters
-    '("const-char*" "testpath")
-    '("void-(*" "test_func")
-  )
-)
-
-(define-function g_test_add_data_func
-  (c-name "g_test_add_data_func")
-  (return-type "none")
-  (parameters
-    '("const-char*" "testpath")
-    '("gconstpointer" "test_data")
-    '("void-(*" "test_func")
-  )
-)
-
 (define-function g_test_message
   (c-name "g_test_message")
   (return-type "none")
@@ -9351,17 +9320,6 @@
   )
 )
 
-(define-function g_test_create_case
-  (c-name "g_test_create_case")
-  (return-type "GTestCase*")
-  (parameters
-    '("const-char*" "test_name")
-    '("gsize" "data_size")
-    '("gconstpointer" "test_data")
-    '("void-(*" "data_setup")
-  )
-)
-
 (define-function g_test_create_suite
   (c-name "g_test_create_suite")
   (return-type "GTestSuite*")
@@ -9484,17 +9442,6 @@
   )
 )
 
-(define-function g_test_add_vtable
-  (c-name "g_test_add_vtable")
-  (return-type "none")
-  (parameters
-    '("const-char*" "testpath")
-    '("gsize" "data_size")
-    '("gconstpointer" "test_data")
-    '("void-(*" "data_setup")
-  )
-)
-
 (define-method name
   (of-object "GTestLogType")
   (c-name "g_test_log_type_name")
@@ -10854,14 +10801,6 @@
   )
 )
 
-(define-function atexit
-  (c-name "atexit")
-  (return-type "int")
-  (parameters
-    '("void" "(*")
-  )
-)
-
 (define-function g_find_program_in_path
   (c-name "g_find_program_in_path")
   (return-type "gchar*")
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index a29c7a89..3437c01d 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -443,6 +443,9 @@ sub substitute_function($$)
   {
     # Not perfect, but better than nothing.
     $name =~ s/^g_/Glib::/;
+
+    # Hard-code the hack for this because it is not dealt with by other code:
+    $name =~ s/^gtk_accel_map_/Gtk::AccelMap::/;
   }
 
   return $name . "()";