Commit 40298ef9 authored by Christopher Blizzard's avatar Christopher Blizzard Committed by Christopher Blizzard

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.
parent ba056778
......@@ -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@ \
......
......@@ -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);
}
......
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