Update FSF address

[lttv.git] / lttv / modules / gui / controlflow / drawitem.c

diff --git a/lttv/modules/gui/controlflow/drawitem.c b/lttv/modules/gui/controlflow/drawitem.c
index d97628b021f3b9abed37236c0693a612328662b5..c0902927e2532b55c1872e4847b0d7a66f928c37 100644 (file)
--- a/lttv/modules/gui/controlflow/drawitem.c
+++ b/lttv/modules/gui/controlflow/drawitem.c
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA 02110-1301, USA.
  */
 
 
@@ -106,7 +106,6 @@
 #include <lttv/iattribute.h>
 #include <string.h>
 
-#include <lttv/tracecontext.h>
 #include <lttv/state.h>
 #include <lttv/lttv.h>
 
@@ -214,6 +213,7 @@ gboolean draw_icon( void *hook_data, void *call_data)
 {
   PropertiesIcon *properties = (PropertiesIcon*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
+  gboolean retval;
 
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
   LttvAttributeValue value;
@@ -222,8 +222,9 @@ gboolean draw_icon( void *hook_data, void *call_data)
 
   strcat(icon_name, properties->icon_name);
   
-  g_assert(lttv_iattribute_find_by_path(attributes, icon_name,
-      LTTV_POINTER, &value));
+  retval= lttv_iattribute_find_by_path(attributes, icon_name, LTTV_POINTER,
+    &value);
+  g_assert(retval);
   if(unlikely(*(value.v_pointer) == NULL))
   {
     *(value.v_pointer) = icon_info = g_new(IconStruct,1);