callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deps include libgtk-x11.la, not libgtk.la (LDADDS): include libgtk-x11.la

Browse Source 
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.
This commit is contained in:
Christopher Blizzard
2000-06-09 02:05:17 +00:00
committed by Christopher Blizzard
parent ba0567786b
commit 40298ef908
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/Makefile.am
View File

@ -512,10 +512,10 @@ uninstall-local:
# test programs, not to be installed # test programs, not to be installed
# #
noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple testtextbuffer # testthreads 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@ \ LDADDS = @STRIP_BEGIN@ \
libgtk.la \ libgtk-x11.la \
$(top_builddir)/gdk/libgdk.la \ $(top_builddir)/gdk/libgdk-x11.la \
@x_ldflags@ \ @x_ldflags@ \
@x_libs@ \ @x_libs@ \
@GDK_WLIBS@ \ @GDK_WLIBS@ \

4
gtk/gtklabel.c
View File

@ -233,8 +233,8 @@ gtk_label_set_text (GtkLabel *label,
gchar * gchar *
gtk_label_get_text (GtkLabel *label) gtk_label_get_text (GtkLabel *label)
{ {
g_return_if_fail (label != NULL); g_return_val_if_fail (label != NULL, NULL);
g_return_if_fail (GTK_IS_LABEL (label)); g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
return g_strdup (label->label); return g_strdup (label->label);
} }