split out __init__ into multiple functions for clarity, and so BinDeps doesn't override it

Author: vtjnash

deps/build.jl

@@ -20,22 +20,22 @@ end
 
 @windows_only begin
     using WinRPM
-    provides(WinRPM.RPM,"gtk3", [gtk,gdk,gdk_pixbuf,glib,gio], os = :Windows )
+    provides(WinRPM.RPM,"gtk3", [gtk,gdk,gdk_pixbuf,glib,gio], os = :Windows)
     provides(WinRPM.RPM,"libgobject-2_0-0", [gobject], os = :Windows)
 end
 
 @osx_only begin
     using Homebrew
-    provides(Homebrew.HB, "gtk+3", [gtk, gdk, gobject], os = :Darwin, onload = 
+    provides(Homebrew.HB, "gtk+3", [gtk, gdk, gobject], os = :Darwin, onload =
     """
-    function __init__()
+    function __init__bindeps__()
         if "XDG_DATA_DIRS" in ENV
             ENV["XDG_DATA_DIRS"] *= ":" * joinpath("$(Homebrew.brew_prefix)", "share")
         else
             ENV["XDG_DATA_DIRS"] = joinpath("$(Homebrew.brew_prefix)", "share")
         end
     end
-    """ )
+    """)
     provides(Homebrew.HB, "glib", [glib, gio], os = :Darwin)
     provides(Homebrew.HB, "gdk-pixbuf", gdk_pixbuf, os = :Darwin)
 end
@@ -47,4 +47,4 @@ end
     :gio => :libgio,
     :gobject => :libgobject,
     :glib => :libglib
-]
+]

deps/ext.jl

@@ -4,7 +4,7 @@ const _depspath = joinpath(dirname(@__FILE__), "deps.jl")
 
 if isfile(_depspath)
     include(_depspath)
-else 
+else
     if gtk_version == 3
         if OS_NAME == :Windows
             const libgtk = "libgtk-3-0"

src/GLib/signals.jl

@@ -281,7 +281,7 @@ function g_yield(data)
 end
 
 sizeof_gclosure = 0
-function __init__()
+function __init__gtype__()
     ccall((:g_type_init,libgobject),Void,())
     global jlref_quark = quark"julia_ref"
     global sizeof_gclosure = WORD_SIZE
@@ -291,12 +291,9 @@ function __init__()
         closure = ccall((:g_closure_new_simple,libgobject),Ptr{Void},(Int,Ptr{Void}),sizeof_gclosure,C_NULL)
     end
     ccall((:g_closure_sink,libgobject),Void,(Ptr{Void},),closure)
+end
 
-    global JuliaClosureMarshal = cfunction(GClosureMarshal, Void,
-        (Ptr{Void}, Ptr{GValue}, Cuint, Ptr{GValue}, Ptr{Void}, Ptr{Void}))
-    global exiting = false
-    atexit(()->global exiting = true)
-
+function __init__gmainloop__()
     global uv_sourcefuncs = _GSourceFuncs(
         cfunction(uv_prepare,Cint,(Ptr{Void},Ptr{Cint})),
         cfunction(uv_check,Cint,(Ptr{Void},)),
@@ -318,3 +315,14 @@ function __init__()
     ccall((:g_source_unref,GLib.libglib),Void,(Ptr{Void},),src)
 end
 
+function __init__()
+    if isdefined(GLib,:__init__bindeps__)
+        GLib.__init__bindeps__()
+    end
+    global JuliaClosureMarshal = cfunction(GClosureMarshal, Void,
+        (Ptr{Void}, Ptr{GValue}, Cuint, Ptr{GValue}, Ptr{Void}, Ptr{Void}))
+    global exiting = false
+    atexit(()->global exiting = true)
+    __init__gtype__()
+    __init__gmainloop__()
+end