org.guifications.plugins, org.guifications.plugins.enhancedhistory: d7372f52a6b8a3447d462e65732ac75e50ee90a9
rekkanoryo at guifications.org
rekkanoryo at guifications.org
Sun Nov 18 10:55:05 CST 2007
-----------------------------------------------------------------
Revision: d7372f52a6b8a3447d462e65732ac75e50ee90a9
Ancestor: a65ffdb393a5b8b87a30e9ca627ca84215c2067c
Author: rekkanoryo at guifications.org
Date: 2007-11-18T16:49:06
Branch: org.guifications.plugins
Branch: org.guifications.plugins.enhancedhistory
Modified files:
enhancedhist/enhanced_hist.c mkinstalldirs
ChangeLog:
Compile without stupid warnings and actually include headers correctly.
-----------------------------------------------------------------
This revision's diffstat output:
enhancedhist/enhanced_hist.c | 26 ++++++------
mkinstalldirs | 89 ++++++++++++++++++++++++++++++++-----------
2 files changed, 82 insertions(+), 33 deletions(-)
-------------- next part --------------
============================================================
--- enhancedhist/enhanced_hist.c 593a0395bd8ee367d0c39f7a520a6377840ffecb
+++ enhancedhist/enhanced_hist.c 1f20f9977e7732ef7386de32f00411919802238d
@@ -26,19 +26,21 @@
#include "../common/pp_internal.h"
/* Purple headers */
-#include "conversation.h"
-#include "debug.h"
-#include "log.h"
-#include "pluginpref.h"
-#include "prefs.h"
-#include "signals.h"
-#include "util.h"
+#include <conversation.h>
+#include <debug.h>
+#include <log.h>
+#include <pluginpref.h>
+#include <prefs.h>
+#include <signals.h>
+#include <util.h>
/* Pidgin headers */
-#include "gtkconv.h"
-#include "gtkimhtml.h"
-#include "gtkplugin.h"
-#include "pidgin.h"
+#include <gtkconv.h>
+#include <gtkimhtml.h>
+#include <gtkplugin.h>
+#include <gtkprefs.h>
+#include <gtkutils.h>
+#include <pidgin.h>
/* libc headers */
#include <time.h>
@@ -248,7 +250,7 @@ eh_prefs_get_frame(PurplePlugin *plugin)
static GtkWidget *
eh_prefs_get_frame(PurplePlugin *plugin)
{
- GtkWidget *vbox = NULL, frame = NULL, option = NULL;
+ GtkWidget *vbox = NULL, *frame = NULL, *option = NULL;
vbox = gtk_vbox_new(TRUE, PIDGIN_HIG_BOX_SPACE);
============================================================
--- mkinstalldirs 058b9b499887b5df4bc7348e713e7566e4234039
+++ mkinstalldirs 1e04a516e7668098d184bda8c070090b8405981e
@@ -1,21 +1,33 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+
+scriptversion=2005-06-29.22
+
+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
# Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
errstatus=0
-dirmode=""
+dirmode=
usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake at gnu.org>."
+
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
+ echo "$usage"
+ exit $?
;;
-m) # -m PERM arg
shift
@@ -23,6 +35,10 @@ while test $# -gt 0 ; do
dirmode=$1
shift
;;
+ --version)
+ echo "$0 $scriptversion"
+ exit $?
+ ;;
--) # stop option processing
shift
break
@@ -50,30 +66,58 @@ esac
0) exit 0 ;;
esac
+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error. This is a problem when calling mkinstalldirs
+# from a parallel make. We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
- if mkdir -p -- . 2>/dev/null; then
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
+ test -d ./--version && rmdir ./--version
fi
;;
*)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+ test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
+ else
+ # Clean up after NextStep and OpenStep mkdir.
+ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
fi
;;
esac
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
shift
+ IFS=$oIFS
- pathcomp=
for d
do
- pathcomp="$pathcomp$d"
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
@@ -84,21 +128,21 @@ do
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
- errstatus=$lasterr
+ errstatus=$lasterr
else
- if test ! -z "$dirmode"; then
+ if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
+ lasterr=
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
fi
fi
- pathcomp="$pathcomp/"
+ pathcomp=$pathcomp/
done
done
@@ -107,5 +151,8 @@ exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
More information about the Plugins-commits
mailing list