Author: mhutch
Date: 2007-09-11 04:46:06 -0400 (Tue, 11 Sep 2007)
New Revision: 85627

Modified:
   trunk/gtksourceview2-sharp/ChangeLog
   trunk/gtksourceview2-sharp/configure.in
   trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata
   trunk/gtksourceview2-sharp/gtksourceview/Makefile.am
   trunk/gtksourceview2-sharp/gtksourceview/SourceBuffer.custom
   trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw
   trunk/gtksourceview2-sharp/sample/
   trunk/gtksourceview2-sharp/sample/Makefile.am
   trunk/gtksourceview2-sharp/sources/
   trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml
   trunk/gtksourceview2-sharp/sources/makefile
Log:
2007-09-11  Michael Hutchinson <[EMAIL PROTECTED]>

        * sources/makefile,
          sources/gtksourceview2-sharp-sources.xml,
          gtksourceview/gtksourceview2-api.raw,
          configure.in: Updated GtkSourceView version to 1.90.5.
          
        * gtksourceview/SourceBuffer.custom,
          gtksourceview/Gtk.metadata: Updated to 1.90.5 API changes.

        * sample/Makefile.am: Copy the lib into this directory for 
          convenience.



Modified: trunk/gtksourceview2-sharp/ChangeLog
===================================================================
--- trunk/gtksourceview2-sharp/ChangeLog        2007-09-11 08:43:18 UTC (rev 
85626)
+++ trunk/gtksourceview2-sharp/ChangeLog        2007-09-11 08:46:06 UTC (rev 
85627)
@@ -1,3 +1,16 @@
+2007-09-11  Michael Hutchinson <[EMAIL PROTECTED]>
+
+       * sources/makefile,
+         sources/gtksourceview2-sharp-sources.xml,
+         gtksourceview/gtksourceview2-api.raw,
+         configure.in: Updated GtkSourceView version to 1.90.5.
+         
+       * gtksourceview/SourceBuffer.custom,
+         gtksourceview/Gtk.metadata: Updated to 1.90.5 API changes.
+
+       * sample/Makefile.am: Copy the lib into this directory for 
+         convenience.
+
 2007-08-28  Michael Hutchinson <[EMAIL PROTECTED]>
 
        * sources/makefile,

Modified: trunk/gtksourceview2-sharp/configure.in
===================================================================
--- trunk/gtksourceview2-sharp/configure.in     2007-09-11 08:43:18 UTC (rev 
85626)
+++ trunk/gtksourceview2-sharp/configure.in     2007-09-11 08:46:06 UTC (rev 
85627)
@@ -1,6 +1,6 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gtksourceview2-sharp, 1.90.4)
+AM_INIT_AUTOMAKE(gtksourceview2-sharp, 1.90.5)
 AM_MAINTAINER_MODE
 
 dnl Defines CC to avoid warnings
