Revision: 2166 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2166&view=re... Author: frlan Date: 2011-08-24 06:43:53 +0000 (Wed, 24 Aug 2011) Log Message: ----------- GeanyVC: Fix another compiler warning.

Patch by Matthew Brush. Thanks.

Modified Paths: -------------- trunk/geany-plugins/geanyvc/src/externdiff.c

Modified: trunk/geany-plugins/geanyvc/src/externdiff.c =================================================================== --- trunk/geany-plugins/geanyvc/src/externdiff.c 2011-08-24 06:09:52 UTC (rev 2165) +++ trunk/geany-plugins/geanyvc/src/externdiff.c 2011-08-24 06:43:53 UTC (rev 2166) @@ -38,6 +38,7 @@ EXTERNAL_DIFF_COUNT };

+ static const gchar *viewers[EXTERNAL_DIFF_COUNT] = { "meld", "kompare", "kdiff3", "diffuse", "tkdiff" };

static gchar *extern_diff_viewer = NULL; @@ -53,13 +54,14 @@ { if (g_find_program_in_path(viewers[i])) { - extern_diff_viewer = viewers[i]; - return extern_diff_viewer; + extern_diff_viewer = (gchar *) viewers[i]; + return viewers[i]; } } return NULL; }

+ void vc_external_diff(const gchar * src, const gchar * dest) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.