GNOME.org
 

gir-repository r26 - in trunk: . gir

Author: johan
Date: Sat Aug 16 13:32:02 2008
New Revision: 26
URL: http://svn.gnome.org/viewvc/gir-repository?rev=26&view=rev

Log:
2008-08-16  Johan Dahlin  <johan gnome org>

    * gir/Makefile.am:
    * gir/pangocairo.gir:
    * gir/pangox.gir:
    * gir/pangoxft.gir:
    Include pango.gir, regenerate dependencies.



Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am
   trunk/gir/pangocairo.gir
   trunk/gir/pangox.gir
   trunk/gir/pangoxft.gir

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sat Aug 16 13:32:02 2008
@@ -19,7 +19,6 @@
 	$(G_IR_SCANNER) -v --namespace Pango \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
-            --include=$(srcdir)/cairo.gir \
             --include=$(srcdir)/pangoft2.gir \
             --library=$(PANGO_LIBDIR)/libpango-1.0.so.0 \
             --output $@ \
@@ -33,10 +32,11 @@
 
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
 pangocairo.gir: cairo.gir
-	$(G_IR_SCANNER) -v --namespace PangoX \
+	$(G_IR_SCANNER) -v --namespace PangoCairo \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
             --include=$(srcdir)/cairo.gir \
+            --include=$(srcdir)/pango.gir \
             --library=$(PANGOCAIRO_LIBDIR)/libpangocairo-1.0.so.0 \
             --output $@ \
             --pkg gobject-2.0 \
@@ -58,14 +58,15 @@
             --pkg pangoft2 \
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangoft2.h \
-            $(PANGO_INCLUDEDIR)/pango/pangofc-*.h \
+            $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
 GIRSOURCES += pangoft2.gir
 
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-pangoxft.gir: cairo.gir
-	$(G_IR_SCANNER) -v --namespace PangoXFT \
+pangoxft.gir: pango.gir
+	$(G_IR_SCANNER) -v --namespace PangoXft \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(srcdir)/pango.gir \
             --library=$(PANGOXFT_LIBDIR)/libpangoxft-1.0.so.0 \
             --output $@ \
             --pkg gobject-2.0 \
@@ -77,10 +78,11 @@
 GIRSOURCES += pangoxft.gir
 
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-pangox.gir: cairo.gir
+pangox.gir: pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoX \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(srcdir)/pango.gir \
             --library=$(PANGOX_LIBDIR)/libpangox-1.0.so.0 \
             --output $@ \
             --pkg gobject-2.0 \

Modified: trunk/gir/pangocairo.gir
==============================================================================
--- trunk/gir/pangocairo.gir	(original)
+++ trunk/gir/pangocairo.gir	Sat Aug 16 13:32:02 2008
@@ -2,7 +2,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="PangoX">
+  <namespace name="PangoCairo">
     <record name="PangoCairoFont" c:type="PangoCairoFont"/>
     <record name="PangoCairoFontMap" c:type="PangoCairoFontMap"/>
     <callback name="PangoCairoShapeRendererFunc">
@@ -14,7 +14,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="attr">
-          <type name="PangoAttrShape" c:type="PangoAttrShape*"/>
+          <type name="Pango.PangoAttrShape" c:type="PangoAttrShape*"/>
         </parameter>
         <parameter name="do_path">
           <type name="boolean" c:type="gboolean"/>
@@ -24,16 +24,21 @@
         </parameter>
       </parameters>
     </callback>
+    <interface name="FontMap"
+               c:type="PangoCairoFontMap"
+               glib:type-name="PangoCairoFontMap"
+               glib:get-type="pango_cairo_font_map_get_type">
+    </interface>
     <function name="pango_cairo_font_map_new"
               c:identifier="pango_cairo_font_map_new">
       <return-value>
-        <type name="PangoFontMap" c:type="PangoFontMap*"/>
+        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
       </return-value>
     </function>
     <function name="pango_cairo_font_map_new_for_font_type"
               c:identifier="pango_cairo_font_map_new_for_font_type">
       <return-value>
-        <type name="PangoFontMap" c:type="PangoFontMap*"/>
+        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
       </return-value>
       <parameters>
         <parameter name="fonttype">
@@ -44,7 +49,7 @@
     <function name="pango_cairo_font_map_get_default"
               c:identifier="pango_cairo_font_map_get_default">
       <return-value>
