ClipIt-v1.2.5-12112010002

+ Fixed: Now using autopoint instead of gettextize to avoid waiting for
		user input.
+ Fixed: Added AM_MAINTAINER_MODE, to get rid of the disable-maintainer-mode
		warning.
+ Fixed: Fixed a small typo in main.c.
+ Fixed: removed dependency of pthread.h (the pthread_exit function that we
		use is also in glib.h).
This commit is contained in:
Cristian Henzel 2010-11-12 10:39:04 +02:00 committed by Cristian Henzel
parent 439b72cedd
commit c0c1f4a5c4
4 changed files with 18 additions and 8 deletions

View File

@ -1,3 +1,12 @@
ClipIt-v1.2.5-12112010002 - 12 Nov. 2010
+ Fixed: Now using autopoint instead of gettextize to avoid waiting for
user input.
+ Fixed: Added AM_MAINTAINER_MODE, to get rid of the disable-maintainer-mode
warning.
+ Fixed: Fixed a small typo in main.c.
+ Fixed: removed dependency of pthread.h (the pthread_exit function that we
use is also included in glib.h).
ClipIt-v1.2.4-12112010001 - 12 Nov. 2010 ClipIt-v1.2.4-12112010001 - 12 Nov. 2010
+ Fixed: Fixed 2 small omitions from previous changes. + Fixed: Fixed 2 small omitions from previous changes.

View File

@ -1,10 +1,9 @@
#!/bin/sh #!/bin/sh
echo "gettextize..." GETTEXTIZE="autopoint"
echo "$GETTEXTIZE..."
GETTEXTIZE="gettextize"
($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1 || { ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1 || {
echo "gettextize not found" echo "$GETTEXTIZE not found"
exit 1 exit 1
} }
@ -12,7 +11,7 @@ if test "$GETTEXTIZE"; then
echo "Creating $dr/aclocal.m4 ..." echo "Creating $dr/aclocal.m4 ..."
test -r aclocal.m4 || touch aclocal.m4 test -r aclocal.m4 || touch aclocal.m4
echo "Running $GETTEXTIZE... Ignore non-fatal messages." echo "Running $GETTEXTIZE... Ignore non-fatal messages."
echo "no" | $GETTEXTIZE --force --copy $GETTEXTIZE --force
echo "Making aclocal.m4 writable ..." echo "Making aclocal.m4 writable ..."
test -r aclocal.m4 && chmod u+w aclocal.m4 test -r aclocal.m4 && chmod u+w aclocal.m4
fi fi

View File

@ -2,7 +2,7 @@
# Autoconf/automake. # Autoconf/automake.
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
AC_PREREQ([2.5]) AC_PREREQ([2.5])
AC_INIT([clipit], [1.2.4], [oss@web-tm.com]) AC_INIT([clipit], [1.2.5], [oss@web-tm.com])
AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -26,6 +26,9 @@ clipitlocaledir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(clipitlocaledir) AC_SUBST(clipitlocaledir)
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION(0.18.1)
AM_MAINTAINER_MODE([enable])
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
# Main settings. # Main settings.

View File

@ -27,7 +27,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <pthread.h>
#include "main.h" #include "main.h"
#include "utils.h" #include "utils.h"
#include "history.h" #include "history.h"
@ -48,7 +47,7 @@ static gboolean actions_lock = FALSE;
/* Init preferences structure */ /* Init preferences structure */
prefs_t prefs = {DEF_USE_COPY, DEF_USE_PRIMARY, DEF_SYNCHRONIZE, prefs_t prefs = {DEF_USE_COPY, DEF_USE_PRIMARY, DEF_SYNCHRONIZE,
DEF_SHOW_INDEXES, DEF_SAVE_URIS DEF_SAVE_HISTORY, DEF_SHOW_INDEXES, DEF_SAVE_URIS, DEF_SAVE_HISTORY,
DEF_HISTORY_LIMIT, DEF_SMALL_HISTORY, DEF_HISTORY_SMALL, DEF_HISTORY_LIMIT, DEF_SMALL_HISTORY, DEF_HISTORY_SMALL,
DEF_HYPERLINKS_ONLY, DEF_CONFIRM_CLEAR, DEF_FULL_HIST_BUTTON, DEF_HYPERLINKS_ONLY, DEF_CONFIRM_CLEAR, DEF_FULL_HIST_BUTTON,
DEF_SINGLE_LINE, DEF_REVERSE_HISTORY, DEF_ITEM_LENGTH, DEF_SINGLE_LINE, DEF_REVERSE_HISTORY, DEF_ITEM_LENGTH,