From: <sa...@us...> - 2006-08-19 17:11:47
|
Revision: 16888 Author: sadrul Date: 2006-08-19 10:11:39 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16888&view=rev Log Message: ----------- GKeyFile is in glib-2.6 and above. Modified Paths: -------------- trunk/console/libgnt/gntcolors.c trunk/console/libgnt/gntcolors.h trunk/console/libgnt/gntstyle.c Modified: trunk/console/libgnt/gntcolors.c =================================================================== --- trunk/console/libgnt/gntcolors.c 2006-08-19 16:48:46 UTC (rev 16887) +++ trunk/console/libgnt/gntcolors.c 2006-08-19 17:11:39 UTC (rev 16888) @@ -106,6 +106,7 @@ return color; } +#if GLIB_CHECK_VERSION(2,6,0) void gnt_colors_parse(GKeyFile *kfile) { GError *error = NULL; @@ -202,3 +203,4 @@ g_strfreev(keys); } +#endif /* GKeyFile */ Modified: trunk/console/libgnt/gntcolors.h =================================================================== --- trunk/console/libgnt/gntcolors.h 2006-08-19 16:48:46 UTC (rev 16887) +++ trunk/console/libgnt/gntcolors.h 2006-08-19 17:11:39 UTC (rev 16888) @@ -36,8 +36,10 @@ void gnt_uninit_colors(); +#if GLIB_CHECK_VERSION(2,6,0) void gnt_colors_parse(GKeyFile *kfile); void gnt_color_pairs_parse(GKeyFile *kfile); +#endif #endif Modified: trunk/console/libgnt/gntstyle.c =================================================================== --- trunk/console/libgnt/gntstyle.c 2006-08-19 16:48:46 UTC (rev 16887) +++ trunk/console/libgnt/gntstyle.c 2006-08-19 17:11:39 UTC (rev 16888) @@ -41,6 +41,7 @@ return bool_styles[style]; } +#if GLIB_CHECK_VERSION(2,6,0) static void read_general_style(GKeyFile *kfile) { @@ -70,6 +71,7 @@ } } } +#endif void gnt_style_read_configure_file(const char *filename) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |