[rep-gtk] revert slist >> GSList / list >> GList renamal

[Christopher Bratusek <chrisb src gnome org>]

commit 8d3ec75f27e4a57779c64bcc898e4bf6a3f62bf7
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Thu Jan 7 13:55:29 2010 +0100

    revert slist >> GSList / list >> GList renamal

 ChangeLog    |    4 ++++
 NEWS         |    2 --
 build-gtk.jl |    4 ++--
 gtk.defs     |   28 ++++++++++++++--------------
 gtktree.defs |    4 ++--
 5 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 202f605..c57dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-07  Christopher Bratusek <zanghar freenet de>
+	* *.defs
+	* build-gtk.jl: revert slist >> GSList / list >> GList renamal
+
 2010-01-06  Christopher Bratusek <zanghar freenet de>
 	* gtktree.defs:
 	****************** gtkcellrenderertext.h ********
diff --git a/NEWS b/NEWS
index 3f148fc..935b2fd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,6 @@ improved deb and rpm packaging scripts
 improved ebuild
 install header to $includedir/rep-gtk
 autotools (Makefile & Co.) rework
-renamed slist type to GSList
-renamed list type to GList
 
 2.12 APIs added:
 	* gtkfilechooser.defs:
diff --git a/build-gtk.jl b/build-gtk.jl
index cbfc78a..ec69a29 100644
--- a/build-gtk.jl
+++ b/build-gtk.jl
@@ -1322,10 +1322,10 @@
 (define-type 'file-descriptor "int" "sgtk_rep_to_fd"
 	     "sgtk_fd_to_rep" "sgtk_valid_fd")
 
-(define-type 'GList "GList*" output-rep-to-list output-list-to-rep
+(define-type 'list "GList*" output-rep-to-list output-list-to-rep
 	     output-cvec-pred (cons 'finish output-list-finish))
 
-(define-type 'GSList "GSList*" output-rep-to-list output-list-to-rep
+(define-type 'slist "GSList*" output-rep-to-list output-list-to-rep
 	     output-cvec-pred (cons 'finish output-list-finish))
 
 (define-type 'cvec "sgtk_cvec" output-rep-to-cvec output-cvec-to-rep
diff --git a/gtk.defs b/gtk.defs
index 5cfa245..66b891d 100644
--- a/gtk.defs
+++ b/gtk.defs
@@ -509,7 +509,7 @@
    (GdkModifierType modifier)))
 
 (define-func gtk_accel_groups_from_object
-  (GSList string)
+  (slist string)
   ((GObject object)))
 
 ;; XXX need support for GtkAccelGroupFindFunc
@@ -1152,13 +1152,13 @@
   ((GtkContainer container)))
 
 (define-func gtk_container_get_children
-  ((GList GtkWidget))
+  ((list GtkWidget))
   ((GtkContainer container)))
 
 (define-func gtk_container_set_focus_chain
   none
   ((GtkContainer container)
-   ((GList GtkWidget) focusable_widgets)))
+   ((list GtkWidget) focusable_widgets)))
 
 (define-func gtk_container_unset_focus_chain
   none
@@ -1820,7 +1820,7 @@
 
 
 (define-func gtk_window_list_toplevels
-  ((GList GtkWindow))
+  ((list GtkWindow))
   ())
 
 (define-func gtk_window_add_mnemonic
@@ -2434,7 +2434,7 @@
 
 (define-func gtk_radio_button_new
   GtkWidget
-  (((GSList string) group (null-ok))))
+  (((slist string) group (null-ok))))
 
 (define-func gtk_radio_button_new_from_widget
   GtkWidget
@@ -2442,7 +2442,7 @@
 
 (define-func gtk_radio_button_new_with_label
   GtkWidget
-  (((GSList string) group (null-ok))
+  (((slist string) group (null-ok))
    (string label)))
 
 (define-func gtk_radio_button_new_with_label_from_widget
@@ -2452,7 +2452,7 @@
 
 (define-func gtk_radio_button_new_with_mnemonic
   GtkWidget
-  (((GSList string) group (null-ok))
+  (((slist string) group (null-ok))
    (string mnemonic)))
 
 (define-func gtk_radio_button_new_with_mnemonic_from_widget
@@ -2463,13 +2463,13 @@
 ;; XXX
 ;;(define-func gtk_radio_button_set_group
 ;;  none
-;;  ((GSList GtkWidget))
+;;  ((slist GtkWidget))
 ;;   ((GtkRadioButton button)))
 ;;
 ;;(define-func gtk_radio_button_get_group
 ;;  none
 ;;  ((GtkRadioButton button)
-;;   (GSList GtkWidget)))
+;;   (slist GtkWidget)))
 
 ;;; Misc
 
@@ -2780,7 +2780,7 @@
 (define-func gtk_combo_set_popdown_strings
   none
   ((GtkCombo combo)
-   ((GList string) strings)))
+   ((list string) strings)))
 
 ;;;; StatusBar
 
@@ -3400,23 +3400,23 @@
 (define-func gtk_list_insert_items
   none
   ((GtkList list)
-   ((GList GtkListItem) items)
+   ((list GtkListItem) items)
    (int position)))
 
 (define-func gtk_list_append_items
   none
   ((GtkList list)
-   ((GList GtkListItem) items)))
+   ((list GtkListItem) items)))
 
 (define-func gtk_list_prepend_items
   none
   ((GtkList list)
-   ((GList GtkListItem) items)))
+   ((list GtkListItem) items)))
 
 (define-func gtk_list_remove_items
   none
   ((GtkList list)
-   ((GList GtkListItem) items)))
+   ((list GtkListItem) items)))
 
 ;; in gtk-compat.c
 (define-func gtk_list_append_item
diff --git a/gtktree.defs b/gtktree.defs
index 03facbb..6465fb7 100644
--- a/gtktree.defs
+++ b/gtktree.defs
@@ -6,7 +6,7 @@
 
 (define-flags GtkTreeModelFlags
   (iters-persist GTK_TREE_MODEL_ITERS_PERSIST)
-  (GList-only GTK_TREE_MODEL_LIST_ONLY))
+  (list-only GTK_TREE_MODEL_LIST_ONLY))
 
 (define-boxed GtkTreeIter
   (copy gtk_tree_iter_copy)
@@ -307,7 +307,7 @@
 ;   (GtkTreeIter iter)))
 
 ;(define-func gtk_tree_selection_get_selected_rows
-; (GList string)
+; (list string)
 ;  ((GtkTreeSelection selection)
 ;   (GtkTreeModel model)))