-        <type name="PangoFontMap" c:type="PangoFontMap*"/>
+        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
       </return-value>
     </function>
     <function name="pango_cairo_font_map_get_font_type"
@@ -54,7 +59,7 @@
       </return-value>
       <parameters>
         <parameter name="fontmap">
-          <type name="PangoCairoFontMap" c:type="PangoCairoFontMap*"/>
+          <type name="FontMap" c:type="PangoCairoFontMap*"/>
         </parameter>
       </parameters>
     </function>
@@ -65,7 +70,7 @@
       </return-value>
       <parameters>
         <parameter name="fontmap">
-          <type name="PangoCairoFontMap" c:type="PangoCairoFontMap*"/>
+          <type name="FontMap" c:type="PangoCairoFontMap*"/>
         </parameter>
         <parameter name="dpi">
           <type name="double" c:type="double"/>
@@ -79,21 +84,26 @@
       </return-value>
       <parameters>
         <parameter name="fontmap">
-          <type name="PangoCairoFontMap" c:type="PangoCairoFontMap*"/>
+          <type name="FontMap" c:type="PangoCairoFontMap*"/>
         </parameter>
       </parameters>
     </function>
     <function name="pango_cairo_font_map_create_context"
               c:identifier="pango_cairo_font_map_create_context">
       <return-value>
-        <type name="PangoContext" c:type="PangoContext*"/>
+        <type name="Pango.Context" c:type="PangoContext*"/>
       </return-value>
       <parameters>
         <parameter name="fontmap">
-          <type name="PangoCairoFontMap" c:type="PangoCairoFontMap*"/>
+          <type name="FontMap" c:type="PangoCairoFontMap*"/>
         </parameter>
       </parameters>
     </function>
+    <interface name="Font"
+               c:type="PangoCairoFont"
+               glib:type-name="PangoCairoFont"
+               glib:get-type="pango_cairo_font_get_type">
+    </interface>
     <function name="pango_cairo_font_get_scaled_font"
               c:identifier="pango_cairo_font_get_scaled_font">
       <return-value>
@@ -101,7 +111,7 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoCairoFont" c:type="PangoCairoFont*"/>
+          <type name="Font" c:type="PangoCairoFont*"/>
         </parameter>
       </parameters>
     </function>
@@ -115,7 +125,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -126,7 +136,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="options">
           <type name="Cairo.cairo_font_options_t"
@@ -142,7 +152,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -153,7 +163,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="dpi">
           <type name="double" c:type="double"/>
@@ -167,7 +177,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
       </parameters>
     </function>
@@ -178,7 +188,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="func">
           <type name="PangoCairoShapeRendererFunc"
@@ -200,7 +210,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="data">
           <type name="gpointer" c:type="gpointer*"/>
@@ -210,7 +220,7 @@
     <function name="pango_cairo_create_layout"
               c:identifier="pango_cairo_create_layout">
       <return-value>
-        <type name="PangoLayout" c:type="PangoLayout*"/>
+        <type name="Pango.Layout" c:type="PangoLayout*"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -228,7 +238,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="layout">
-          <type name="PangoLayout" c:type="PangoLayout*"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
       </parameters>
     </function>
@@ -242,7 +252,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -273,7 +283,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="layout">
-          <type name="PangoLayout" c:type="PangoLayout*"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
       </parameters>
     </function>
@@ -310,7 +320,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -341,7 +351,7 @@
           <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="layout">
-          <type name="PangoLayout" c:type="PangoLayout*"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/pangox.gir
==============================================================================
--- trunk/gir/pangox.gir	(original)
+++ trunk/gir/pangox.gir	Sat Aug 16 13:32:02 2008
@@ -10,7 +10,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="color">
           <type name="PangoColor" c:type="PangoColor*"/>
@@ -26,7 +26,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="gc">
           <type name="GC" c:type="GC"/>
@@ -35,7 +35,7 @@
     </callback>
     <function name="pango_x_get_context" c:identifier="pango_x_get_context">
       <return-value>
-        <type name="PangoContext" c:type="PangoContext*"/>
+        <type name="Pango.Context" c:type="PangoContext*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -50,7 +50,7 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="PangoContext" c:type="PangoContext*"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="get_gc_func">
           <type name="PangoGetGCFunc" c:type="PangoGetGCFunc"/>
@@ -62,7 +62,7 @@
     </function>
     <function name="pango_x_load_font" c:identifier="pango_x_load_font">
       <return-value>
