gnome-pilot r1500 - in trunk: . capplet conduits/backup conduits/file conduits/test gpilotd libgpilotdCM

[mcdavey svn gnome org]

Author: mcdavey
Date: 2007-04-22 20:25:47 +0100 (Sun, 22 Apr 2007)
New Revision: 1500
ViewCVS link: http://svn.gnome.org/viewcvs/gnome-pilot?rev=1500&view=rev

Modified:
   trunk/ChangeLog
   trunk/capplet/pilot.c
   trunk/conduits/backup/Makefile.am
   trunk/conduits/file/Makefile.am
   trunk/conduits/test/Makefile.am
   trunk/gpilotd/Makefile.am
   trunk/gpilotd/gnome-pilot-structures.c
   trunk/gpilotd/gnome-pilot-structures.h
   trunk/gpilotd/gpilotd.c
   trunk/libgpilotdCM/Makefile.am
   trunk/libgpilotdCM/gnome-pilot-conduit-config.gob
Log:
2007-04-22  Matt Davey  <mcdavey mrao cam ac uk>

        * libgpilotdCM/gnome-pilot-conduit-config.gob: #431145.  Hack to
            fix nasty circular dependency.  libgpilotdcm gets built first,
            and is required for building gpilotd and
            gpilotd-control-applet.  However, libgpilotdcm called two
            functions that only got built later on.  Real solution would
            probably have been to have merged libgpilotdcm and libgpilotd.
            libgpilotdcm depends on the structures defined in gpilotd
            stuff anyway, so it doesn't make much sense to split it out.
            Anyway, the hack this time was to effectively duplicate a
            small amount of code to avoid the dependency.         
        * libgpilotdCM/Makefile.am: ditto
        * gpilotd/gnome-pilot-structures.c: ditto
        * gpilotd/gnome-pilot-structures.h: ditto
        * gpilotd/Makefile.am: ditto
        * conduits/file/Makefile.am: link conduit with libgpilotdconduit
        * conduits/test/Makefile.am: ditto
        * conduits/backup/Makefile.am: ditto
        * capplet/pilot.c: include util.h for get_default_pilot_charset()
        * gpilotd/gpilotd.c: fix bogus #else syntax (could affect Solaris)