From: Duncan C. <dun...@us...> - 2005-04-06 21:28:04
|
Update of /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27051/gconf/System/Gnome/GConf Modified Files: GConfClient.chs Added Files: marshal.list Log Message: Make the gconf package depend only on glib not on gtk. The only dependency previously was on the Signals module from the gtk package, so use a local Signals module instead with just the one marshaler that is needed: marshal.list: add local marshal list that contains the callback types that gconf needs. Makefile.am: generate a Signals module for the gconf package. Also make it inherit it's build settings from glib rather than gtk. GConfClient.chs: import local Signals module so that we can eliminate the dependency of the gconf package on the gtk package. gconf.cabal.in, gconf.pkg.in: change the dep from gtk to glib. configure.ac: change the gconf flags so that they inherit from glib rather than gtk. --- NEW FILE: marshal.list --- # see glib-genmarshal(1) for a detailed description of the file format, # possible parameter types are: # VOID indicates no return type, or no extra # parameters. if VOID is used as the parameter # list, no additional parameters may be present. # BOOLEAN for boolean types (gboolean) # CHAR for signed char types (gchar) # UCHAR for unsigned char types (guchar) # INT for signed integer types (gint) # UINT for unsigned integer types (guint) # LONG for signed long integer types (glong) # ULONG for unsigned long integer types (gulong) # ENUM for enumeration types (gint) # FLAGS for flag enumeration types (guint) # FLOAT for single-precision float types (gfloat) # DOUBLE for double-precision float types (gdouble) # STRING for string types (gchar*) # BOXED for boxed (anonymous but reference counted) types (GBoxed*) # POINTER for anonymous pointer types (gpointer) # OBJECT for GObject or derived types (GObject*) # If you add a new signal type, please check that it actually works! # If it is a Boxed type check that the reference counting is right. # This is for the GConfClient value_changed signal VOID:STRING,POINTER Index: GConfClient.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfClient.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- GConfClient.chs 14 Jan 2005 19:04:51 -0000 1.8 +++ GConfClient.chs 6 Apr 2005 21:27:40 -0000 1.9 @@ -94,7 +94,7 @@ import System.Glib.GList import System.Glib.GError (GErrorDomain, GErrorClass(..), propagateGError) import System.Glib.GObject (makeNewGObject) -{#import Graphics.UI.Gtk.Signals#} +{#import System.Gnome.GConf.Signals#} {#import System.Gnome.GConf.Types#} {#import System.Gnome.GConf.GConfValue#} |