-        <type name="PangoFont" c:type="PangoFont*"/>
+        <type name="Pango.Font" c:type="PangoFont*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -88,7 +88,7 @@
           <type name="GC" c:type="GC"/>
         </parameter>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -143,7 +143,7 @@
           <type name="GC" c:type="GC"/>
         </parameter>
         <parameter name="layout">
-          <type name="PangoLayout" c:type="PangoLayout*"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
           <type name="int32" c:type="int"/>
@@ -160,7 +160,7 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="charsets">
           <type name="char" c:type="char**"/>
@@ -182,21 +182,21 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyph">
-          <type name="PangoGlyph" c:type="PangoGlyph"/>
+          <type name="Pango.PangoGlyph" c:type="PangoGlyph"/>
         </parameter>
       </parameters>
     </function>
     <function name="pango_x_get_unknown_glyph"
               c:identifier="pango_x_get_unknown_glyph">
       <return-value>
-        <type name="PangoGlyph" c:type="PangoGlyph"/>
+        <type name="Pango.PangoGlyph" c:type="PangoGlyph"/>
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
       </parameters>
     </function>
@@ -254,7 +254,7 @@
     <function name="pango_x_font_map_for_display"
               c:identifier="pango_x_font_map_for_display">
       <return-value>
-        <type name="PangoFontMap" c:type="PangoFontMap*"/>
+        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -280,7 +280,7 @@
       </return-value>
       <parameters>
         <parameter name="font_map">
-          <type name="PangoFontMap" c:type="PangoFontMap*"/>
+          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
         </parameter>
       </parameters>
     </function>
@@ -291,7 +291,7 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="subfont_id">
           <type name="PangoXSubfont" c:type="PangoXSubfont"/>
@@ -305,7 +305,7 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="charsets">
           <type name="char" c:type="char**"/>
@@ -325,7 +325,7 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -345,7 +345,7 @@
       </return-value>
       <parameters>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="subfont">
           <type name="PangoXSubfont" c:type="PangoXSubfont"/>

Modified: trunk/gir/pangoxft.gir
==============================================================================
--- trunk/gir/pangoxft.gir	(original)
+++ trunk/gir/pangoxft.gir	Sat Aug 16 13:32:02 2008
@@ -2,11 +2,11 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="PangoXFT">
+  <namespace name="PangoXft">
     <record name="PangoXftRendererPrivate" c:type="PangoXftRendererPrivate"/>
     <class name="Renderer"
            c:type="PangoXftRenderer"
-           parent="PangoRenderer"
+           parent="Pango.Renderer"
            glib:type-name="PangoXftRenderer"
            glib:get-type="pango_xft_renderer_get_type">
       <method name="set_draw" c:identifier="pango_xft_renderer_set_draw">
@@ -84,7 +84,7 @@
     <function name="pango_xft_renderer_new"
               c:identifier="pango_xft_renderer_new">
       <return-value>
-        <type name="PangoRenderer" c:type="PangoRenderer*"/>
+        <type name="Pango.Renderer" c:type="PangoRenderer*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -107,7 +107,7 @@
           <type name="XftColor" c:type="XftColor*"/>
         </parameter>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -136,7 +136,7 @@
           <type name="Picture" c:type="Picture"/>
         </parameter>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -165,7 +165,7 @@
           <type name="PangoMatrix" c:type="PangoMatrix*"/>
         </parameter>
         <parameter name="font">
-          <type name="PangoFont" c:type="PangoFont*"/>
+          <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -214,7 +214,7 @@
           <type name="XftColor" c:type="XftColor*"/>
         </parameter>
         <parameter name="layout">
-          <type name="PangoLayout" c:type="PangoLayout*"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
           <type name="int32" c:type="int"/>
@@ -240,7 +240,7 @@
     <function name="pango_xft_get_font_map"
               c:identifier="pango_xft_get_font_map">
       <return-value>
-        <type name="PangoFontMap" c:type="PangoFontMap*"/>
+        <type name="Pango.FontMap" c:type="PangoFontMap*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -254,7 +254,7 @@
     <function name="pango_xft_get_context"
               c:identifier="pango_xft_get_context">
       <return-value>
-        <type name="PangoContext" c:type="PangoContext*"/>
+        <type name="Pango.Context" c:type="PangoContext*"/>
       </return-value>
       <parameters>
         <parameter name="display">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]