@@ -63,13 +63,13 @@
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 
-PKG_CHECK_MODULES(GTK_SHARP, gnome-sharp-2.0 >= 1.9.3)
+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.4.0)
 AC_SUBST(GTK_SHARP_CFLAGS)
 AC_SUBST(GTK_SHARP_LIBS)
 gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0`
 AC_SUBST(gtksharp_prefix)
 
-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0 >= 1.90.4)
+PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0 >= 1.90.5)
 AC_SUBST(GTKSOURCEVIEW_LIBS)
 gtksourceview_prefix=`pkg-config --variable=prefix gtksourceview-2.0`
 AC_SUBST(gtksourceview_prefix)
@@ -110,7 +110,7 @@
 AC_SUBST(MDASSEMBLER)
 AC_SUBST(MONODOCER)
                                                                                
 
-API_VERSION="1.90.4"
+API_VERSION="1.90.5"
 AC_SUBST(API_VERSION)
 
 AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")

Modified: trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata       2007-09-11 
08:43:18 UTC (rev 85626)
+++ trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata       2007-09-11 
08:46:06 UTC (rev 85627)
@@ -4,12 +4,10 @@
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceBuffer']/[EMAIL 
PROTECTED]'gtk_source_buffer_new_with_language']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceBuffer']/[EMAIL 
PROTECTED]'CanRedo']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceBuffer']/[EMAIL 
PROTECTED]'CanUndo']" name="hidden">1</attr>
-  <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceMarker']" 
name="parent">GtkTextMark</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceUndoManager']/[EMAIL 
PROTECTED]'CanRedo']" name="name">CanRedoFired</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceUndoManager']/[EMAIL 
PROTECTED]'CanUndo']" name="name">CanUndoFired</attr>
   <attr path="//namespace" name="name">GtkSourceView</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceLanguage']/[EMAIL 
PROTECTED]'GetMimeTypes']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL 
PROTECTED]'GtkSourceLanguageManager']/[EMAIL PROTECTED]'GetLanguageIds']" 
name="hidden">1</attr>
-  <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceBuffer']/[EMAIL 
PROTECTED]'GetMarkersInRegion']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL 
PROTECTED]'GtkSourceStyleSchemeManager']/[EMAIL PROTECTED]'GetSchemeIds']" 
name="hidden">1</attr>
 </metadata>

Modified: trunk/gtksourceview2-sharp/gtksourceview/Makefile.am
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/Makefile.am        2007-09-11 
08:43:18 UTC (rev 85626)
+++ trunk/gtksourceview2-sharp/gtksourceview/Makefile.am        2007-09-11 
08:46:06 UTC (rev 85627)
@@ -2,7 +2,7 @@
 LIBRARY=       $(LIBRARY_NAME).dll
 APIS=          gtksourceview2-api.xml
 
-ASSEMBLIES=    /pkg:gnome-sharp-2.0 /r:Mono.Posix
+ASSEMBLIES=    /pkg:gnome-sharp-2.0
 
 EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview2-api.raw 
AssemblyInfo.cs.in
 

Modified: trunk/gtksourceview2-sharp/gtksourceview/SourceBuffer.custom
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/SourceBuffer.custom        
2007-09-11 08:43:18 UTC (rev 85626)
+++ trunk/gtksourceview2-sharp/gtksourceview/SourceBuffer.custom        
2007-09-11 08:46:06 UTC (rev 85627)
@@ -39,19 +39,7 @@
        return ret;
 }
 
-[DllImport("gtksourceview-2.0")]
-static extern IntPtr gtk_source_buffer_get_markers_in_region(IntPtr raw, ref 
Gtk.TextIter begin, ref Gtk.TextIter end);
-                                                                               
 
-public SourceMarker[] GetMarkersInRegion (Gtk.TextIter begin, Gtk.TextIter 
end) {
-       IntPtr raw_ret = gtk_source_buffer_get_markers_in_region (Handle, ref 
begin, ref end);
-       GLib.SList list = new GLib.SList (raw_ret);
-       SourceMarker[] result = new SourceMarker [list.Count];
-       for (int i = 0; i < list.Count; i++)
-               result [i] = list [i] as SourceMarker;
-       return result;
-}
 
-
 [DllImport("gtksourceview-2.0")]
 static extern IntPtr gtk_source_buffer_new_with_language(IntPtr language);
 

Modified: trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw     
2007-09-11 08:43:18 UTC (rev 85626)
+++ trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw     
2007-09-11 08:46:06 UTC (rev 85627)
@@ -48,13 +48,6 @@
           <parameter name="p1" type="" />
         </parameters>
       </signal>
-      <signal name="MarkerUpdated" cname="marker_updated" when="LAST">
-        <return-type type="void" />
-        <parameters>
-          <parameter name="inst" type="GtkSourceBuffer*" />
-          <parameter name="p0" type="ParamTypes" />
-        </parameters>
-      </signal>
       <method name="BeginNotUndoableAction" 
cname="gtk_source_buffer_begin_not_undoable_action">
         <return-type type="void" />
       </method>
@@ -64,20 +57,6 @@
       <method name="CanUndo" cname="gtk_source_buffer_can_undo">
         <return-type type="gboolean" />
       </method>
-      <method name="CreateMarker" cname="gtk_source_buffer_create_marker">
-        <return-type type="GtkSourceMarker*" />
-        <parameters>
-          <parameter type="const-gchar*" name="name" />
-          <parameter type="const-gchar*" name="type" />
-          <parameter type="const-GtkTextIter*" name="where" />
-        </parameters>
-      </method>
-      <method name="DeleteMarker" cname="gtk_source_buffer_delete_marker">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="GtkSourceMarker*" name="marker" />
-        </parameters>
-      </method>
       <method name="EndNotUndoableAction" 
cname="gtk_source_buffer_end_not_undoable_action">
         <return-type type="void" />
       </method>
@@ -88,69 +67,24 @@
           <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
-      <method name="GetFirstMarker" cname="gtk_source_buffer_get_first_marker">
-        <return-type type="GtkSourceMarker*" />
-      </method>
       <method name="GetHighlightMatchingBrackets" 
cname="gtk_source_buffer_get_highlight_matching_brackets">
         <return-type type="gboolean" />
       </method>
       <method name="GetHighlightSyntax" 
cname="gtk_source_buffer_get_highlight_syntax">
         <return-type type="gboolean" />
       </method>
-      <method name="GetIterAtMarker" 
cname="gtk_source_buffer_get_iter_at_marker">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" />
-          <parameter type="GtkSourceMarker*" name="marker" />
-        </parameters>
-      </method>
       <method name="GetLanguage" cname="gtk_source_buffer_get_language">
         <return-type type="GtkSourceLanguage*" />
       </method>
-      <method name="GetLastMarker" cname="gtk_source_buffer_get_last_marker">
-        <return-type type="GtkSourceMarker*" />
-      </method>
-      <method name="GetMarker" cname="gtk_source_buffer_get_marker">
-        <return-type type="GtkSourceMarker*" />
-        <parameters>
-          <parameter type="const-gchar*" name="name" />
-        </parameters>
-      </method>
-      <method name="GetMarkersInRegion" 
cname="gtk_source_buffer_get_markers_in_region">
-        <return-type type="GSList*" />
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="begin" />
-          <parameter type="const-GtkTextIter*" name="end" />
-        </parameters>
-      </method>
       <method name="GetMaxUndoLevels" 
cname="gtk_source_buffer_get_max_undo_levels">
         <return-type type="gint" />
       </method>
-      <method name="GetNextMarker" cname="gtk_source_buffer_get_next_marker">
-        <return-type type="GtkSourceMarker*" />
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" />
-        </parameters>
-      </method>
-      <method name="GetPrevMarker" cname="gtk_source_buffer_get_prev_marker">
-        <return-type type="GtkSourceMarker*" />
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" />
-        </parameters>
-      </method>
       <method name="GetStyleScheme" cname="gtk_source_buffer_get_style_scheme">
         <return-type type="GtkSourceStyleScheme*" />
       </method>
       <method name="GetType" cname="gtk_source_buffer_get_type" shared="true">
         <return-type type="GType" />
       </method>
-      <method name="MoveMarker" cname="gtk_source_buffer_move_marker">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="GtkSourceMarker*" name="marker" />
-          <parameter type="const-GtkTextIter*" name="where" />
-        </parameters>
-      </method>
       <constructor cname="gtk_source_buffer_new">
         <parameters>
           <parameter type="GtkTextTagTable*" name="table" />
@@ -315,35 +249,6 @@
         </parameters>
       </method>
     </object>
-    <object name="SourceMarker" cname="GtkSourceMarker">
-      <method name="GetBuffer" cname="gtk_source_marker_get_buffer">
-        <return-type type="gpointer" />
-      </method>
-      <method name="GetLine" cname="gtk_source_marker_get_line">
-        <return-type type="gint" />
-      </method>
-      <method name="GetMarkerType" cname="gtk_source_marker_get_marker_type">
-        <return-type type="gchar*" />
-      </method>
-      <method name="GetName" cname="gtk_source_marker_get_name">
-        <return-type type="const-gchar*" />
-      </method>
-      <method name="GetType" cname="gtk_source_marker_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
-      <method name="Next" cname="gtk_source_marker_next">
-        <return-type type="GtkSourceMarker*" />
-      </method>
-      <method name="Prev" cname="gtk_source_marker_prev">
-        <return-type type="GtkSourceMarker*" />
-      </method>
-      <method name="SetMarkerType" cname="gtk_source_marker_set_marker_type">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="const-gchar*" name="type" />
-        </parameters>
-      </method>
-    </object>
     <object name="SourceStyle" cname="GtkSourceStyle" parent="GObject">
       <property name="LineBackground" cname="line-background" type="gchar*" 
readable="true" writeable="true" construct-only="true" />
       <property name="Background" cname="background" type="gchar*" 
readable="true" writeable="true" construct-only="true" />
@@ -487,7 +392,6 @@
     <object name="SourceView" cname="GtkSourceView" parent="GtkTextView">
       <field name="Priv" cname="priv" type="GtkSourceViewPrivate*" />
       <property name="ShowLineNumbers" cname="show_line_numbers" 
type="gboolean" readable="true" writeable="true" />
-      <property name="ShowLineMarkers" cname="show_line_markers" 
type="gboolean" readable="true" writeable="true" />
       <property name="TabWidth" cname="tab-width" type="guint" readable="true" 
writeable="true" />
       <property name="IndentWidth" cname="indent-width" type="gint" 
readable="true" writeable="true" />
       <property name="AutoIndent" cname="auto_indent" type="gboolean" 
readable="true" writeable="true" />
@@ -524,18 +428,9 @@
       <method name="GetInsertSpacesInsteadOfTabs" 
cname="gtk_source_view_get_insert_spaces_instead_of_tabs">
         <return-type type="gboolean" />
       </method>
-      <method name="GetMarkerPixbuf" cname="gtk_source_view_get_marker_pixbuf">
-        <return-type type="GdkPixbuf*" />
-        <parameters>
-          <parameter type="const-gchar*" name="marker_type" />
-        </parameters>
-      </method>
       <method name="GetRightMarginPosition" 
cname="gtk_source_view_get_right_margin_position">
         <return-type type="guint" />
       </method>
-      <method name="GetShowLineMarkers" 
cname="gtk_source_view_get_show_line_markers">
-        <return-type type="gboolean" />
-      </method>
       <method name="GetShowLineNumbers" 
cname="gtk_source_view_get_show_line_numbers">
         <return-type type="gboolean" />
       </method>
@@ -587,25 +482,12 @@
           <parameter type="gboolean" name="enable" />
         </parameters>
       </method>
-      <method name="SetMarkerPixbuf" cname="gtk_source_view_set_marker_pixbuf">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="const-gchar*" name="marker_type" />
-          <parameter type="GdkPixbuf*" name="pixbuf" />
-        </parameters>
-      </method>
       <method name="SetRightMarginPosition" 
cname="gtk_source_view_set_right_margin_position">
         <return-type type="void" />
         <parameters>
           <parameter type="guint" name="pos" />
         </parameters>
       </method>
-      <method name="SetShowLineMarkers" 
cname="gtk_source_view_set_show_line_markers">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="gboolean" name="show" />
-        </parameters>
-      </method>
       <method name="SetShowLineNumbers" 
cname="gtk_source_view_set_show_line_numbers">
         <return-type type="void" />
         <parameters>


Property changes on: trunk/gtksourceview2-sharp/sample
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
*.exe
*.mdb

   + Makefile
Makefile.in
*.exe
*.mdb
gtksourceview2-sharp.dll*


Modified: trunk/gtksourceview2-sharp/sample/Makefile.am
===================================================================
--- trunk/gtksourceview2-sharp/sample/Makefile.am       2007-09-11 08:43:18 UTC 
(rev 85626)
+++ trunk/gtksourceview2-sharp/sample/Makefile.am       2007-09-11 08:46:06 UTC 
(rev 85627)
@@ -1,10 +1,15 @@
 TEST = SourceViewTest.exe
+GSVLIB=gtksourceview2-sharp.dll
+GSVLIBPATH=$(top_builddir)/gtksourceview/$(GSVLIB)
 
-EXTRA_DIST = SourceViewTest.cs
-CLEANFILES = $(TEST) $(TEST).mdb
-
 all: $(TEST)
 
-$(TEST): $(srcdir)/SourceViewTest.cs
-       $(CSC) -out:$@ $(srcdir)/SourceViewTest.cs 
-r:$(top_builddir)/gtksourceview/gtksourceview2-sharp.dll -pkg:gtk-sharp-2.0
+$(TEST): $(srcdir)/SourceViewTest.cs $(GSVLIB)
+       $(CSC) -debug -out:$@ $(srcdir)/SourceViewTest.cs -r:$(GSVLIB) 
-pkg:gtk-sharp-2.0
 
+$(GSVLIB): $(GSVLIBPATH)
+       cp $(GSVLIBPATH) .
+       cp $(GSVLIBPATH).config .
+
+CLEANFILES = $(TEST) $(TEST).mdb $(GSVLIB)*
+EXTRA_DIST = SourceViewTest.cs


Property changes on: trunk/gtksourceview2-sharp/sources
___________________________________________________________________
Name: svn:ignore
   - gtksourceview-1.90.4

   + gtksourceview-1.90.5


Modified: trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml
===================================================================
--- trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml 
2007-09-11 08:43:18 UTC (rev 85626)
+++ trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml 
2007-09-11 08:46:06 UTC (rev 85627)
@@ -2,7 +2,7 @@
   <api filename="../gtksourceview/gtksourceview2-api.raw">
     <library name="gtksourceview-2.0">
       <namespace name="Gtk">
-        <dir>gtksourceview-1.90.4/gtksourceview</dir>
+        <dir>gtksourceview-1.90.5/gtksourceview</dir>
       </namespace>
     </library>
   </api>

Modified: trunk/gtksourceview2-sharp/sources/makefile
===================================================================
--- trunk/gtksourceview2-sharp/sources/makefile 2007-09-11 08:43:18 UTC (rev 
85626)
+++ trunk/gtksourceview2-sharp/sources/makefile 2007-09-11 08:46:06 UTC (rev 
85627)
@@ -2,5 +2,5 @@
        gapi2-parser gtksourceview2-sharp-sources.xml
 
 get-source-code: 
-       wget 
http://ftp.gnome.org/pub/gnome/sources/gtksourceview/1.90/gtksourceview-1.90.4.tar.gz
 --output-document=- | tar -xz;
+       wget 
http://ftp.gnome.org/pub/gnome/sources/gtksourceview/1.90/gtksourceview-1.90.5.tar.gz
 --output-document=- | tar -xz;
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to