Kaydet (Commit) 81dfe5ae authored tarafından Enrico Tröger's avatar Enrico Tröger

Don't include utils.h to avoid the need to include geany.h for GTK 2.6…

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


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2187 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst a377002f
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <gtk/gtklabel.h> #include <gtk/gtklabel.h>
#include "geanywraplabel.h" #include "geanywraplabel.h"
#include "utils.h"
/* Local data */ /* Local data */
...@@ -186,7 +185,7 @@ GtkWidget *geany_wrap_label_new(const gchar *text) ...@@ -186,7 +185,7 @@ GtkWidget *geany_wrap_label_new(const gchar *text)
{ {
GtkWidget *l = g_object_new(GEANY_WRAP_LABEL_TYPE, NULL); 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); gtk_label_set_text(GTK_LABEL(l), text);
pango_layout_set_wrap(gtk_label_get_layout(GTK_LABEL(l)), PANGO_WRAP_WORD_CHAR); pango_layout_set_wrap(gtk_label_get_layout(GTK_LABEL(l)), PANGO_WRAP_WORD_CHAR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment