diff options
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 87 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/workaround-icon-crash.patch | 74 | ||||
| -rw-r--r-- | libindicator/indicator-image-helper.c | 4 |
6 files changed, 95 insertions, 101 deletions
diff --git a/config.h.in b/config.h.in index 427ac92..f2c221a 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* build with extra debug information */ +#undef ENABLE_DEBUG + /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for libindicator 0.3.11. +# Generated by GNU Autoconf 2.67 for libindicator 0.3.12. # # Report bugs to <ted@canonical.com>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libindicator' PACKAGE_TARNAME='libindicator' -PACKAGE_VERSION='0.3.11' -PACKAGE_STRING='libindicator 0.3.11' +PACKAGE_VERSION='0.3.12' +PACKAGE_STRING='libindicator 0.3.12' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -746,6 +746,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +ENABLE_DEBUG_FALSE +ENABLE_DEBUG_TRUE LIBDIR SYSCONFDIR PREFIX @@ -879,6 +881,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +enable_debug ' ac_precious_vars='build_alias host_alias @@ -1436,7 +1439,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libindicator 0.3.11 to adapt to many kinds of systems. +\`configure' configures libindicator 0.3.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1506,7 +1509,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libindicator 0.3.11:";; + short | recursive ) echo "Configuration of libindicator 0.3.12:";; esac cat <<\_ACEOF @@ -1525,6 +1528,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-debug build with debug symbols Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1618,7 +1622,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libindicator configure 0.3.11 +libindicator configure 0.3.12 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1896,7 +1900,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libindicator $as_me 0.3.11, which was +It was created by libindicator $as_me 0.3.12, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2716,7 +2720,7 @@ fi # Define the identity of the package. PACKAGE=libindicator - VERSION=0.3.11 + VERSION=0.3.12 cat >>confdefs.h <<_ACEOF @@ -5552,13 +5556,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5555: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5559: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5558: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5562: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5561: output\"" >&5) + (eval echo "\"\$as_me:5565: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6763,7 +6767,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6766 "configure"' > conftest.$ac_ext + echo '#line 6770 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8038,11 +8042,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8041: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8045: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8045: \$? = $ac_status" >&5 + echo "$as_me:8049: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8377,11 +8381,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8380: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8384: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8384: \$? = $ac_status" >&5 + echo "$as_me:8388: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8482,11 +8486,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8485: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8489: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8489: \$? = $ac_status" >&5 + echo "$as_me:8493: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8537,11 +8541,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8540: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8544: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8544: \$? = $ac_status" >&5 + echo "$as_me:8548: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10921,7 +10925,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10924 "configure" +#line 10928 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11017,7 +11021,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11020 "configure" +#line 11024 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11651,6 +11655,33 @@ _ACEOF +######################### +# Debug symbols +######################### +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +else + enable_debug=no +fi + + +if test "x$enable_debug" = "xyes"; then + CFLAGS="-g $CFLAGS" + +$as_echo "#define ENABLE_DEBUG 1" >>confdefs.h + +fi + + if test "$enable_debug" = "yes"; then + ENABLE_DEBUG_TRUE= + ENABLE_DEBUG_FALSE='#' +else + ENABLE_DEBUG_TRUE='#' + ENABLE_DEBUG_FALSE= +fi + + ########################### # Files ########################### @@ -11779,6 +11810,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -12187,7 +12222,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libindicator $as_me 0.3.11, which was +This file was extended by libindicator $as_me 0.3.12, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12253,7 +12288,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libindicator config.status 0.3.11 +libindicator config.status 0.3.12 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" @@ -14015,10 +14050,14 @@ fi Libindicator Configuration: Prefix: $prefix + + Enable debugging: $enable_debug " >&5 $as_echo "$as_me: Libindicator Configuration: Prefix: $prefix + + Enable debugging: $enable_debug " >&6;} diff --git a/configure.ac b/configure.ac index 23350c6..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]) @@ -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 ]) diff --git a/debian/changelog b/debian/changelog index f495c3c..c1c3d29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libindicator (0.3.12-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Removing a g_error that was breaking Unity on failed icons + * dropping workaround-icon-crash.patch: + + -- Ted Gould <ted@ubuntu.com> Wed, 18 Aug 2010 11:05:51 -0500 + libindicator (0.3.11-0ubuntu2) maverick; urgency=low * workaround-icon-crash.patch: diff --git a/debian/patches/workaround-icon-crash.patch b/debian/patches/workaround-icon-crash.patch deleted file mode 100644 index 5b6f1d6..0000000 --- a/debian/patches/workaround-icon-crash.patch +++ /dev/null @@ -1,74 +0,0 @@ -=== modified file 'libindicator/indicator-image-helper.c' ---- libindicator/indicator-image-helper.c 2010-08-12 19:37:24 +0000 -+++ libindicator/indicator-image-helper.c 2010-08-13 09:03:45 +0000 -@@ -29,61 +29,15 @@ - static void - refresh_image (GtkImage * image) - { -+ GIcon * icon; -+ - g_return_if_fail(GTK_IS_IMAGE(image)); -- const gchar * icon_filename = NULL; -- GtkIconInfo * icon_info = NULL; -- gint icon_size = 22; -- -- GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); -- g_return_if_fail(icon_names != NULL); -- -- /* Get the default theme */ -- GtkIconTheme * default_theme = gtk_icon_theme_get_default(); -- g_return_if_fail(default_theme != NULL); -- -- /* Look through the themes for that icon */ -- icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); -- if (icon_info == NULL) { -- /* Try using the second item in the names, which should be the original filename supplied */ -- const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); -- if (names) { -- icon_filename = names[1]; -- } else { -- g_warning("Unable to find icon\n"); -- return; -- } -- } else { -- /* Grab the filename */ -- icon_filename = gtk_icon_info_get_filename(icon_info); -- } -- g_return_if_fail(icon_filename != NULL); /* An error because we don't have a filename */ -- -- /* Build a pixbuf */ -- GError * error = NULL; -- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); -- -- if (icon_info != NULL) { -- gtk_icon_info_free(icon_info); -- } -- -- if (pixbuf == NULL) { -- g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); -- return; -- } -- -- /* Scale icon if all we get is something too big. */ -- if (gdk_pixbuf_get_height(pixbuf) > icon_size) { -- gfloat scale = (gfloat)icon_size / (gfloat)gdk_pixbuf_get_height(pixbuf); -- gint width = round(gdk_pixbuf_get_width(pixbuf) * scale); -- -- GdkPixbuf * scaled = gdk_pixbuf_scale_simple(pixbuf, width, icon_size, GDK_INTERP_BILINEAR); -- g_object_unref(G_OBJECT(pixbuf)); -- pixbuf = scaled; -- } -- -- /* Put the pixbuf on the image */ -- gtk_image_set_from_pixbuf(image, pixbuf); -- g_object_unref(G_OBJECT(pixbuf)); -+ -+ icon = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); -+ g_return_if_fail(G_IS_ICON (icon)); -+ -+ gtk_image_set_pixel_size (image, 22); -+ gtk_image_set_from_gicon (image, icon, GTK_ICON_SIZE_SMALL_TOOLBAR); - - return; - } - 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; } |