From 40298ef908827fdde7f30a7ee18dd1d6d65c3ae4 Mon Sep 17 00:00:00 2001 From: Christopher Blizzard Date: Fri, 9 Jun 2000 02:05:17 +0000 Subject: [PATCH] deps include libgtk-x11.la, not libgtk.la (LDADDS): include libgtk-x11.la Thu Jun 8 21:54:51 2000 Christopher Blizzard * 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. --- gtk/Makefile.am | 6 +++--- gtk/gtklabel.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index cb59e29e4f..d5fb16300a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -512,10 +512,10 @@ uninstall-local: # test programs, not to be installed # noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple testtextbuffer # testthreads -DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la +DEPS = libgtk-x11.la $(top_builddir)/gdk/libgdk-x11.la LDADDS = @STRIP_BEGIN@ \ - libgtk.la \ - $(top_builddir)/gdk/libgdk.la \ + libgtk-x11.la \ + $(top_builddir)/gdk/libgdk-x11.la \ @x_ldflags@ \ @x_libs@ \ @GDK_WLIBS@ \ 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); }