SF.net SVN: geany:[4991] trunk

[eht16 at users.sourceforge.net]

Revision: 4991
          http://geany.svn.sourceforge.net/geany/?rev=4991&view=rev
Author:   eht16
Date:     2010-06-03 15:37:27 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
Destroy the default symbol list treeview only once (fixes gtk_widget_destroy warning on exit).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/sidebar.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-03 14:24:04 UTC (rev 4990)
+++ trunk/ChangeLog	2010-06-03 15:37:27 UTC (rev 4991)
@@ -8,6 +8,9 @@
    (patch by Daniel Marjamaki, thanks).
  * doc/images/*.png:
    Update images for Geany0.19.
+ * src/sidebar.c:
+   Destroy the default symbol list treeview only once
+   (fixes gtk_widget_destroy warning on exit).
 
 
 2010-05-30  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/sidebar.c
===================================================================
--- trunk/src/sidebar.c	2010-06-03 14:24:04 UTC (rev 4990)
+++ trunk/src/sidebar.c	2010-06-03 15:37:27 UTC (rev 4991)
@@ -978,7 +978,10 @@
 	if (WIDGET(tv.default_tag_tree))
 	{
 		g_object_unref(tv.default_tag_tree);
-		gtk_widget_destroy(tv.default_tag_tree);
+		/* This is not exactly clean, default_tag_tree's ref_count is 2 when it is shown,
+		 * 1 oherwise. We should probably handle the ref_count more accurate. */
+		if (WIDGET(tv.default_tag_tree))
+			gtk_widget_destroy(tv.default_tag_tree);
 	}
 	if (WIDGET(tv.popup_taglist))
 		gtk_widget_destroy(tv.popup_taglist);


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