SF.net SVN: geany: [2415] trunk

[eht16 at users.sourceforge.net]

Revision: 2415
          http://geany.svn.sourceforge.net/geany/?rev=2415&view=rev
Author:   eht16
Date:     2008-03-26 10:52:27 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Fix two memory leaks and prevent showing two dialog boxes with the same error message.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/vcdiff.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-26 17:25:32 UTC (rev 2414)
+++ trunk/ChangeLog	2008-03-26 17:52:27 UTC (rev 2415)
@@ -4,6 +4,9 @@
    Update Scintilla to version 1.76.
  * scintilla/include/Scintilla.iface:
    Add this file for plugin authors.
+ * plugins/vcdiff.c:
+   Fix two memory leaks and prevent showing two dialog boxes with the
+   same error message.
 
 
 2008-03-26  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/plugins/vcdiff.c
===================================================================
--- trunk/plugins/vcdiff.c	2008-03-26 17:25:32 UTC (rev 2414)
+++ trunk/plugins/vcdiff.c	2008-03-26 17:52:27 UTC (rev 2415)
@@ -357,10 +357,10 @@
 		{
 			p_ui->set_statusbar(FALSE, _("No changes were made."));
 		}
-
-		if (NZV(std_error))
+		/* win32_spawn() returns sometimes TRUE but error is set anyway, has to be fixed */
+		if (error != NULL)
 		{
-			p_dialogs->show_msgbox(1, _("VCdiff command sent errors:\n%s\n."), std_error);
+			g_error_free(error);
 		}
 	}
 	else
@@ -378,6 +378,7 @@
 				argv[0]);
 		}
 		p_ui->set_statusbar(FALSE, _("An error occurred (%s)."), msg);
+		g_free(msg);
 	}
 
 	g_free(dir);


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