SF.net SVN: geany:[4634] branches/geany-0.18.1

[ntrel at users.sourceforge.net]

Revision: 4634
          http://geany.svn.sourceforge.net/geany/?rev=4634&view=rev
Author:   ntrel
Date:     2010-02-01 18:00:39 +0000 (Mon, 01 Feb 2010)

Log Message:
-----------
Backport:
Fix GLib warning when toggling 'no plugins available' item.

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/src/plugins.c

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-02-01 17:56:17 UTC (rev 4633)
+++ branches/geany-0.18.1/ChangeLog	2010-02-01 18:00:39 UTC (rev 4634)
@@ -1,3 +1,9 @@
+2010-02-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugins.c:
+   Fix GLib warning when toggling 'no plugins available' item.
+
+
 2010-01-31  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * icons/Makefile.am:

Modified: branches/geany-0.18.1/src/plugins.c
===================================================================
--- branches/geany-0.18.1/src/plugins.c	2010-02-01 17:56:17 UTC (rev 4633)
+++ branches/geany-0.18.1/src/plugins.c	2010-02-01 18:00:39 UTC (rev 4634)
@@ -1042,7 +1042,11 @@
 
 	gtk_tree_model_get(GTK_TREE_MODEL(pm_widgets.store), &iter,
 		PLUGIN_COLUMN_CHECK, &old_state, PLUGIN_COLUMN_PLUGIN, &p, -1);
-	g_return_if_fail(p != NULL);
+
+	/* no plugins item */
+	if (p == NULL)
+		return;
+
 	state = ! old_state; /* toggle the state */
 
 	/* save the filename of the plugin */


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