[Commits] [SCM] claws branch, master, updated. 3.11.1-153-g63f3f4f
mones at claws-mail.org
mones at claws-mail.org
Sun Jun 21 02:49:47 CEST 2015
The branch, master has been updated
via 63f3f4f846256f015d1cf1c76f0cc1555173a7e9 (commit)
via d1f8f167a546ec52a661bc909808e0683ce99835 (commit)
via ab18e2097f61ddc3b9086b69e6d9463ce4c3bd90 (commit)
via 0ccf2f026b4addfd1be17cda27ba73b712921064 (commit)
via 7abcba6de277e5debc7d00a1fe2ebecd0577f604 (commit)
via b7aa1147370221b11b8d5972e4cba597c078972d (commit)
via 15d448b89cecffd5132b70102b718f178bd670c7 (commit)
from 8ae2860c5457214ab955f1783bd67a8f61e6823e (commit)
Summary of changes:
.gitignore | 1 +
src/gtk/gtkutils.c | 1 -
src/ldif.c | 1 -
src/plugins/archive/libarchive_archive.c | 2 --
src/plugins/bogofilter/bogofilter_gtk.c | 1 -
src/plugins/mailmbox/mmapstring.c | 3 ---
src/plugins/vcalendar/libical/libical/icalyacc.y | 4 ----
src/prefs_themes.c | 1 -
src/quote_fmt_parse.y | 2 +-
tools/gitlog2changelog.py | 14 +++++++-------
10 files changed, 9 insertions(+), 21 deletions(-)
- Log -----------------------------------------------------------------
commit 63f3f4f846256f015d1cf1c76f0cc1555173a7e9
Author: Christian Hesse <mail at eworm.de>
Date: Thu Jun 18 14:50:29 2015 +0200
Finish 439a5cffca5bcdefc6d4d552af64aa2e10c5ab5d
Remove unused code relating to old unsupported version of libarchive.
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index a0536d4..8266c00 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -501,7 +501,6 @@ const gchar* archive_create(const char* archive_name, GSList* files,
#endif
return archive_error_string(arch);
break;
-#if NEW_ARCHIVE_API
case COMPRESS:
#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_set_compression_compress(arch) != ARCHIVE_OK)
@@ -510,7 +509,6 @@ const gchar* archive_create(const char* archive_name, GSList* files,
#endif
return archive_error_string(arch);
break;
-#endif
case NO_COMPRESS:
#if ARCHIVE_VERSION_NUMBER < 3000000
if (archive_write_set_compression_none(arch) != ARCHIVE_OK)
commit d1f8f167a546ec52a661bc909808e0683ce99835
Author: Christian Hesse <mail at eworm.de>
Date: Mon Dec 1 14:11:56 2014 +0100
Remove useless rule
diff --git a/src/plugins/vcalendar/libical/libical/icalyacc.y b/src/plugins/vcalendar/libical/libical/icalyacc.y
index b7091c5..dd41d83 100644
--- a/src/plugins/vcalendar/libical/libical/icalyacc.y
+++ b/src/plugins/vcalendar/libical/libical/icalyacc.y
@@ -356,10 +356,6 @@ period_value: DIGITS TIME_CHAR DIGITS utc_char '/' DIGITS TIME_CHAR DIGITS utc
}
-trigger:
-
-
-
/* UTC Offset */
plusminus: '+' { utcsign = 1; }
commit ab18e2097f61ddc3b9086b69e6d9463ce4c3bd90
Author: Christian Hesse <mail at eworm.de>
Date: Mon Dec 1 14:07:20 2014 +0100
Do not redefine MIN and MAX
This includes util.h, which includes glib.h, which includes gmacros.h,
which defines MIN and MAX.
diff --git a/src/plugins/mailmbox/mmapstring.c b/src/plugins/mailmbox/mmapstring.c
index d769c77..a7baa17 100644
--- a/src/plugins/mailmbox/mmapstring.c
+++ b/src/plugins/mailmbox/mmapstring.c
@@ -46,9 +46,6 @@
#include "utils.h"
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
#define MMAP_STRING_DEFAULT_CEIL (8 * 1024 * 1024)
#define DEFAULT_TMP_PATH "/tmp"
commit 0ccf2f026b4addfd1be17cda27ba73b712921064
Author: Christian Hesse <mail at eworm.de>
Date: Thu Jun 18 14:44:09 2015 +0200
Remove unused variables
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 8cdbd72..8f806f6 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1112,7 +1112,6 @@ GtkWidget *face_get_from_header(const gchar *o_face)
{
gchar face[2048];
gchar *face_png;
- gchar *tmp;
gsize pngsize;
GdkPixbuf *pixbuf;
GError *error = NULL;
diff --git a/src/ldif.c b/src/ldif.c
index 3bc227b..3907802 100644
--- a/src/ldif.c
+++ b/src/ldif.c
@@ -607,7 +607,6 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) {
long posEnd = 0L;
long posCur = 0L;
GHashTable *hashField;
- gchar *out;
gsize len;
hashField = ldifFile->hashFields;
diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 6be16d2..6464884 100644
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -126,7 +126,6 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
GtkWidget *process_emails_checkbtn;
- GtkWidget *spam_handle_label;
GtkWidget *spam_handle_combobox;
GtkWidget *save_spam_folder_entry;
GtkWidget *save_spam_folder_select;
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 3b6a44c..8a8e991 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -994,7 +994,6 @@ static void prefs_themes_destroy_widget(PrefsPage *page)
static void prefs_themes_save(PrefsPage *page)
{
- ThemesPage *prefs_themes = (ThemesPage *)page;
ThemesData *tdata = prefs_themes_data;
gchar *theme_str = tdata->displayed;
commit 7abcba6de277e5debc7d00a1fe2ebecd0577f604
Author: Christian Hesse <mail at eworm.de>
Date: Thu Nov 27 21:55:57 2014 +0100
Fix type in yacc file
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 4ad346b..9ed0ddb 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -617,7 +617,7 @@ static gchar *quote_fmt_complete_address(const gchar *addr)
%start quote_fmt
-%token <chr> CHARACTER
+%type <chr> CHARACTER
%type <chr> character
%type <str> string
commit b7aa1147370221b11b8d5972e4cba597c078972d
Author: Christian Hesse <mail at eworm.de>
Date: Tue Oct 21 10:06:30 2014 +0200
Let git ignore also *.tar.xz tarballs
diff --git a/.gitignore b/.gitignore
index ec3bc45..9177d2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ Makefile.in
/ChangeLog
/*.tar.gz
/*.tar.bz2
+/*.tar.xz
/aclocal.m4
/appdata/*.xml
/autom4te.cache
commit 15d448b89cecffd5132b70102b718f178bd670c7
Author: Christian Hesse <mail at eworm.de>
Date: Thu Jun 18 14:26:06 2015 +0200
Fix inconsistent use of tabs and spaces in indentation.
diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py
index 82fc449..216145b 100755
--- a/tools/gitlog2changelog.py
+++ b/tools/gitlog2changelog.py
@@ -49,9 +49,9 @@ for line in fin:
message = ""
filesFound = False
files = ""
- commitCmd = os.popen("git describe "+re.split(' ', line, 1)[1])
- commit = commitCmd.read()
- commitCmd.close()
+ commitCmd = os.popen("git describe "+re.split(' ', line, 1)[1])
+ commit = commitCmd.read()
+ commitCmd.close()
commit = commit[0:len(commit)-1]
continue
# Match the author line and extract the part we want
@@ -60,7 +60,7 @@ for line in fin:
author = re.split('<', authorList[1], 1)[0]
author = "[" + author[0:len(author)-1]+"]"
authorFound = True
- continue
+ continue
# Match the date line
elif re.match('^Date:', line) >= 0:
dateList = re.split(': ', line, 1)
@@ -107,8 +107,8 @@ for line in fin:
# author on this day
authorLine = date + " " + author
if len(prevAuthorLine) != 0:
- fout.write("\n");
- fout.write(authorLine + " " + commit + "\n\n")
+ fout.write("\n");
+ fout.write(authorLine + " " + commit + "\n\n")
# Assemble the actual commit message line(s) and limit the line length
# to 80 characters.
@@ -128,7 +128,7 @@ for line in fin:
i = i+71
# Write out the commit line
- fout.write(files + "\t\t" + commit + "\n")
+ fout.write(files + "\t\t" + commit + "\n")
#Now reset all the variables ready for a new commit block.
authorFound = False
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list