From 659c435686edc37f4620710a8221971d4b308523 Mon Sep 17 00:00:00 2001
From: Anton Gorenko <ex.rzrjck@gmail.com>
Date: Sat, 17 Jul 2010 17:17:03 +0600
Subject: [PATCH] rename gir to gobject-introspection

---
 basis/atk/ffi/ffi.factor                              |  2 +-
 basis/gdk/ffi/ffi.factor                              |  4 ++--
 basis/gdk/gl/ffi/ffi.factor                           |  4 ++--
 basis/gdk/pixbuf/ffi/ffi.factor                       |  2 +-
 basis/gio/ffi/ffi.factor                              |  2 +-
 basis/glib/ffi/ffi.factor                             |  4 ++--
 basis/gmodule/ffi/ffi.factor                          |  2 +-
 basis/{gir => gobject-introspection}/authors.txt      |  0
 .../common/common.factor                              |  2 +-
 basis/{gir => gobject-introspection}/ffi/ffi.factor   | 11 ++++++-----
 .../gobject-introspection.factor}                     |  5 +++--
 .../loader/loader.factor                              | 10 +++++-----
 .../repository/repository.factor                      |  2 +-
 basis/{gir => gobject-introspection}/summary.txt      |  0
 .../{gir => gobject-introspection}/types/types.factor |  8 +++++---
 basis/gobject/ffi/ffi.factor                          |  2 +-
 basis/gst/ffi/ffi.factor                              |  4 ++--
 basis/gtk/ffi/ffi.factor                              |  4 ++--
 basis/gtk/gl/ffi/ffi.factor                           |  4 ++--
 basis/pango/cairo/ffi/ffi.factor                      |  2 +-
 basis/pango/ffi/ffi.factor                            |  4 ++--
 21 files changed, 41 insertions(+), 37 deletions(-)
 rename basis/{gir => gobject-introspection}/authors.txt (100%)
 rename basis/{gir => gobject-introspection}/common/common.factor (90%)
 rename basis/{gir => gobject-introspection}/ffi/ffi.factor (95%)
 rename basis/{gir/gir.factor => gobject-introspection/gobject-introspection.factor} (83%)
 rename basis/{gir => gobject-introspection}/loader/loader.factor (96%)
 rename basis/{gir => gobject-introspection}/repository/repository.factor (97%)
 rename basis/{gir => gobject-introspection}/summary.txt (100%)
 rename basis/{gir => gobject-introspection}/types/types.factor (94%)

diff --git a/basis/atk/ffi/ffi.factor b/basis/atk/ffi/ffi.factor
index fa3dd6910f..67c8362c73 100644
--- a/basis/atk/ffi/ffi.factor
+++ b/basis/atk/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators kernel
 system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 IN: atk.ffi
 
 <<
diff --git a/basis/gdk/ffi/ffi.factor b/basis/gdk/ffi/ffi.factor
index d67f61f585..11dbbc6fdb 100644
--- a/basis/gdk/ffi/ffi.factor
+++ b/basis/gdk/ffi/ffi.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.syntax
 alien.libraries cairo.ffi combinators kernel system
-gir gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi gobject.ffi
-pango.ffi ;
+gobject-introspection gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
+gobject.ffi pango.ffi ;
 IN: gdk.ffi
 
 <<
diff --git a/basis/gdk/gl/ffi/ffi.factor b/basis/gdk/gl/ffi/ffi.factor
index 5c57fe0013..74fa46a3b7 100644
--- a/basis/gdk/gl/ffi/ffi.factor
+++ b/basis/gdk/gl/ffi/ffi.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries combinators kernel
 system vocabs.parser words
-gir gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
-gobject.ffi pango.ffi ;
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi
+gmodule.ffi gobject.ffi pango.ffi ;
 IN: gdk.gl.ffi
 
 <<
diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/basis/gdk/pixbuf/ffi/ffi.factor
index 12e56753e1..a87ca77c3b 100644
--- a/basis/gdk/pixbuf/ffi/ffi.factor
+++ b/basis/gdk/pixbuf/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gdk.pixbuf.ffi
 
diff --git a/basis/gio/ffi/ffi.factor b/basis/gio/ffi/ffi.factor
index 16056f1fb5..e4d9b73fd0 100644
--- a/basis/gio/ffi/ffi.factor
+++ b/basis/gio/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gio.ffi
 
diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index 99183a88dc..d7b265004e 100644
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors
-alien.libraries alien.syntax combinators compiler.units gir
-kernel system vocabs.parser words ;
+alien.libraries alien.syntax combinators compiler.units
+gobject-introspection kernel system vocabs.parser words ;
 IN: glib.ffi
 
 <<
diff --git a/basis/gmodule/ffi/ffi.factor b/basis/gmodule/ffi/ffi.factor
index 449ef69249..5e3334de68 100644
--- a/basis/gmodule/ffi/ffi.factor
+++ b/basis/gmodule/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: gmodule.ffi
 
 <<
diff --git a/basis/gir/authors.txt b/basis/gobject-introspection/authors.txt
similarity index 100%
rename from basis/gir/authors.txt
rename to basis/gobject-introspection/authors.txt
diff --git a/basis/gir/common/common.factor b/basis/gobject-introspection/common/common.factor
similarity index 90%
rename from basis/gir/common/common.factor
rename to basis/gobject-introspection/common/common.factor
index d4984607b4..8bf2c7eb78 100644
--- a/basis/gir/common/common.factor
+++ b/basis/gobject-introspection/common/common.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel namespaces ;
-IN: gir.common
+IN: gobject-introspection.common
 
 CONSTANT: ffi-vocab "ffi"
 
diff --git a/basis/gir/ffi/ffi.factor b/basis/gobject-introspection/ffi/ffi.factor
similarity index 95%
rename from basis/gir/ffi/ffi.factor
rename to basis/gobject-introspection/ffi/ffi.factor
index 4ee7f35fd2..9af0186553 100644
--- a/basis/gir/ffi/ffi.factor
+++ b/basis/gobject-introspection/ffi/ffi.factor
@@ -1,11 +1,12 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.parser arrays
-classes.parser classes.struct combinators combinators.short-circuit
-definitions effects fry gir.common gir.types kernel math.parser
-namespaces parser quotations sequences sequences.generalizations words
-words.constant ;
-IN: gir.ffi
+classes.parser classes.struct combinators
+combinators.short-circuit definitions effects fry
+gobject-introspection.common gobject-introspection.types kernel
+math.parser namespaces parser quotations sequences
+sequences.generalizations words words.constant ;
+IN: gobject-introspection.ffi
 
 : string>c-type ( str -- c-type )
     parse-c-type ;
diff --git a/basis/gir/gir.factor b/basis/gobject-introspection/gobject-introspection.factor
similarity index 83%
rename from basis/gir/gir.factor
rename to basis/gobject-introspection/gobject-introspection.factor
index 3c39d8d838..f0a5a982b2 100755
--- a/basis/gir/gir.factor
+++ b/basis/gobject-introspection/gobject-introspection.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators gir.common gir.ffi gir.loader
+USING: accessors assocs combinators gobject-introspection.common
+gobject-introspection.ffi gobject-introspection.loader
 kernel lexer locals math namespaces sequences vocabs.parser xml ;
-IN: gir
+IN: gobject-introspection
 
 : with-child-vocab ( name quot -- )
     swap current-vocab name>>
diff --git a/basis/gir/loader/loader.factor b/basis/gobject-introspection/loader/loader.factor
similarity index 96%
rename from basis/gir/loader/loader.factor
rename to basis/gobject-introspection/loader/loader.factor
index 0e9ed6257f..7f0b161322 100644
--- a/basis/gir/loader/loader.factor
+++ b/basis/gobject-introspection/loader/loader.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors ascii combinators fry gir.common gir.repository
-gir.types kernel math.parser sequences splitting xml.data
-xml.traversal ;
+USING: accessors ascii combinators fry
+gobject-introspection.common gobject-introspection.repository
+gobject-introspection.types kernel math.parser sequences
+splitting xml.data xml.traversal ;
 FROM: namespaces => set get ;
-IN: gir.loader
+IN: gobject-introspection.loader
 
 SYMBOL: namespace-prefix
 SYMBOL: namespace-PREFIX
@@ -221,7 +222,6 @@ SYMBOL: namespace-PREFIX
     [ field new ] dip {
         [ "name" attr >>name ]
         [ "writable" attr "1" = >>writable? ]
-        ! Для некоторых field  есть callback в качестве типа, решить, как лучше сделать
         [
             first-child-tag dup name>> main>> "callback" =
             [ drop "gpointer" ] [ "type" attr ] if
diff --git a/basis/gir/repository/repository.factor b/basis/gobject-introspection/repository/repository.factor
similarity index 97%
rename from basis/gir/repository/repository.factor
rename to basis/gobject-introspection/repository/repository.factor
index 1ff5b2c5b4..e6b2de7193 100644
--- a/basis/gir/repository/repository.factor
+++ b/basis/gobject-introspection/repository/repository.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ;
-IN: gir.repository
+IN: gobject-introspection.repository
 
 TUPLE: node name ;
 
diff --git a/basis/gir/summary.txt b/basis/gobject-introspection/summary.txt
similarity index 100%
rename from basis/gir/summary.txt
rename to basis/gobject-introspection/summary.txt
diff --git a/basis/gir/types/types.factor b/basis/gobject-introspection/types/types.factor
similarity index 94%
rename from basis/gir/types/types.factor
rename to basis/gobject-introspection/types/types.factor
index 219eb3afff..f6d2257c79 100644
--- a/basis/gir/types/types.factor
+++ b/basis/gobject-introspection/types/types.factor
@@ -1,8 +1,10 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types assocs combinators.short-circuit
-gir.common gir.repository kernel namespaces specialized-arrays ;
-IN: gir.types
+USING: accessors alien alien.c-types assocs
+combinators.short-circuit gobject-introspection.common
+gobject-introspection.repository kernel namespaces
+specialized-arrays ;
+IN: gobject-introspection.types
 
 TUPLE: gwrapper { underlying alien } ;
 TUPLE: grecord < gwrapper ;
diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index c82ec75412..2904ceb833 100644
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 combinators kernel literals math system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gobject.ffi
 
diff --git a/basis/gst/ffi/ffi.factor b/basis/gst/ffi/ffi.factor
index fa110b3a5d..0bb365a755 100644
--- a/basis/gst/ffi/ffi.factor
+++ b/basis/gst/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.libraries combinators kernel
 system
-gir glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gst.ffi
 
@@ -18,7 +18,7 @@ TYPEDEF: gpointer GstClockID
 TYPEDEF: guint64 GstClockTime
 TYPEDEF: gint64 GstClockTimeDiff
 
-! Временное исправление отсутвующих типов libxml2
+! types from libxml2
 TYPEDEF: void* xmlNodePtr
 TYPEDEF: void* xmlDocPtr
 TYPEDEF: void* xmlNsPtr
diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor
index 98ea4a408b..e649025670 100644
--- a/basis/gtk/ffi/ffi.factor
+++ b/basis/gtk/ffi/ffi.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 cairo.ffi combinators kernel system
-gir atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
-gobject.ffi pango.ffi ;
+gobject-introspection atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi
+glib.ffi gmodule.ffi gobject.ffi pango.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.ffi
 
diff --git a/basis/gtk/gl/ffi/ffi.factor b/basis/gtk/gl/ffi/ffi.factor
index 9997ce81ad..775537063b 100644
--- a/basis/gtk/gl/ffi/ffi.factor
+++ b/basis/gtk/gl/ffi/ffi.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi glib.ffi
-gmodule.ffi gobject.ffi gtk.ffi ;
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi
+glib.ffi gmodule.ffi gobject.ffi gtk.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.gl.ffi
 
diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor
index 2361fe5de4..c37a08b6d6 100644
--- a/basis/pango/cairo/ffi/ffi.factor
+++ b/basis/pango/cairo/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax cairo.ffi
 combinators kernel system
-gir pango.ffi ;
+gobject-introspection pango.ffi ;
 IN: pango.cairo.ffi
 
 << 
diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index d174ac4488..e6c794e8bf 100644
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: pango.ffi
 
 << 
@@ -13,7 +13,7 @@ IN: pango.ffi
 } cond 
 >>
 
-TYPEDEF: void PangoLayoutRun ! не совсем верно
+TYPEDEF: void PangoLayoutRun
 TYPEDEF: guint32 PangoGlyph
 
 IMPLEMENT-STRUCTS: PangoRectangle ;