Commit 24b5d35c authored by Arturo Espinosa's avatar Arturo Espinosa
Browse files

More fun print dialog hacking



More fun print dialog hacking

Enjoyin the secrets of guis.

miguel.
parent be7cc286
1999-06-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* glade/glade-gtk.c (optionmenu_new): Only add items if there are
any actual items.
(combo_new): ditto.
1999-06-03 James Henstridge <james@daa.com.au>
* Makefile.am (m4data_DATA): install the libglade.m4 macro.
* libglade.m4: added an autoconf macro to detect libglade.
1999-05-27 James Henstridge <james@daa.com.au>
* libglade-config.in (libs): add gnome libraries to the link line.
......
......@@ -8,13 +8,15 @@ endif
INCLUDES = $(THE_FLAGS) $(XML_CFLAGS)
EXTRA_DIST = libglade.spec test.glade simple.glade example.glade
EXTRA_DIST = libglade.spec test.glade simple.glade example.glade libglade.m4
if LIBGLADE_FULLDIST
bin_SCRIPTS = libglade-config
noinst_PROGRAMS = test-libglade
test_libglade_LDADD = glade/libglade.la $(THE_LIBS) $(XML_LIBS)
extra_dirs = macros doc
m4datadir = $(datadir)/aclocal
m4data_DATA = libglade.m4
else
extra_dirs =
endif
......
......@@ -827,7 +827,7 @@ optionmenu_new(GladeXML *xml, GNode *node)
for (; info; info = info->next) {
char *content = xmlNodeGetContent(info);
if (!strcmp(info->name, "items")) {
if (!strcmp(info->name, "items") && content) {
char *pos = content;
char *items_end = &content[strlen(content)];
while (pos < items_end) {
......@@ -854,7 +854,8 @@ optionmenu_new(GladeXML *xml, GNode *node)
}
static GtkWidget *
combo_new(GladeXML *xml, GNode *node) {
combo_new (GladeXML *xml, GNode *node)
{
GtkWidget *combo = gtk_combo_new();
xmlNodePtr info = ((xmlNodePtr)node->data)->childs;
......@@ -867,7 +868,7 @@ combo_new(GladeXML *xml, GNode *node) {
gtk_combo_set_case_sensitive(GTK_COMBO(combo), content[0]=='T');
break;
case 'i':
if (!strcmp(info->name, "items")) {
if (!strcmp(info->name, "items") && content) {
char *pos = content;
char *items_end = &content[strlen(content)];
GList *item_list = NULL;
......
# a macro to get the libs/cflags for libglade
# serial 1
dnl AM_PATH_LIBGLADE([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test to see if libglade is installed, and define LIBGLADE_CFLAGS, LIBS
dnl
AC_DEFUN(AM_PATH_LIBGLADE,
[dnl
dnl Get the cflags and libraries from the libglade-config script
dnl
AC_ARG_WITH(libglade-config,
[ --with-libglade-config=LIBGLADE_CONFIG Location of libglade-config],
LIBGLADE_CONFIG="$withval")
AC_PATH_PROG(LIBGLADE_CONFIG, libglade-config, no)
AC_MSG_CHECKING(for libglade)
if test "$LIBGLADE_CONFIG" = "no"; then
AC_MSG_RESULT(no)
ifelse([$2], , :, [$2])
else
LIBGLADE_CFLAGS=`$LIBGLADE_CONFIG --cflags`
LIBGLADE_LIBS=`$LIBGLADE_CONFIG --libs`
AC_MSG_RESULT(yes)
ifelse([$1], , :, [$1])
fi
AC_SUBST(LIBGLADE_CFLAGS)
AC_SUBST(LIBGLADE_LIBS)
])
\ No newline at end of file
Supports Markdown
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