diff --git a/ChangeLog b/ChangeLog index 9735ddd..6097411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +ClipIt-v1.3.10-21122010001 - 21 Dec. 2010 + + Fixed: Imported fixes from Parcellite 0.9.3 (thanks to Doug Springer). + + Fixed: Fixed cast warnings when building on x86 machines. + + Fixed: Fixed build error on ubuntu 11.04. + + Fixed: Fixed problem with statusicon menu showing double content. + + Fixed: Fixed problem with clicking the statusicon menu multiple + times killing the program. + ClipIt-v1.3.9-19122010001 - 19 Dec. 2010 + Fixed: Fixed error while compiling without indicator support. + Fixed: Fixed a couple of memory leaks. diff --git a/Makefile.in b/Makefile.in index 2cb62ea..034cc3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -194,6 +194,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +X11_LIBS = @X11_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 0eeefe6..404ce83 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.9. +@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.10. @%:@ @%:@ Report bugs to . @%:@ @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clipit' PACKAGE_TARNAME='clipit' -PACKAGE_VERSION='1.3.9' -PACKAGE_STRING='clipit 1.3.9' +PACKAGE_VERSION='1.3.10' +PACKAGE_STRING='clipit 1.3.10' PACKAGE_BUGREPORT='oss@rspwn.com' PACKAGE_URL='' @@ -609,6 +609,7 @@ GTK_CFLAGS MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +X11_LIBS HAVE_APPINDICATOR_FALSE HAVE_APPINDICATOR_TRUE APPINDICATOR_LIBS @@ -1327,7 +1328,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 clipit 1.3.9 to adapt to many kinds of systems. +\`configure' configures clipit 1.3.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1398,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clipit 1.3.9:";; + short | recursive ) echo "Configuration of clipit 1.3.10:";; esac cat <<\_ACEOF @@ -1510,7 +1511,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clipit configure 1.3.9 +clipit configure 1.3.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1879,7 +1880,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 clipit $as_me 1.3.9, which was +It was created by clipit $as_me 1.3.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2695,7 +2696,7 @@ fi # Define the identity of the package. PACKAGE=clipit - VERSION=1.3.9 + VERSION=1.3.10 cat >>confdefs.h <<_ACEOF @@ -7728,6 +7729,9 @@ fi +X11_LIBS=-lX11 + + # ------------------------------------------------------------------------------- # Config options. # ------------------------------------------------------------------------------- @@ -9760,7 +9764,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 clipit $as_me 1.3.9, which was +This file was extended by clipit $as_me 1.3.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9826,7 +9830,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="\\ -clipit config.status 1.3.9 +clipit config.status 1.3.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 0eeefe6..404ce83 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.9. +@%:@ Generated by GNU Autoconf 2.67 for clipit 1.3.10. @%:@ @%:@ Report bugs to . @%:@ @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clipit' PACKAGE_TARNAME='clipit' -PACKAGE_VERSION='1.3.9' -PACKAGE_STRING='clipit 1.3.9' +PACKAGE_VERSION='1.3.10' +PACKAGE_STRING='clipit 1.3.10' PACKAGE_BUGREPORT='oss@rspwn.com' PACKAGE_URL='' @@ -609,6 +609,7 @@ GTK_CFLAGS MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +X11_LIBS HAVE_APPINDICATOR_FALSE HAVE_APPINDICATOR_TRUE APPINDICATOR_LIBS @@ -1327,7 +1328,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 clipit 1.3.9 to adapt to many kinds of systems. +\`configure' configures clipit 1.3.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1398,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clipit 1.3.9:";; + short | recursive ) echo "Configuration of clipit 1.3.10:";; esac cat <<\_ACEOF @@ -1510,7 +1511,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clipit configure 1.3.9 +clipit configure 1.3.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1879,7 +1880,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 clipit $as_me 1.3.9, which was +It was created by clipit $as_me 1.3.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2695,7 +2696,7 @@ fi # Define the identity of the package. PACKAGE=clipit - VERSION=1.3.9 + VERSION=1.3.10 cat >>confdefs.h <<_ACEOF @@ -7728,6 +7729,9 @@ fi +X11_LIBS=-lX11 + + # ------------------------------------------------------------------------------- # Config options. # ------------------------------------------------------------------------------- @@ -9760,7 +9764,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 clipit $as_me 1.3.9, which was +This file was extended by clipit $as_me 1.3.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9826,7 +9830,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="\\ -clipit config.status 1.3.9 +clipit config.status 1.3.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 07f45d8..654f9a9 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -75,18 +75,18 @@ 'AC_LIB_PREPARE_PREFIX' => 1, 'AM_XGETTEXT_OPTION_INIT' => 1, 'AC_DEFUN' => 1, - 'AM_PROG_MKDIR_P' => 1, 'AM_GLIB_GNU_GETTEXT' => 1, 'gl_AC_HEADER_STDINT_H' => 1, + 'AM_PROG_MKDIR_P' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'gl_SIZE_MAX' => 1, 'AM_MISSING_HAS_RUN' => 1, 'AC_LIB_RPATH' => 1, 'AC_TYPE_LONG_LONG_INT' => 1, 'AM_SUBST_NOTMAKE' => 1, - 'AM_PATH_GTK_2_0' => 1, 'AM_MISSING_PROG' => 1, 'gt_PRINTF_POSIX' => 1, + 'AM_PATH_GTK_2_0' => 1, 'IT_PO_SUBDIR' => 1, 'AM_GNU_GETTEXT_VERSION' => 1, 'AC_LIB_PROG_LD_GNU' => 1, diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index a8af5eb..5f08f61 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -4822,79 +4822,80 @@ m4trace:configure.in:55: -1- _AM_SUBST_NOTMAKE([HAVE_APPINDICATOR_TRUE]) m4trace:configure.in:55: -1- _AM_SUBST_NOTMAKE([HAVE_APPINDICATOR_FALSE]) m4trace:configure.in:56: -1- m4_pattern_allow([^APPINDICATOR_CFLAGS$]) m4trace:configure.in:57: -1- m4_pattern_allow([^APPINDICATOR_LIBS$]) -m4trace:configure.in:63: -1- AM_MAINTAINER_MODE([disable]) -m4trace:configure.in:63: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) -m4trace:configure.in:63: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) -m4trace:configure.in:63: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) -m4trace:configure.in:63: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) -m4trace:configure.in:63: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) -m4trace:configure.in:63: -1- m4_pattern_allow([^MAINT$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CFLAGS$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^LDFLAGS$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CPPFLAGS$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^ac_ct_CC$]) -m4trace:configure.in:73: -1- _AM_DEPENDENCIES([CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CCDEPMODE$]) -m4trace:configure.in:73: -1- AM_CONDITIONAL([am__fastdepCC], [ +m4trace:configure.in:59: -1- m4_pattern_allow([^X11_LIBS$]) +m4trace:configure.in:65: -1- AM_MAINTAINER_MODE([disable]) +m4trace:configure.in:65: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +m4trace:configure.in:65: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) +m4trace:configure.in:65: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) +m4trace:configure.in:65: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) +m4trace:configure.in:65: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:65: -1- m4_pattern_allow([^MAINT$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CFLAGS$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^LDFLAGS$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^LIBS$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CPPFLAGS$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^ac_ct_CC$]) +m4trace:configure.in:75: -1- _AM_DEPENDENCIES([CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CCDEPMODE$]) +m4trace:configure.in:75: -1- AM_CONDITIONAL([am__fastdepCC], [ test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) -m4trace:configure.in:73: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) -m4trace:configure.in:73: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) -m4trace:configure.in:73: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) -m4trace:configure.in:73: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) -m4trace:configure.in:75: -1- m4_pattern_allow([^SET_MAKE$]) -m4trace:configure.in:80: -1- AM_PATH_GTK_2_0([2.10.0], [], [as_fn_error $? "Requirement not met: gtk >= 2.10.0" "$LINENO" 5 ]) -m4trace:configure.in:80: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. +m4trace:configure.in:75: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) +m4trace:configure.in:75: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) +m4trace:configure.in:75: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) +m4trace:configure.in:75: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) +m4trace:configure.in:77: -1- m4_pattern_allow([^SET_MAKE$]) +m4trace:configure.in:82: -1- AM_PATH_GTK_2_0([2.10.0], [], [as_fn_error $? "Requirement not met: gtk >= 2.10.0" "$LINENO" 5 ]) +m4trace:configure.in:82: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2752: AC_TRY_RUN is expanded from... /usr/share/aclocal/gtk-2.0.m4:8: AM_PATH_GTK_2_0 is expanded from... -configure.in:80: the top level]) -m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +configure.in:82: the top level]) +m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... /usr/share/aclocal/gtk-2.0.m4:8: AM_PATH_GTK_2_0 is expanded from... -configure.in:80: the top level]) -m4trace:configure.in:80: -1- m4_pattern_allow([^GTK_CFLAGS$]) -m4trace:configure.in:80: -1- m4_pattern_allow([^GTK_LIBS$]) -m4trace:configure.in:81: -1- AM_PATH_GLIB_2_0([2.14.0], [], [as_fn_error $? "Requirement not met: glib >= 2.14.0" "$LINENO" 5 ]) -m4trace:configure.in:81: -1- PKG_PROG_PKG_CONFIG([0.16]) -m4trace:configure.in:81: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.in:81: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. +configure.in:82: the top level]) +m4trace:configure.in:82: -1- m4_pattern_allow([^GTK_CFLAGS$]) +m4trace:configure.in:82: -1- m4_pattern_allow([^GTK_LIBS$]) +m4trace:configure.in:83: -1- AM_PATH_GLIB_2_0([2.14.0], [], [as_fn_error $? "Requirement not met: glib >= 2.14.0" "$LINENO" 5 ]) +m4trace:configure.in:83: -1- PKG_PROG_PKG_CONFIG([0.16]) +m4trace:configure.in:83: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:83: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2752: AC_TRY_RUN is expanded from... /usr/share/aclocal/glib-2.0.m4:8: AM_PATH_GLIB_2_0 is expanded from... -configure.in:81: the top level]) -m4trace:configure.in:81: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +configure.in:83: the top level]) +m4trace:configure.in:83: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... /usr/share/aclocal/glib-2.0.m4:8: AM_PATH_GLIB_2_0 is expanded from... -configure.in:81: the top level]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_CFLAGS$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_LIBS$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GOBJECT_QUERY$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_MKENUMS$]) -m4trace:configure.in:91: -1- m4_pattern_allow([^const$]) -m4trace:configure.in:96: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete. +configure.in:83: the top level]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_CFLAGS$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_LIBS$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GOBJECT_QUERY$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_MKENUMS$]) +m4trace:configure.in:93: -1- m4_pattern_allow([^const$]) +m4trace:configure.in:98: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete. You should run autoupdate.], [../../lib/autoconf/types.m4:738: AC_TYPE_SIGNAL is expanded from... -configure.in:96: the top level]) -m4trace:configure.in:96: -1- m4_pattern_allow([^RETSIGTYPE$]) -m4trace:configure.in:103: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +configure.in:98: the top level]) +m4trace:configure.in:98: -1- m4_pattern_allow([^RETSIGTYPE$]) +m4trace:configure.in:105: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.in:103: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.in:103: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.in:103: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) -m4trace:configure.in:103: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.in:103: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.in:103: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.in:103: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.in:103: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) -m4trace:configure.in:103: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS +m4trace:configure.in:105: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.in:105: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.in:105: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) +m4trace:configure.in:105: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.in:105: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.in:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.in:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.in:105: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) +m4trace:configure.in:105: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index 2cd16fd..fecbf40 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -8,7 +8,7 @@ m4trace:aclocal.m4:2010: -1- m4_include([m4/lib-prefix.m4]) m4trace:aclocal.m4:2011: -1- m4_include([m4/nls.m4]) m4trace:aclocal.m4:2012: -1- m4_include([m4/po.m4]) m4trace:aclocal.m4:2013: -1- m4_include([m4/progtest.m4]) -m4trace:configure.in:5: -1- AC_INIT([clipit], [1.3.9], [oss@rspwn.com]) +m4trace:configure.in:5: -1- AC_INIT([clipit], [1.3.10], [oss@rspwn.com]) m4trace:configure.in:5: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.in:5: -1- m4_pattern_forbid([_AC_]) m4trace:configure.in:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -808,165 +808,168 @@ m4trace:configure.in:56: -1- m4_pattern_allow([^APPINDICATOR_CFLAGS$]) m4trace:configure.in:57: -1- AC_SUBST([APPINDICATOR_LIBS]) m4trace:configure.in:57: -1- AC_SUBST_TRACE([APPINDICATOR_LIBS]) m4trace:configure.in:57: -1- m4_pattern_allow([^APPINDICATOR_LIBS$]) -m4trace:configure.in:63: -1- AM_MAINTAINER_MODE([disable]) -m4trace:configure.in:63: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) -m4trace:configure.in:63: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) -m4trace:configure.in:63: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE]) -m4trace:configure.in:63: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) -m4trace:configure.in:63: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) -m4trace:configure.in:63: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE]) -m4trace:configure.in:63: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) -m4trace:configure.in:63: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) -m4trace:configure.in:63: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) -m4trace:configure.in:63: -1- AC_SUBST([MAINT]) -m4trace:configure.in:63: -1- AC_SUBST_TRACE([MAINT]) -m4trace:configure.in:63: -1- m4_pattern_allow([^MAINT$]) -m4trace:configure.in:73: -1- AC_SUBST([CC]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- AC_SUBST([CFLAGS]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CFLAGS]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CFLAGS$]) -m4trace:configure.in:73: -1- AC_SUBST([LDFLAGS]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([LDFLAGS]) -m4trace:configure.in:73: -1- m4_pattern_allow([^LDFLAGS$]) -m4trace:configure.in:73: -1- AC_SUBST([LIBS]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([LIBS]) -m4trace:configure.in:73: -1- m4_pattern_allow([^LIBS$]) -m4trace:configure.in:73: -1- AC_SUBST([CPPFLAGS]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CPPFLAGS]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CPPFLAGS$]) -m4trace:configure.in:73: -1- AC_SUBST([CC]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- AC_SUBST([CC]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- AC_SUBST([CC]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- AC_SUBST([CC]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CC$]) -m4trace:configure.in:73: -1- AC_SUBST([ac_ct_CC]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([ac_ct_CC]) -m4trace:configure.in:73: -1- m4_pattern_allow([^ac_ct_CC$]) -m4trace:configure.in:73: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([CCDEPMODE]) -m4trace:configure.in:73: -1- m4_pattern_allow([^CCDEPMODE$]) -m4trace:configure.in:73: -1- AM_CONDITIONAL([am__fastdepCC], [ +m4trace:configure.in:59: -1- AC_SUBST([X11_LIBS], [-lX11]) +m4trace:configure.in:59: -1- AC_SUBST_TRACE([X11_LIBS]) +m4trace:configure.in:59: -1- m4_pattern_allow([^X11_LIBS$]) +m4trace:configure.in:65: -1- AM_MAINTAINER_MODE([disable]) +m4trace:configure.in:65: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +m4trace:configure.in:65: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) +m4trace:configure.in:65: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE]) +m4trace:configure.in:65: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) +m4trace:configure.in:65: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:65: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:65: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) +m4trace:configure.in:65: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) +m4trace:configure.in:65: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:65: -1- AC_SUBST([MAINT]) +m4trace:configure.in:65: -1- AC_SUBST_TRACE([MAINT]) +m4trace:configure.in:65: -1- m4_pattern_allow([^MAINT$]) +m4trace:configure.in:75: -1- AC_SUBST([CC]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- AC_SUBST([CFLAGS]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CFLAGS]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CFLAGS$]) +m4trace:configure.in:75: -1- AC_SUBST([LDFLAGS]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([LDFLAGS]) +m4trace:configure.in:75: -1- m4_pattern_allow([^LDFLAGS$]) +m4trace:configure.in:75: -1- AC_SUBST([LIBS]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([LIBS]) +m4trace:configure.in:75: -1- m4_pattern_allow([^LIBS$]) +m4trace:configure.in:75: -1- AC_SUBST([CPPFLAGS]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CPPFLAGS]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CPPFLAGS$]) +m4trace:configure.in:75: -1- AC_SUBST([CC]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- AC_SUBST([CC]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- AC_SUBST([CC]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- AC_SUBST([CC]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CC$]) +m4trace:configure.in:75: -1- AC_SUBST([ac_ct_CC]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([ac_ct_CC]) +m4trace:configure.in:75: -1- m4_pattern_allow([^ac_ct_CC$]) +m4trace:configure.in:75: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([CCDEPMODE]) +m4trace:configure.in:75: -1- m4_pattern_allow([^CCDEPMODE$]) +m4trace:configure.in:75: -1- AM_CONDITIONAL([am__fastdepCC], [ test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) -m4trace:configure.in:73: -1- AC_SUBST([am__fastdepCC_TRUE]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) -m4trace:configure.in:73: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) -m4trace:configure.in:73: -1- AC_SUBST([am__fastdepCC_FALSE]) -m4trace:configure.in:73: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) -m4trace:configure.in:73: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) -m4trace:configure.in:73: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) -m4trace:configure.in:73: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) -m4trace:configure.in:75: -1- AC_SUBST([SET_MAKE]) -m4trace:configure.in:75: -1- AC_SUBST_TRACE([SET_MAKE]) -m4trace:configure.in:75: -1- m4_pattern_allow([^SET_MAKE$]) -m4trace:configure.in:80: -1- AC_SUBST([PKG_CONFIG]) -m4trace:configure.in:80: -1- AC_SUBST_TRACE([PKG_CONFIG]) -m4trace:configure.in:80: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. +m4trace:configure.in:75: -1- AC_SUBST([am__fastdepCC_TRUE]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) +m4trace:configure.in:75: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) +m4trace:configure.in:75: -1- AC_SUBST([am__fastdepCC_FALSE]) +m4trace:configure.in:75: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) +m4trace:configure.in:75: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) +m4trace:configure.in:75: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) +m4trace:configure.in:75: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) +m4trace:configure.in:77: -1- AC_SUBST([SET_MAKE]) +m4trace:configure.in:77: -1- AC_SUBST_TRACE([SET_MAKE]) +m4trace:configure.in:77: -1- m4_pattern_allow([^SET_MAKE$]) +m4trace:configure.in:82: -1- AC_SUBST([PKG_CONFIG]) +m4trace:configure.in:82: -1- AC_SUBST_TRACE([PKG_CONFIG]) +m4trace:configure.in:82: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2752: AC_TRY_RUN is expanded from... aclocal.m4:674: AM_PATH_GTK_2_0 is expanded from... -configure.in:80: the top level]) -m4trace:configure.in:80: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +configure.in:82: the top level]) +m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... aclocal.m4:674: AM_PATH_GTK_2_0 is expanded from... -configure.in:80: the top level]) -m4trace:configure.in:80: -1- AC_SUBST([GTK_CFLAGS]) -m4trace:configure.in:80: -1- AC_SUBST_TRACE([GTK_CFLAGS]) -m4trace:configure.in:80: -1- m4_pattern_allow([^GTK_CFLAGS$]) -m4trace:configure.in:80: -1- AC_SUBST([GTK_LIBS]) -m4trace:configure.in:80: -1- AC_SUBST_TRACE([GTK_LIBS]) -m4trace:configure.in:80: -1- m4_pattern_allow([^GTK_LIBS$]) -m4trace:configure.in:81: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -m4trace:configure.in:81: -1- AC_SUBST([PKG_CONFIG]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([PKG_CONFIG]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.in:81: -1- AC_SUBST([PKG_CONFIG_PATH]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) -m4trace:configure.in:81: -1- AC_SUBST([PKG_CONFIG_LIBDIR]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) -m4trace:configure.in:81: -1- AC_SUBST([PKG_CONFIG]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([PKG_CONFIG]) -m4trace:configure.in:81: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.in:81: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. +configure.in:82: the top level]) +m4trace:configure.in:82: -1- AC_SUBST([GTK_CFLAGS]) +m4trace:configure.in:82: -1- AC_SUBST_TRACE([GTK_CFLAGS]) +m4trace:configure.in:82: -1- m4_pattern_allow([^GTK_CFLAGS$]) +m4trace:configure.in:82: -1- AC_SUBST([GTK_LIBS]) +m4trace:configure.in:82: -1- AC_SUBST_TRACE([GTK_LIBS]) +m4trace:configure.in:82: -1- m4_pattern_allow([^GTK_LIBS$]) +m4trace:configure.in:83: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4trace:configure.in:83: -1- AC_SUBST([PKG_CONFIG]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([PKG_CONFIG]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:83: -1- AC_SUBST([PKG_CONFIG_PATH]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) +m4trace:configure.in:83: -1- AC_SUBST([PKG_CONFIG_LIBDIR]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) +m4trace:configure.in:83: -1- AC_SUBST([PKG_CONFIG]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([PKG_CONFIG]) +m4trace:configure.in:83: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:83: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2752: AC_TRY_RUN is expanded from... aclocal.m4:29: AM_PATH_GLIB_2_0 is expanded from... -configure.in:81: the top level]) -m4trace:configure.in:81: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +configure.in:83: the top level]) +m4trace:configure.in:83: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. You should run autoupdate.], [../../lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... aclocal.m4:29: AM_PATH_GLIB_2_0 is expanded from... -configure.in:81: the top level]) -m4trace:configure.in:81: -1- AC_SUBST([GLIB_CFLAGS]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([GLIB_CFLAGS]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_CFLAGS$]) -m4trace:configure.in:81: -1- AC_SUBST([GLIB_LIBS]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([GLIB_LIBS]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_LIBS$]) -m4trace:configure.in:81: -1- AC_SUBST([GLIB_GENMARSHAL]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([GLIB_GENMARSHAL]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) -m4trace:configure.in:81: -1- AC_SUBST([GOBJECT_QUERY]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([GOBJECT_QUERY]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GOBJECT_QUERY$]) -m4trace:configure.in:81: -1- AC_SUBST([GLIB_MKENUMS]) -m4trace:configure.in:81: -1- AC_SUBST_TRACE([GLIB_MKENUMS]) -m4trace:configure.in:81: -1- m4_pattern_allow([^GLIB_MKENUMS$]) -m4trace:configure.in:86: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ +configure.in:83: the top level]) +m4trace:configure.in:83: -1- AC_SUBST([GLIB_CFLAGS]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([GLIB_CFLAGS]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_CFLAGS$]) +m4trace:configure.in:83: -1- AC_SUBST([GLIB_LIBS]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([GLIB_LIBS]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_LIBS$]) +m4trace:configure.in:83: -1- AC_SUBST([GLIB_GENMARSHAL]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([GLIB_GENMARSHAL]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) +m4trace:configure.in:83: -1- AC_SUBST([GOBJECT_QUERY]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([GOBJECT_QUERY]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GOBJECT_QUERY$]) +m4trace:configure.in:83: -1- AC_SUBST([GLIB_MKENUMS]) +m4trace:configure.in:83: -1- AC_SUBST_TRACE([GLIB_MKENUMS]) +m4trace:configure.in:83: -1- m4_pattern_allow([^GLIB_MKENUMS$]) +m4trace:configure.in:88: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ @%:@undef HAVE_STDLIB_H]) -m4trace:configure.in:86: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:88: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the header file. */ @%:@undef HAVE_STRING_H]) -m4trace:configure.in:91: -1- AC_DEFINE_TRACE_LITERAL([const]) -m4trace:configure.in:91: -1- m4_pattern_allow([^const$]) -m4trace:configure.in:91: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */ +m4trace:configure.in:93: -1- AC_DEFINE_TRACE_LITERAL([const]) +m4trace:configure.in:93: -1- m4_pattern_allow([^const$]) +m4trace:configure.in:93: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */ @%:@undef const]) -m4trace:configure.in:96: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete. +m4trace:configure.in:98: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete. You should run autoupdate.], [../../lib/autoconf/types.m4:738: AC_TYPE_SIGNAL is expanded from... -configure.in:96: the top level]) -m4trace:configure.in:96: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) -m4trace:configure.in:96: -1- m4_pattern_allow([^RETSIGTYPE$]) -m4trace:configure.in:96: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */ +configure.in:98: the top level]) +m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) +m4trace:configure.in:98: -1- m4_pattern_allow([^RETSIGTYPE$]) +m4trace:configure.in:98: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */ @%:@undef RETSIGTYPE]) -m4trace:configure.in:98: -1- AC_CONFIG_FILES([Makefile m4/Makefile +m4trace:configure.in:100: -1- AC_CONFIG_FILES([Makefile m4/Makefile doc/Makefile src/Makefile data/Makefile]) -m4trace:configure.in:103: -1- AC_CONFIG_FILES([po/Makefile.in]) -m4trace:configure.in:103: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. +m4trace:configure.in:105: -1- AC_CONFIG_FILES([po/Makefile.in]) +m4trace:configure.in:105: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. You should run autoupdate.], []) -m4trace:configure.in:103: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -m4trace:configure.in:103: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.in:103: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([LTLIBOBJS]) -m4trace:configure.in:103: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.in:103: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) -m4trace:configure.in:103: -1- AC_SUBST([am__EXEEXT_TRUE]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) -m4trace:configure.in:103: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.in:103: -1- AC_SUBST([am__EXEEXT_FALSE]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) -m4trace:configure.in:103: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.in:103: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.in:103: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_builddir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_build_prefix]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([srcdir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_srcdir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_srcdir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_top_srcdir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([builddir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_builddir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_top_builddir]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([INSTALL]) -m4trace:configure.in:103: -1- AC_SUBST_TRACE([MKDIR_P]) +m4trace:configure.in:105: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) +m4trace:configure.in:105: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.in:105: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([LTLIBOBJS]) +m4trace:configure.in:105: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.in:105: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) +m4trace:configure.in:105: -1- AC_SUBST([am__EXEEXT_TRUE]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) +m4trace:configure.in:105: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.in:105: -1- AC_SUBST([am__EXEEXT_FALSE]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) +m4trace:configure.in:105: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.in:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.in:105: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([top_builddir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([top_build_prefix]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([srcdir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([abs_srcdir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([top_srcdir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([abs_top_srcdir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([builddir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([abs_builddir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([abs_top_builddir]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([INSTALL]) +m4trace:configure.in:105: -1- AC_SUBST_TRACE([MKDIR_P]) diff --git a/configure b/configure index ad03678..56f47e6 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for clipit 1.3.9. +# Generated by GNU Autoconf 2.67 for clipit 1.3.10. # # Report bugs to . # @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clipit' PACKAGE_TARNAME='clipit' -PACKAGE_VERSION='1.3.9' -PACKAGE_STRING='clipit 1.3.9' +PACKAGE_VERSION='1.3.10' +PACKAGE_STRING='clipit 1.3.10' PACKAGE_BUGREPORT='oss@rspwn.com' PACKAGE_URL='' @@ -609,6 +609,7 @@ GTK_CFLAGS MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +X11_LIBS HAVE_APPINDICATOR_FALSE HAVE_APPINDICATOR_TRUE APPINDICATOR_LIBS @@ -1327,7 +1328,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 clipit 1.3.9 to adapt to many kinds of systems. +\`configure' configures clipit 1.3.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1398,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clipit 1.3.9:";; + short | recursive ) echo "Configuration of clipit 1.3.10:";; esac cat <<\_ACEOF @@ -1510,7 +1511,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clipit configure 1.3.9 +clipit configure 1.3.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1879,7 +1880,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 clipit $as_me 1.3.9, which was +It was created by clipit $as_me 1.3.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2695,7 +2696,7 @@ fi # Define the identity of the package. PACKAGE=clipit - VERSION=1.3.9 + VERSION=1.3.10 cat >>confdefs.h <<_ACEOF @@ -7728,6 +7729,9 @@ fi +X11_LIBS=-lX11 + + # ------------------------------------------------------------------------------- # Config options. # ------------------------------------------------------------------------------- @@ -9760,7 +9764,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 clipit $as_me 1.3.9, which was +This file was extended by clipit $as_me 1.3.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9826,7 +9830,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="\\ -clipit config.status 1.3.9 +clipit config.status 1.3.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 4e26711..470f842 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # Autoconf/automake. # ------------------------------------------------------------------------------- AC_PREREQ([2.5]) -AC_INIT([clipit], [1.3.9], [oss@rspwn.com]) +AC_INIT([clipit], [1.3.10], [oss@rspwn.com]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) AC_CONFIG_MACRO_DIR([m4]) @@ -56,6 +56,8 @@ AM_CONDITIONAL(HAVE_APPINDICATOR, test x$enable_appindicator = xyes) AC_SUBST(APPINDICATOR_CFLAGS) AC_SUBST(APPINDICATOR_LIBS) +AC_SUBST(X11_LIBS, -lX11) + # ------------------------------------------------------------------------------- # Config options. # ------------------------------------------------------------------------------- diff --git a/data/Makefile.in b/data/Makefile.in index de3f3bf..9116eb6 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -163,6 +163,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +X11_LIBS = @X11_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 15ce5a1..73ee8c5 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -163,6 +163,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +X11_LIBS = @X11_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ diff --git a/src/Makefile.am b/src/Makefile.am index 6032fd4..5829907 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ AM_CFLAGS = -I$(top_srcdir) -DCLIPITLOCALEDIR=\""$(clipitlocaledir)"\" INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) +LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) $(X11_LIBS) AM_LDFLAGS = -Wl,--as-needed bin_PROGRAMS = clipit diff --git a/src/Makefile.in b/src/Makefile.in index 8e98b94..2f6528e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -58,7 +58,8 @@ am_clipit_OBJECTS = main.$(OBJEXT) utils.$(OBJEXT) daemon.$(OBJEXT) \ clipit_OBJECTS = $(am_clipit_OBJECTS) clipit_LDADD = $(LDADD) am__DEPENDENCIES_1 = -clipit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +clipit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -159,6 +160,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +X11_LIBS = @X11_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ @@ -215,7 +217,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -I$(top_srcdir) -DCLIPITLOCALEDIR=\""$(clipitlocaledir)"\" INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) +LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) $(X11_LIBS) AM_LDFLAGS = -Wl,--as-needed DISTCLEANFILES = *.bak *.log *~ .deps/*.P clipit_SOURCES = main.c main.h \ diff --git a/src/daemon.c b/src/daemon.c index b9abfe9..5965130 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -67,7 +67,7 @@ static void daemon_check() /* Check contents */ gint count; GdkAtom *targets; - gboolean contents = gtk_clipboard_wait_for_targets(primary, &targets, &count); + gboolean contents = gtk_clipboard_wait_for_targets(clipboard, &targets, &count); g_free(targets); /* Only recover lost contents if there isn't any other type of content in the clipboard */ if (!contents) diff --git a/src/main.c b/src/main.c index d2289a3..2eaea1c 100644 --- a/src/main.c +++ b/src/main.c @@ -49,6 +49,7 @@ static GtkWidget *indicator_menu = NULL; #else static GtkStatusIcon *status_icon; static GtkWidget *statusicon_menu = NULL; +static gboolean status_menu_lock = FALSE; #endif static gboolean actions_lock = FALSE; @@ -134,7 +135,7 @@ static gboolean item_check(gpointer data) /* Check contents */ gint count; GdkAtom *targets; - gboolean contents = gtk_clipboard_wait_for_targets(primary, &targets, &count); + gboolean contents = gtk_clipboard_wait_for_targets(clipboard, &targets, &count); g_free(targets); /* Only recover lost contents if there isn't any other type of content in the clipboard */ if (!contents) @@ -252,56 +253,21 @@ static void edit_actions_selected(GtkButton *button, gpointer user_data) static void item_selected(GtkMenuItem *menu_item, gpointer user_data) { /* Get the text from the right element and set as clipboard */ - GSList* element = g_slist_nth(history, (gint64)user_data); + GSList* element = g_slist_nth(history, GPOINTER_TO_INT(user_data)); gtk_clipboard_set_text(clipboard, (gchar*)element->data, -1); gtk_clipboard_set_text(primary, (gchar*)element->data, -1); } -/* Called when Clear is selected from history menu */ -static void clear_selected(GtkMenuItem *menu_item, gpointer user_data) -{ - /* Check for confirm clear option */ - if (prefs.confirm_clear) - { - GtkWidget* confirm_dialog = gtk_message_dialog_new(NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_OTHER, - GTK_BUTTONS_OK_CANCEL, - _("Clear the history?")); - gtk_window_set_title((GtkWindow*)confirm_dialog, _("Clear history")); - - if (gtk_dialog_run((GtkDialog*)confirm_dialog) == GTK_RESPONSE_OK) - { - /* Clear history and free history-related variables */ - g_slist_free(history); - history = NULL; - save_history(); - g_free(primary_text); - g_free(clipboard_text); - g_free(synchronized_text); - primary_text = g_strdup(""); - clipboard_text = g_strdup(""); - synchronized_text = g_strdup(""); - gtk_clipboard_set_text(primary, "", -1); - gtk_clipboard_set_text(clipboard, "", -1); - } - gtk_widget_destroy(confirm_dialog); - } - else - { - /* Clear history and free history-related variables */ - g_slist_free(history); - history = NULL; - save_history(); - g_free(primary_text); - g_free(clipboard_text); - g_free(synchronized_text); - primary_text = g_strdup(""); - clipboard_text = g_strdup(""); - synchronized_text = g_strdup(""); - gtk_clipboard_set_text(primary, "", -1); - gtk_clipboard_set_text(clipboard, "", -1); - } +/* Clears all local data (specific to main.c) */ +void clear_main_data() { + g_free(primary_text); + g_free(clipboard_text); + g_free(synchronized_text); + primary_text = g_strdup(""); + clipboard_text = g_strdup(""); + synchronized_text = g_strdup(""); + gtk_clipboard_set_text(primary, "", -1); + gtk_clipboard_set_text(clipboard, "", -1); } /* Called when About is selected from right-click menu */ @@ -502,7 +468,7 @@ static gboolean show_actions_menu(gpointer data) static gboolean show_history_menu_full(gpointer data) { /* Declare some variables */ - GtkWidget *menu, *menu_item, *menu_image, *item_label; + GtkWidget *menu, *menu_item, *item_label; /* Create the menu */ menu = gtk_menu_new(); @@ -512,7 +478,7 @@ static gboolean show_history_menu_full(gpointer data) { /* Declare some variables */ GSList* element; - gint64 element_number = 0; + gint element_number = 0; gchar* primary_temp = gtk_clipboard_wait_for_text(primary); gchar* clipboard_temp = gtk_clipboard_wait_for_text(clipboard); /* Reverse history if enabled */ @@ -533,13 +499,12 @@ static gboolean show_history_menu_full(gpointer data) gchar* list_item; if (prefs.show_indexes) { - list_item = g_strdup_printf("%" G_GINT64_FORMAT ". %s", (element_number+1), string->str); + list_item = g_strdup_printf("%d. %s", (element_number+1), string->str); } else { list_item = g_strdup(string->str); } menu_item = gtk_menu_item_new_with_label(list_item); - g_signal_connect((GObject*)menu_item, "activate", - (GCallback)item_selected, (gpointer)element_number); + g_signal_connect((GObject*)menu_item, "activate", (GCallback)item_selected, GINT_TO_POINTER(element_number)); /* Modify menu item label properties */ item_label = gtk_bin_get_child((GtkBin*)menu_item); gtk_label_set_single_line_mode((GtkLabel*)item_label, prefs.single_line); @@ -581,12 +546,6 @@ static gboolean show_history_menu_full(gpointer data) gtk_widget_set_sensitive(menu_item, FALSE); gtk_menu_shell_append((GtkMenuShell*)menu, menu_item); } - /* -------------------- */ - gtk_menu_shell_append((GtkMenuShell*)menu, gtk_separator_menu_item_new()); - /* Clear */ - menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL); - g_signal_connect((GObject*)menu_item, "activate", (GCallback)clear_selected, NULL); - gtk_menu_shell_append((GtkMenuShell*)menu, menu_item); /* Popup the menu... */ gtk_widget_show_all(menu); gtk_menu_popup((GtkMenu*)menu, NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time()); @@ -608,8 +567,8 @@ static gboolean show_history_menu_small(gpointer data) { /* Declare some variables */ GSList* element; - gint64 element_number = 0; - gint64 element_number_small = 0; + gint element_number = 0; + gint element_number_small = 0; gchar* primary_temp = gtk_clipboard_wait_for_text(primary); gchar* clipboard_temp = gtk_clipboard_wait_for_text(clipboard); /* Reverse history if enabled */ @@ -630,13 +589,12 @@ static gboolean show_history_menu_small(gpointer data) gchar* list_item; if (prefs.show_indexes) { - list_item = g_strdup_printf("%" G_GINT64_FORMAT ". %s", (element_number_small+1), string->str); + list_item = g_strdup_printf("%d. %s", (element_number_small+1), string->str); } else { list_item = g_strdup(string->str); } menu_item = gtk_menu_item_new_with_label(list_item); - g_signal_connect((GObject*)menu_item, "activate", - (GCallback)item_selected, (gpointer)element_number); + g_signal_connect((GObject*)menu_item, "activate", (GCallback)item_selected, GINT_TO_POINTER(element_number)); /* Modify menu item label properties */ item_label = gtk_bin_get_child((GtkBin*)menu_item); @@ -723,8 +681,8 @@ void create_app_indicator(gint create) { /* Declare some variables */ GSList* element; - gint64 element_number = 0; - gint64 element_number_small = 0; + gint element_number = 0; + gint element_number_small = 0; gchar* primary_temp = gtk_clipboard_wait_for_text(primary); gchar* clipboard_temp = gtk_clipboard_wait_for_text(clipboard); /* Reverse history if enabled */ @@ -745,14 +703,14 @@ void create_app_indicator(gint create) gchar* list_item; if (prefs.show_indexes) { - list_item = g_strdup_printf("%" G_GINT64_FORMAT ". %s", + list_item = g_strdup_printf("%d. %s", (element_number_small+1), string->str); } else { list_item = g_strdup(string->str); } menu_item = gtk_menu_item_new_with_label(list_item); g_signal_connect((GObject*)menu_item, "activate", - (GCallback)item_selected, (gpointer)element_number); + (GCallback)item_selected, GINT_TO_POINTER(element_number)); /* Modify menu item label properties */ item_label = gtk_bin_get_child((GtkBin*)menu_item); @@ -836,11 +794,14 @@ void create_app_indicator(gint create) #else /* Called when status icon is clicked */ -static void show_clipit_menu(GtkStatusIcon *status_icon, guint button, guint activate_time) +static gboolean show_clipit_menu() { /* If the menu is visible, we don't do anything, so that it gets hidden */ if((statusicon_menu != NULL) && gtk_widget_get_visible((GtkWidget *)statusicon_menu)) return; + if(status_menu_lock) + return; + status_menu_lock = TRUE; /* Declare some variables */ GtkWidget *menu_item, *menu_image, *item_label; @@ -854,8 +815,8 @@ static void show_clipit_menu(GtkStatusIcon *status_icon, guint button, guint act { /* Declare some variables */ GSList* element; - gint64 element_number = 0; - gint64 element_number_small = 0; + gint element_number = 0; + gint element_number_small = 0; gchar* primary_temp = gtk_clipboard_wait_for_text(primary); gchar* clipboard_temp = gtk_clipboard_wait_for_text(clipboard); /* Reverse history if enabled */ @@ -876,14 +837,14 @@ static void show_clipit_menu(GtkStatusIcon *status_icon, guint button, guint act gchar* list_item; if (prefs.show_indexes) { - list_item = g_strdup_printf("%" G_GINT64_FORMAT ". %s", + list_item = g_strdup_printf("%d. %s", (element_number_small+1), string->str); } else { list_item = g_strdup(string->str); } menu_item = gtk_menu_item_new_with_label(list_item); g_signal_connect((GObject*)menu_item, "activate", - (GCallback)item_selected, (gpointer)element_number); + (GCallback)item_selected, GINT_TO_POINTER(element_number)); /* Modify menu item label properties */ item_label = gtk_bin_get_child((GtkBin*)menu_item); @@ -958,8 +919,10 @@ static void show_clipit_menu(GtkStatusIcon *status_icon, guint button, guint act gtk_menu_shell_append((GtkMenuShell*)statusicon_menu, menu_item); /* Popup the menu... */ gtk_widget_show_all(statusicon_menu); - gtk_menu_popup((GtkMenu*)statusicon_menu, NULL, NULL, gtk_status_icon_position_menu, status_icon, button, activate_time); gtk_widget_set_visible(statusicon_menu, TRUE); + gtk_menu_popup((GtkMenu*)statusicon_menu, NULL, NULL, gtk_status_icon_position_menu, status_icon, 1, gtk_get_current_event_time()); + + status_menu_lock = FALSE; } /* Called when status icon is clicked */ @@ -980,7 +943,7 @@ static void status_icon_clicked(GtkStatusIcon *status_icon, GdkEventButton *even /* Left click */ else if (event->button == 1) { - show_clipit_menu(status_icon, event->button, gtk_get_current_event_time()); + show_clipit_menu(); } } diff --git a/src/main.h b/src/main.h index 323829c..53b3bc4 100644 --- a/src/main.h +++ b/src/main.h @@ -73,6 +73,8 @@ void menu_hotkey(char *keystring, gpointer user_data); void search_hotkey(char *keystring, gpointer user_data); +void clear_main_data(); + #ifdef HAVE_APPINDICATOR void create_app_indicator(gint create); #endif diff --git a/src/manage.c b/src/manage.c index 1ee8889..1c60081 100644 --- a/src/manage.c +++ b/src/manage.c @@ -191,6 +191,45 @@ static void remove_selected() } } +/* Called when Remove all is selected from Manage dialog */ +static void remove_all_selected(gpointer user_data) +{ + /* Check for confirm clear option */ + if (prefs.confirm_clear) + { + GtkWidget* confirm_dialog = gtk_message_dialog_new(NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_OTHER, + GTK_BUTTONS_OK_CANCEL, + _("Clear the history?")); + gtk_window_set_title((GtkWindow*)confirm_dialog, _("Clear history")); + + if (gtk_dialog_run((GtkDialog*)confirm_dialog) == GTK_RESPONSE_OK) + { + /* Clear history and free history-related variables */ + g_slist_free(history); + history = NULL; + save_history(); + clear_main_data(); + GtkTreeIter search_iter; + while(gtk_tree_model_get_iter_first((GtkTreeModel*)search_list, &search_iter)) + gtk_list_store_remove(search_list, &search_iter); + } + gtk_widget_destroy(confirm_dialog); + } + else + { + /* Clear history and free history-related variables */ + g_slist_free(history); + history = NULL; + save_history(); + clear_main_data(); + GtkTreeIter search_iter; + while(gtk_tree_model_get_iter_first((GtkTreeModel*)search_list, &search_iter)) + gtk_list_store_remove(search_list, &search_iter); + } +} + static void search_doubleclick() { GtkTreeIter sel_iter; @@ -208,7 +247,7 @@ static void search_doubleclick() } } -gint search_click(GtkWidget *widget, GdkEventButton *event, GtkWidget *search_window) +static gint search_click(GtkWidget *widget, GdkEventButton *event, GtkWidget *search_window) { if(event->type==GDK_2BUTTON_PRESS || event->type==GDK_3BUTTON_PRESS) { @@ -291,6 +330,8 @@ gboolean show_search() g_signal_connect((GObject*)edit_button, "clicked", (GCallback)edit_selected, NULL); GtkWidget* remove_button = gtk_dialog_add_button((GtkDialog*)search_dialog, "Remove", 1); g_signal_connect((GObject*)remove_button, "clicked", (GCallback)remove_selected, NULL); + GtkWidget* remove_all_button = gtk_dialog_add_button((GtkDialog*)search_dialog, "Remove all", 1); + g_signal_connect((GObject*)remove_all_button, "clicked", (GCallback)remove_all_selected, NULL); GtkWidget* close_button = gtk_dialog_add_button((GtkDialog*)search_dialog, "Close", GTK_RESPONSE_OK); g_signal_connect((GObject*)close_button, "clicked", (GCallback)search_history, NULL); diff --git a/src/preferences.c b/src/preferences.c index f0b4565..abdf584 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -932,7 +932,7 @@ void show_preferences(gint tab) /* History key combination */ hbox = gtk_hbox_new(TRUE, 4); gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0); - label = gtk_label_new(_("History key combination:")); + label = gtk_label_new(_("History hotkey:")); gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); gtk_box_pack_start((GtkBox*)hbox, label, TRUE, TRUE, 0); history_key_entry = gtk_entry_new(); @@ -941,7 +941,7 @@ void show_preferences(gint tab) /* Actions key combination */ hbox = gtk_hbox_new(TRUE, 4); gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0); - label = gtk_label_new(_("Actions key combination:")); + label = gtk_label_new(_("Actions hotkey:")); gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); gtk_box_pack_start((GtkBox*)hbox, label, TRUE, TRUE, 0); actions_key_entry = gtk_entry_new(); @@ -950,7 +950,7 @@ void show_preferences(gint tab) /* Menu key combination */ hbox = gtk_hbox_new(TRUE, 4); gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0); - label = gtk_label_new(_("Menu key combination:")); + label = gtk_label_new(_("Menu hotkey:")); gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); gtk_box_pack_start((GtkBox*)hbox, label, TRUE, TRUE, 0); menu_key_entry = gtk_entry_new(); @@ -959,7 +959,7 @@ void show_preferences(gint tab) /* Search key combination */ hbox = gtk_hbox_new(TRUE, 4); gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0); - label = gtk_label_new(_("Search key combination:")); + label = gtk_label_new(_("Manage hotkey:")); gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); gtk_box_pack_start((GtkBox*)hbox, label, TRUE, TRUE, 0); search_key_entry = gtk_entry_new();