libbonoboui r2579 - in trunk: . bonobo tests

[kmaraas svn gnome org]

Author: kmaraas
Date: Wed Jan 23 19:03:11 2008
New Revision: 2579
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2579&view=rev

Log:
2008-01-23  Kjartan Maraas  <kmaraas gnome org>

	* bonobo/Makefile.am: Link to popt
	* bonobo/bonobo-ui-init-gtk.c: #include <popt.h>
	* configure.in: Check for popt
	* tests/test-ui.c: (cb_do_hide_toolbar): Fix a leak.

Modified:
   trunk/ChangeLog
   trunk/bonobo/Makefile.am
   trunk/bonobo/bonobo-ui-init-gtk.c
   trunk/configure.in
   trunk/tests/test-ui.c

Modified: trunk/bonobo/Makefile.am
==============================================================================
--- trunk/bonobo/Makefile.am	(original)
+++ trunk/bonobo/Makefile.am	Wed Jan 23 19:03:11 2008
@@ -77,7 +77,7 @@
 	-no-undefined
 
 libbonoboui_2_la_LIBADD = \
-	$(BONOBOUI_LIBS) ${X_LIBS} $(INTLLIBS)
+	$(BONOBOUI_LIBS) ${X_LIBS} $(INTLLIBS) $(POPT_LIBS)
 
 libbonoboui_2_la_SOURCES = \
 	bonobo-a11y.c				\

Modified: trunk/bonobo/bonobo-ui-init-gtk.c
==============================================================================
--- trunk/bonobo/bonobo-ui-init-gtk.c	(original)
+++ trunk/bonobo/bonobo-ui-init-gtk.c	Wed Jan 23 19:03:11 2008
@@ -1,4 +1,5 @@
 #include <config.h>
+#include <popt.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jan 23 19:03:11 2008
@@ -91,6 +91,11 @@
 
 AC_SUBST(X_LIBS)
 
+# popt
+AC_CHECK_LIB(popt, poptStrippedArgv, POPT_LIBS=-lpopt, AC_MSG_ERROR([You must have popt version 1.5 or greater installed.]))
+AC_SUBST(POPT_LIBS)
+AC_CHECK_HEADER(popt.h,,AC_MSG_ERROR([Failed to find popt.h - you may have to adjust your environment]))
+
 dnl
 dnl Start of pkg-config checks
 dnl

Modified: trunk/tests/test-ui.c
==============================================================================
--- trunk/tests/test-ui.c	(original)
+++ trunk/tests/test-ui.c	Wed Jan 23 19:03:11 2008
@@ -124,6 +124,7 @@
 		bonobo_ui_component_set_prop (global_component, path, "hidden", "0", NULL);
 	else
 		bonobo_ui_component_set_prop (global_component, path, "hidden", "1", NULL);
+	g_free (val);
 }
 
 static void