diff -Nru ido-0.1.5/build/autotools/gtk-doc.m4 ido-0.1.6/build/autotools/gtk-doc.m4 --- ido-0.1.5/build/autotools/gtk-doc.m4 2010-03-11 11:03:50.000000000 +0100 +++ ido-0.1.6/build/autotools/gtk-doc.m4 2010-06-08 17:53:09.000000000 +0200 @@ -8,6 +8,12 @@ [ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + dnl for overriding the documentation installation directory AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, @@ -26,14 +32,30 @@ [PKG_CHECK_EXISTS([gtk-doc],, AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) - AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ]) diff -Nru ido-0.1.5/build/autotools/Makefile.in ido-0.1.6/build/autotools/Makefile.in --- ido-0.1.5/build/autotools/Makefile.in 2010-03-24 11:29:59.000000000 +0100 +++ ido-0.1.6/build/autotools/Makefile.in 2010-06-08 17:53:12.000000000 +0200 @@ -85,6 +85,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HTML_DIR = @HTML_DIR@ diff -Nru ido-0.1.5/build/Makefile.in ido-0.1.6/build/Makefile.in --- ido-0.1.5/build/Makefile.in 2010-03-24 11:29:59.000000000 +0100 +++ ido-0.1.6/build/Makefile.in 2010-06-08 17:53:12.000000000 +0200 @@ -124,6 +124,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HTML_DIR = @HTML_DIR@ diff -Nru ido-0.1.5/configure ido-0.1.6/configure --- ido-0.1.5/configure 2010-03-24 11:30:00.000000000 +0100 +++ ido-0.1.6/configure 2010-06-08 17:53:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for ido 0.1.5. +# Generated by GNU Autoconf 2.65 for ido 0.1.6. # # Report bugs to . # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='ido' PACKAGE_TARNAME='ido' -PACKAGE_VERSION='0.1.5' -PACKAGE_STRING='ido 0.1.5' +PACKAGE_VERSION='0.1.6' +PACKAGE_STRING='ido 0.1.6' PACKAGE_BUGREPORT='https://bugs.launchpad.net/avani' PACKAGE_URL='' @@ -756,12 +756,20 @@ AM_MAKEFLAGS MAKEFLAGS shavedir +GTK_DOC_USE_REBASE_FALSE +GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE GTK_DOC_USE_LIBTOOL_TRUE +GTK_DOC_BUILD_PDF_FALSE +GTK_DOC_BUILD_PDF_TRUE +GTK_DOC_BUILD_HTML_FALSE +GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE -GTKDOC_CHECK HTML_DIR +GTKDOC_MKPDF +GTKDOC_REBASE +GTKDOC_CHECK MAINTAINER_CFLAGS GCC_FLAGS GTK_LIBS @@ -893,6 +901,8 @@ enable_maintainer_flags with_html_dir enable_gtk_doc +enable_gtk_doc_html +enable_gtk_doc_pdf enable_shave ' ac_precious_vars='build_alias @@ -1448,7 +1458,7 @@ # 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 ido 0.1.5 to adapt to many kinds of systems. +\`configure' configures ido 0.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1518,7 +1528,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ido 0.1.5:";; + short | recursive ) echo "Configuration of ido 0.1.6:";; esac cat <<\_ACEOF @@ -1536,6 +1546,8 @@ --enable-maintainer-flags=[no/yes] Use strict compiler flags [default=no] --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --enable-gtk-doc-html build documentation in html format [[default=yes]] + --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] --enable-shave use shave to make the build pretty [[default=yes]] Optional Packages: @@ -1625,7 +1637,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ido configure 0.1.5 +ido configure 0.1.6 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1996,7 +2008,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ido $as_me 0.1.5, which was +It was created by ido $as_me 0.1.6, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2813,7 +2825,7 @@ # Define the identity of the package. PACKAGE='ido' - VERSION='0.1.5' + VERSION='0.1.6' cat >>confdefs.h <<_ACEOF @@ -2856,8 +2868,8 @@ IDO_MAJOR_VERSION=0 IDO_MINOR_VERSION=1 -IDO_MICRO_VERSION=5 -IDO_VERSION=0.1.5 +IDO_MICRO_VERSION=6 +IDO_VERSION=0.1.6 @@ -2866,9 +2878,9 @@ -IDO_LT_CURRENT=105 +IDO_LT_CURRENT=106 IDO_LT_REV=0 -IDO_LT_AGE=105 +IDO_LT_AGE=106 IDO_LT_VERSION="$IDO_LT_CURRENT:$IDO_LT_REV:$IDO_LT_AGE" IDO_LT_LDFLAGS="-version-info $IDO_LT_VERSION" @@ -4568,13 +4580,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4571: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4583: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4574: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4586: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4577: output\"" >&5) + (eval echo "\"\$as_me:4589: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5780,7 +5792,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5783 "configure"' > conftest.$ac_ext + echo '#line 5795 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7280,11 +7292,11 @@ -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:7283: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7295: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7287: \$? = $ac_status" >&5 + echo "$as_me:7299: \$? = $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. @@ -7619,11 +7631,11 @@ -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:7622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7634: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7626: \$? = $ac_status" >&5 + echo "$as_me:7638: \$? = $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. @@ -7724,11 +7736,11 @@ -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:7727: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7739: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7731: \$? = $ac_status" >&5 + echo "$as_me:7743: \$? = $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 @@ -7779,11 +7791,11 @@ -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:7782: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7786: \$? = $ac_status" >&5 + echo "$as_me:7798: \$? = $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 @@ -10163,7 +10175,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10166 "configure" +#line 10178 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10259,7 +10271,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10262 "configure" +#line 10274 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11260,54 +11272,58 @@ -# Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then : - withval=$with_html_dir; + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : + $as_echo_n "(cached) " >&6 else - with_html_dir='${datadir}/gtk-doc/html' -fi - - HTML_DIR="$with_html_dir" - + case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then : - enableval=$enable_gtk_doc; -else - enable_gtk_doc=no + ;; +esac fi - - - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } else - as_fn_error "You need to have gtk-doc >= 1.8 installed to build gtk-doc" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - for ac_prog in gtkdoc-check + for ac_prog in gtkdoc-rebase do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : +if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_REBASE in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11317,7 +11333,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -11328,18 +11344,116 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +if test -n "$GTKDOC_REBASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +$as_echo "$GTKDOC_REBASE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$GTKDOC_CHECK" && break + test -n "$GTKDOC_REBASE" && break +done +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +set dummy gtkdoc-mkpdf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_MKPDF in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +if test -n "$GTKDOC_MKPDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +$as_echo "$GTKDOC_MKPDF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; +else + with_html_dir='${datadir}/gtk-doc/html' +fi + + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi + + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + as_fn_error "You need to have gtk-doc >= 1.8 installed to build $PACKAGE_NAME" "$LINENO" 5 +fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + # Check whether --enable-gtk-doc-html was given. +if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; +else + enable_gtk_doc_html=yes +fi + + # Check whether --enable-gtk-doc-pdf was given. +if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; +else + enable_gtk_doc_pdf=no +fi + + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi if test x$enable_gtk_doc = xyes; then @@ -11350,6 +11464,22 @@ ENABLE_GTK_DOC_FALSE= fi + if test x$enable_gtk_doc_html = xyes; then + GTK_DOC_BUILD_HTML_TRUE= + GTK_DOC_BUILD_HTML_FALSE='#' +else + GTK_DOC_BUILD_HTML_TRUE='#' + GTK_DOC_BUILD_HTML_FALSE= +fi + + if test x$enable_gtk_doc_pdf = xyes; then + GTK_DOC_BUILD_PDF_TRUE= + GTK_DOC_BUILD_PDF_FALSE='#' +else + GTK_DOC_BUILD_PDF_TRUE='#' + GTK_DOC_BUILD_PDF_FALSE= +fi + if test -n "$LIBTOOL"; then GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' @@ -11358,6 +11488,14 @@ GTK_DOC_USE_LIBTOOL_FALSE= fi + if test -n "$GTKDOC_REBASE"; then + GTK_DOC_USE_REBASE_TRUE= + GTK_DOC_USE_REBASE_FALSE='#' +else + GTK_DOC_USE_REBASE_TRUE='#' + GTK_DOC_USE_REBASE_FALSE= +fi + @@ -11570,10 +11708,22 @@ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then + as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then + as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then + as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -11982,7 +12132,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ido $as_me 0.1.5, which was +This file was extended by ido $as_me 0.1.6, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12048,7 +12198,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ido config.status 0.1.5 +ido config.status 0.1.6 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru ido-0.1.5/configure.ac ido-0.1.6/configure.ac --- ido-0.1.5/configure.ac 2010-03-24 11:26:24.000000000 +0100 +++ ido-0.1.6/configure.ac 2010-06-08 17:52:38.000000000 +0200 @@ -3,7 +3,7 @@ # m4_define([ido_major_version], [0]) m4_define([ido_minor_version], [1]) -m4_define([ido_micro_version], [5]) +m4_define([ido_micro_version], [6]) m4_define([ido_api_version], [ido_major_version.ido_minor_version]) diff -Nru ido-0.1.5/debian/changelog ido-0.1.6/debian/changelog --- ido-0.1.5/debian/changelog 2010-06-08 19:38:14.000000000 +0200 +++ ido-0.1.6/debian/changelog 2010-06-08 19:38:14.000000000 +0200 @@ -1,3 +1,9 @@ +ido (0.1.6-0ubuntu1) lucid-proposed; urgency=low + + * New upstream version fixing indicator-sound theming issues (lp: #532234) + + -- Sebastien Bacher Tue, 08 Jun 2010 19:20:41 +0200 + ido (0.1.5-0ubuntu1) lucid; urgency=low * New upstream version: diff -Nru ido-0.1.5/example/Makefile.in ido-0.1.6/example/Makefile.in --- ido-0.1.5/example/Makefile.in 2010-03-24 11:29:59.000000000 +0100 +++ ido-0.1.6/example/Makefile.in 2010-06-08 17:53:12.000000000 +0200 @@ -105,6 +105,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HTML_DIR = @HTML_DIR@ diff -Nru ido-0.1.5/Makefile.in ido-0.1.6/Makefile.in --- ido-0.1.5/Makefile.in 2010-03-24 11:30:00.000000000 +0100 +++ ido-0.1.6/Makefile.in 2010-06-08 17:53:12.000000000 +0200 @@ -164,6 +164,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HTML_DIR = @HTML_DIR@ diff -Nru ido-0.1.5/src/idoscalemenuitem.c ido-0.1.6/src/idoscalemenuitem.c --- ido-0.1.5/src/idoscalemenuitem.c 2010-03-18 14:21:04.000000000 +0100 +++ ido-0.1.6/src/idoscalemenuitem.c 2010-06-08 17:52:27.000000000 +0200 @@ -26,9 +26,6 @@ #include #include "idoscalemenuitem.h" -static GObject* ido_scale_menu_item_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params); static void ido_scale_menu_item_set_property (GObject *object, guint prop_id, const GValue *value, @@ -37,18 +34,12 @@ guint prop_id, GValue *value, GParamSpec *pspec); -static void ido_scale_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer data); static gboolean ido_scale_menu_item_button_press_event (GtkWidget *menuitem, GdkEventButton *event); static gboolean ido_scale_menu_item_button_release_event (GtkWidget *menuitem, GdkEventButton *event); static gboolean ido_scale_menu_item_motion_notify_event (GtkWidget *menuitem, GdkEventMotion *event); -static gboolean ido_scale_menu_item_expose (GtkWidget *widget, - GdkEventExpose *event); static void ido_scale_menu_item_primary_image_notify (GtkImage *image, GParamSpec *pspec, IdoScaleMenuItem *item); @@ -62,7 +53,6 @@ struct _IdoScaleMenuItemPrivate { GtkWidget *scale; GtkAdjustment *adjustment; - GtkWidget *offscreen; GtkWidget *primary_image; GtkWidget *secondary_image; GtkWidget *hbox; @@ -107,7 +97,19 @@ if (priv->reverse_scroll) { - event->direction = !event->direction; + switch (event->direction) + { + case GDK_SCROLL_UP: + event->direction = GDK_SCROLL_DOWN; + break; + + case GDK_SCROLL_DOWN: + event->direction = GDK_SCROLL_UP; + break; + + default: + break; + } } gtk_widget_event (scale, @@ -170,19 +172,14 @@ GObjectClass *gobject_class = G_OBJECT_CLASS (item_class); GtkObjectClass *object_class = GTK_OBJECT_CLASS (item_class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (item_class); - GtkContainerClass *container_class = GTK_CONTAINER_CLASS (item_class); - - container_class->forall = ido_scale_menu_item_forall; widget_class->button_press_event = ido_scale_menu_item_button_press_event; widget_class->button_release_event = ido_scale_menu_item_button_release_event; widget_class->motion_notify_event = ido_scale_menu_item_motion_notify_event; widget_class->scroll_event = ido_scale_menu_item_scroll_event; widget_class->state_changed = ido_scale_menu_item_state_changed; - widget_class->expose_event = ido_scale_menu_item_expose; widget_class->size_allocate = ido_scale_menu_item_size_allocate; - gobject_class->constructor = ido_scale_menu_item_constructor; gobject_class->set_property = ido_scale_menu_item_set_property; gobject_class->get_property = ido_scale_menu_item_get_property; @@ -198,7 +195,7 @@ PROP_REVERSE_SCROLL_EVENTS, g_param_spec_boolean ("reverse-scroll-events", "Reverse scroll events", - "Reverses how scroll events are interpreted", + "Reverses how up/down scroll events are interpreted", FALSE, G_PARAM_READWRITE)); @@ -225,9 +222,38 @@ ido_scale_menu_item_init (IdoScaleMenuItem *self) { IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); + GtkWidget *hbox; - priv->scale = NULL; priv->adjustment = NULL; + + priv->scale = gtk_hscale_new_with_range (0.0, 100.0, 1.0); + gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE); + + hbox = gtk_hbox_new (FALSE, 0); + + priv->primary_image = gtk_image_new (); + g_signal_connect (priv->primary_image, "notify", + G_CALLBACK (ido_scale_menu_item_primary_image_notify), + self); + + priv->secondary_image = gtk_image_new (); + g_signal_connect (priv->secondary_image, "notify", + G_CALLBACK (ido_scale_menu_item_secondary_image_notify), + self); + + gtk_box_pack_start (GTK_BOX (hbox), priv->primary_image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->scale, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), priv->secondary_image, FALSE, FALSE, 0); + + priv->hbox = hbox; + + gtk_widget_show_all (priv->hbox); + + g_signal_connect (self, "notify", + G_CALLBACK (ido_scale_menu_item_notify), + NULL); + + gtk_container_add (GTK_CONTAINER (self), hbox); } static void @@ -281,119 +307,6 @@ } } -static gboolean -offscreen_damage (GtkWidget *widget, - GdkEventExpose *event, - GtkWidget *menuitem) -{ - gtk_widget_queue_draw (menuitem); - - return TRUE; -} - -static gboolean -ido_scale_menu_item_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - IdoScaleMenuItemPrivate *priv = GET_PRIVATE (widget); - - if (gtk_widget_is_drawable (widget)) - { - GdkPixbuf *pixbuf = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW (priv->offscreen)); - - gdk_draw_pixbuf (widget->window, - widget->style->black_gc, - pixbuf, - 0, 0, - widget->allocation.x + priv->child_allocation.x, - widget->allocation.y, - gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf), - GDK_RGB_DITHER_NORMAL, - 0, 0); - - g_object_unref (pixbuf); - } - - return TRUE; -} - -static GObject* -ido_scale_menu_item_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - GtkWidget *hbox; - IdoScaleMenuItemPrivate *priv; - - object = G_OBJECT_CLASS (ido_scale_menu_item_parent_class)->constructor (type, - n_construct_properties, - construct_params); - - priv = GET_PRIVATE (object); - - g_signal_connect (object, "notify", - G_CALLBACK (ido_scale_menu_item_notify), - NULL); - - priv->offscreen = gtk_offscreen_window_new (); - gtk_widget_set_name (priv->offscreen, "ido-offscreen-scale"); - - priv->scale = gtk_hscale_new_with_range (0.0, 100.0, 1.0); - gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE); - gtk_widget_show (priv->scale); - gtk_widget_show (priv->offscreen); - - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (priv->offscreen), hbox); - - priv->primary_image = gtk_image_new (); - g_signal_connect (priv->primary_image, "notify", - G_CALLBACK (ido_scale_menu_item_primary_image_notify), - object); - - priv->secondary_image = gtk_image_new (); - g_signal_connect (priv->secondary_image, "notify", - G_CALLBACK (ido_scale_menu_item_secondary_image_notify), - object); - - gtk_box_pack_start (GTK_BOX (hbox), priv->primary_image, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), priv->scale, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), priv->secondary_image, FALSE, FALSE, 0); - - priv->hbox = hbox; - - gtk_widget_show (priv->hbox); - - gtk_widget_queue_draw (priv->offscreen); - - g_signal_connect (priv->offscreen, - "damage-event", - G_CALLBACK (offscreen_damage), - object); - - return object; -} - -static void -ido_scale_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer data) -{ - IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (container); - IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); - - GTK_CONTAINER_CLASS (ido_scale_menu_item_parent_class)->forall (container, - include_internals, - callback, - data); - - if (include_internals && priv->scale) - (* callback) (priv->scale, data); -} - static void translate_event_coordinates (GtkWidget *widget, gdouble in_x, @@ -410,17 +323,25 @@ { IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); GtkWidget *scale = priv->scale; + GtkWidget *parent; gdouble x; + // can we block emissions of "grab-notify" on parent?? + parent = gtk_widget_get_parent (GTK_WIDGET (menuitem)); + translate_event_coordinates (menuitem, event->x, &x); event->x = x; translate_event_coordinates (menuitem, event->x_root, &x); event->x_root = x; + GTK_OBJECT_FLAGS (scale) |= GTK_HAS_GRAB; + gtk_widget_event (scale, ((GdkEvent *)(void*)(event))); + GTK_OBJECT_FLAGS (scale) &= ~(GTK_HAS_GRAB); + if (!priv->grabbed) { priv->grabbed = TRUE; @@ -528,7 +449,7 @@ } static void -menu_hidden (GtkWidget *menu, +menu_hidden (GtkWidget *menu, IdoScaleMenuItem *scale) { IdoScaleMenuItemPrivate *priv = GET_PRIVATE (scale); @@ -548,6 +469,7 @@ if (g_strcmp0 (pspec->name, "parent")) { GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (item)); + if (parent) { g_signal_connect (parent, "hide", diff -Nru ido-0.1.5/src/Makefile.in ido-0.1.6/src/Makefile.in --- ido-0.1.5/src/Makefile.in 2010-03-24 11:30:00.000000000 +0100 +++ ido-0.1.6/src/Makefile.in 2010-06-08 17:53:12.000000000 +0200 @@ -134,6 +134,8 @@ GLIB_MKENUMS = @GLIB_MKENUMS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HTML_DIR = @HTML_DIR@