diff options
| author | Christopher Blizzard <blizzard@redhat.com> | 2000-06-09 02:05:17 +0000 |
|---|---|---|
| committer | Christopher Blizzard <blizzard@src.gnome.org> | 2000-06-09 02:05:17 +0000 |
| commit | 40298ef908827fdde7f30a7ee18dd1d6d65c3ae4 (patch) | |
| tree | 75c9b56b467e7a500eed91d7f2d1fb21b30d7ce3 /gtk/gtklabel.c | |
| parent | ba0567786bdd5736f8755b8877a3748fe75d0cc5 (diff) | |
| download | gtk+-40298ef908827fdde7f30a7ee18dd1d6d65c3ae4.tar.gz | |
deps include libgtk-x11.la, not libgtk.la (LDADDS): include libgtk-x11.la
Thu Jun 8 21:54:51 2000 Christopher Blizzard <blizzard@redhat.com>
* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
libgtk.la
(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
versions
* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
checking macros return NULL since the function has a return value.
Diffstat (limited to 'gtk/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 6e788dcf6e..92357439db 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -233,8 +233,8 @@ gtk_label_set_text (GtkLabel *label, gchar * gtk_label_get_text (GtkLabel *label) { - g_return_if_fail (label != NULL); - g_return_if_fail (GTK_IS_LABEL (label)); + g_return_val_if_fail (label != NULL, NULL); + g_return_val_if_fail (GTK_IS_LABEL (label), NULL); return g_strdup (label->label); } |