From 89924de7c425e5cc6e6c201b2bb4e05c979aec7a Mon Sep 17 00:00:00 2001 From: Mikkel Kamstrup Erlandsen Date: Fri, 13 Aug 2010 10:17:33 +0200 Subject: Add an --enable-debug flag to configure script that forces a -g to gcc --- configure.ac | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index 23350c6..9065602 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,20 @@ AC_DEFINE_PATH(PREFIX, "${prefix}", [prefix directory]) AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir]) AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) +######################### +# Debug symbols +######################### +AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], [build with debug symbols]),, + [enable_debug=no]) + +if test "x$enable_debug" = "xyes"; then + CFLAGS="-g $CFLAGS" + AC_DEFINE(ENABLE_DEBUG, 1, [build with extra debug information]) +fi + +AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") + ########################### # Files ########################### @@ -105,4 +119,6 @@ AC_MSG_NOTICE([ Libindicator Configuration: Prefix: $prefix + + Enable debugging: $enable_debug ]) -- cgit v1.2.3 From 6878f1743e25a849d0a883259f06345814280637 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Aug 2010 09:14:49 -0500 Subject: Changing the message to a warning and clearing the GtkImage. --- libindicator/indicator-image-helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 6b11f6f..b404b8f 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -50,6 +50,7 @@ refresh_image (GtkImage * image) icon_filename = names[1]; } else { g_warning("Unable to find icon\n"); + gtk_image_clear(image); return; } } else { @@ -67,7 +68,8 @@ refresh_image (GtkImage * image) } if (pixbuf == NULL) { - g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); + g_warning("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); + gtk_image_clear(image); return; } -- cgit v1.2.3 From 7df0fe9109e7ffab293cf5d720cc708d5e6ff89f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 18 Aug 2010 10:59:48 -0500 Subject: 0.3.12 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9065602..ba47820 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(libindicator, 0.3.11, ted@canonical.com) +AC_INIT(libindicator, 0.3.12, ted@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libindicator, 0.3.11) +AM_INIT_AUTOMAKE(libindicator, 0.3.12) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) -- cgit v1.2.3 From 8839b12e3deb35d69a61edc87d0d8649b6459132 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 18 Aug 2010 11:05:54 -0500 Subject: releasing version 0.3.12-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70fdc65..ace2ebf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.12-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.12-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Removing a g_error that was breaking Unity on failed icons * dropping workaround-icon-crash.patch: - -- Ted Gould Wed, 18 Aug 2010 11:02:03 -0500 + -- Ted Gould Wed, 18 Aug 2010 11:05:51 -0500 libindicator (0.3.11-0ubuntu2) maverick; urgency=low -- cgit v1.2.3