SF.net SVN: geany: [2187] trunk/src/geanywraplabel.c

[eht16 at users.sourceforge.net]

Revision: 2187
          http://geany.svn.sourceforge.net/geany/?rev=2187&view=rev
Author:   eht16
Date:     2008-01-23 06:32:52 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
Don't include utils.h to avoid the need to include geany.h for GTK 2.6 compatibility defintion of G_GNUC_NULL_TERMINATED.

Modified Paths:
--------------
    trunk/src/geanywraplabel.c

Modified: trunk/src/geanywraplabel.c
===================================================================
--- trunk/src/geanywraplabel.c	2008-01-23 14:12:08 UTC (rev 2186)
+++ trunk/src/geanywraplabel.c	2008-01-23 14:32:52 UTC (rev 2187)
@@ -29,7 +29,6 @@
 
 #include <gtk/gtklabel.h>
 #include "geanywraplabel.h"
-#include "utils.h"
 
 
 /* Local data */
@@ -186,7 +185,7 @@
 {
 	GtkWidget *l = g_object_new(GEANY_WRAP_LABEL_TYPE, NULL);
 
-	if (NZV(text))
+	if (text != NULL && text[0] != '\0')
 		gtk_label_set_text(GTK_LABEL(l), text);
 
 	pango_layout_set_wrap(gtk_label_get_layout(GTK_LABEL(l)), PANGO_WRAP_WORD_CHAR);


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