Ticket #1252: gtksourceview2-mark-activation-signal-fix.patch

Graphics/UI/Gtk/SourceView/Signals.chs

@@ -44 +44 @@
   connect_OBJECT__NONE,
   connect_BOXED_BOXED__NONE,
   connect_BOOL_INT__NONE,
-  connect_PTR_BOXED__NONE,
-  connect_OBJECT_PTR_BOXED__NONE,
+  connect_BOXED_PTR__NONE,
+  connect_OBJECT_BOXED_PTR__NONE,
   connect_OBJECT_BOXED_OBJECT__BOOL,
   connect_ENUM_INT__NONE,
   
@@ -120 +120 @@
           failOnGError $
           user bool1 int2
 
-connect_PTR_BOXED__NONE :: 
+connect_BOXED_PTR__NONE :: 
   GObjectClass obj => SignalName ->
-  (Ptr b' -> IO b) -> 
+  (Ptr a' -> IO a) -> 
   ConnectAfter -> obj ->
-  (Ptr a -> b -> IO ()) ->
+  (a -> Ptr b -> IO ()) ->
   IO (ConnectId obj)
-connect_PTR_BOXED__NONE signal boxedPre2 after obj user =
+connect_BOXED_PTR__NONE signal boxedPre1 after obj user =
   connectGeneric signal after obj action
   where action :: Ptr GObject -> Ptr () -> Ptr () -> IO ()
-        action _ ptr1 box2 =
+        action _ box1 ptr2 =
           failOnGError $
-          boxedPre2 (castPtr box2) >>= \box2' ->
-          user (castPtr ptr1) box2'
+          boxedPre1 (castPtr box1) >>= \box1' ->
+          user box1' (castPtr ptr2)
 
-connect_OBJECT_PTR_BOXED__NONE :: 
+connect_OBJECT_BOXED_PTR__NONE :: 
   (GObjectClass a', GObjectClass obj) => SignalName ->
-  (Ptr c' -> IO c) -> 
+  (Ptr b' -> IO b) -> 
   ConnectAfter -> obj ->
-  (a' -> Ptr b -> c -> IO ()) ->
+  (a' -> b -> Ptr c -> IO ()) ->
   IO (ConnectId obj)
-connect_OBJECT_PTR_BOXED__NONE signal boxedPre3 after obj user =
+connect_OBJECT_BOXED_PTR__NONE signal boxedPre2 after obj user =
   connectGeneric signal after obj action
   where action :: Ptr GObject -> Ptr GObject -> Ptr () -> Ptr () -> IO ()
-        action _ obj1 ptr2 box3 =
+        action _ obj1 box2 ptr3 =
           failOnGError $
-          boxedPre3 (castPtr box3) >>= \box3' ->
+          boxedPre2 (castPtr box2) >>= \box2' ->
           makeNewGObject (GObject, objectUnref) (return obj1) >>= \obj1' ->
-          user (unsafeCastGObject obj1') (castPtr ptr2) box3'
+          user (unsafeCastGObject obj1') box2' (castPtr ptr3)
 
 connect_OBJECT_BOXED_OBJECT__BOOL :: 
   (GObjectClass a', GObjectClass c', GObjectClass obj) => SignalName ->

Graphics/UI/Gtk/SourceView/SourceGutter.chs

@@ -191 +191 @@
 sourceGutterCellActivated :: SourceGutterClass sg => Signal sg (CellRenderer -> TextIter -> EventM EAny ())                         
 sourceGutterCellActivated =
   Signal (\after obj fun -> 
-           connect_OBJECT_PTR_BOXED__NONE "cell-activated" mkTextIterCopy after obj
-                                   (\cr eventPtr iter -> runReaderT (fun cr iter) eventPtr)
+           connect_OBJECT_BOXED_PTR__NONE "cell-activated" mkTextIterCopy after obj
+                                   (\cr iter eventPtr -> runReaderT (fun cr iter) eventPtr)
          )
 
 -- | Emitted when a tooltip is requested for a specific cell. Signal handlers can return 'True' to notify

Graphics/UI/Gtk/SourceView/SourceView.chs

@@ -546 +546 @@
 sourceViewLineMarkActivated :: SourceViewClass sv => Signal sv (TextIter -> EventM EAny ())
 sourceViewLineMarkActivated = 
   Signal (\after obj fun -> 
-           connect_PTR_BOXED__NONE "line-mark-activated" mkTextIterCopy after obj
-                                   (\eventPtr iter -> runReaderT (fun iter) eventPtr)
+           connect_BOXED_PTR__NONE "line-mark-activated" mkTextIterCopy after obj
+                                   (\iter eventPtr -> runReaderT (fun iter) eventPtr)
          )
 
 -- * Deprecated

gtksourceview2-0.12.

@@ -46 +46 @@
 NONE:OBJECT
 NONE:BOXED,BOXED
 NONE:BOOL,INT
-NONE:POINTER,BOXED
-NONE:OBJECT,POINTER,BOXED
+NONE:BOXED,POINTER
+NONE:OBJECT,BOXED,POINTER
 BOOL:OBJECT,BOXED,OBJECT
 NONE:ENUM,INT