0.8.6claws42

* src/Makefile.am
* src/base64.[ch]
* src/codeconv.c
* src/compose.c
* src/ldif.c
* src/pgptext.c
* src/procmime.c
* src/rfc2015.c
* src/smtp.c
* src/unmime.c
* src/common/Makefile.am
* src/common/base64.[ch]
        move base64 en/decoder to common directory

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 79a141dbcf4664026e30b4f7dd7e894a0ed620a3..9c7b558f75de54a801f9fca0ac9c484806df8132 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,19 @@
+2002-11-30 [christoph] 0.8.6claws42
+
+       * src/Makefile.am
+       * src/base64.[ch]
+       * src/codeconv.c
+       * src/compose.c
+       * src/ldif.c
+       * src/pgptext.c
+       * src/procmime.c
+       * src/rfc2015.c
+       * src/smtp.c
+       * src/unmime.c
+       * src/common/Makefile.am
+       * src/common/base64.[ch]
+               move base64 en/decoder to common directory
+

 2002-11-30 [christoph] 0.8.6claws41
 
        * src/common                    ** NEW **
 2002-11-30 [christoph] 0.8.6claws41
 
        * src/common                    ** NEW **

diff --git a/configure.in b/configure.in
index e007dfe954f41405bd68aebf3f09e5b36d0aef98..57c19528f2becb7639fcfeb261e90d86690424f0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws41
+EXTRA_VERSION=claws42

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/Makefile.am b/src/Makefile.am
index 490e7c62992a87beb059117704b596289cedd638..552ce46758e5ab6e7c1ed1c177629b9e48a8aac6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,7 +90,6 @@ sylpheed_SOURCES = \
        gtkutils.c gtkutils.h \
        codeconv.c codeconv.h \
        unmime.c unmime.h \
        gtkutils.c gtkutils.h \
        codeconv.c codeconv.h \
        unmime.c unmime.h \

-       base64.c base64.h \

        uuencode.c uuencode.h \
        md5.c md5.h \
        socket.c socket.h \
        uuencode.c uuencode.h \
        md5.c md5.h \
        socket.c socket.h \

diff --git a/src/codeconv.c b/src/codeconv.c
index b9d381ed710c9caba7350b93b3347c8a0b880915..715383885463e8e1d77785e7f896dac9329bceec 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -42,7 +42,7 @@
 #include "intl.h"
 #include "codeconv.h"
 #include "unmime.h"
 #include "intl.h"
 #include "codeconv.h"
 #include "unmime.h"

-#include "base64.h"
+#include "common/base64.h"

 #include "utils.h"
 #include "prefs_common.h"
 
 #include "utils.h"
 #include "prefs_common.h"
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index f9743250a41710eea8d8e28cbea091ec26d2ece9..0b068181cb6fc9a826aa703a692db07e7c042ee5 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,3 +1,10 @@
 noinst_LTLIBRARIES = libsylpheedcommon.la
 
 noinst_LTLIBRARIES = libsylpheedcommon.la
 

-libsylpheedcommon_la_SOURCES =
+libsylpheedcommon_la_SOURCES = \
+       base64.c base64.h 
+
+INCLUDES = \
+       $(GLIB_CFLAGS)
+
+libsylpheedcommon_la_LIBADD = \
+       $(GLIB_LIBS)

diff --git a/src/base64.c b/src/common/base64.c
similarity index 100%
rename from src/base64.c
rename to src/common/base64.c

diff --git a/src/base64.h b/src/common/base64.h
similarity index 100%
rename from src/base64.h
rename to src/common/base64.h

diff --git a/src/compose.c b/src/compose.c
index 48502329d658210eacd372b3f17a883604fe0e02..b2715fd916260503feb62f7b6aabcef277e1c92a 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -91,7 +91,7 @@
 #include "procmime.h"
 #include "statusbar.h"
 #include "about.h"
 #include "procmime.h"
 #include "statusbar.h"
 #include "about.h"

-#include "base64.h"
+#include "common/base64.h"

 #include "codeconv.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "codeconv.h"
 #include "utils.h"
 #include "gtkutils.h"

diff --git a/src/ldif.c b/src/ldif.c
index 7ad132ff97ac088a34f7e3086c6b71358b42e29d..f51cf82ae40c782ecc5be22cfcf358bf72dddfa5 100644 (file)
--- a/src/ldif.c
+++ b/src/ldif.c
@@ -31,7 +31,7 @@
 #include "addritem.h"
 #include "addrcache.h"
 
 #include "addritem.h"
 #include "addrcache.h"
 

-#include "base64.h"
+#include "common/base64.h"

 
 /*
 * Create new object.
 
 /*
 * Create new object.

diff --git a/src/pgptext.c b/src/pgptext.c
index bbfd76ded7f0a079d409fe529a68a54c738eeb1d..a82139afa8c53cd1496d8c3f3c44b6d12bf80acf 100644 (file)
--- a/src/pgptext.c
+++ b/src/pgptext.c
@@ -36,7 +36,7 @@
 #include "intl.h"
 #include "procmime.h"
 #include "procheader.h"
 #include "intl.h"
 #include "procmime.h"
 #include "procheader.h"

-#include "base64.h"
+#include "common/base64.h"

 #include "uuencode.h"
 #include "unmime.h"
 #include "codeconv.h"
 #include "uuencode.h"
 #include "unmime.h"
 #include "codeconv.h"

diff --git a/src/procmime.c b/src/procmime.c
index bb288fdd0a3803d4b8c9c228be2efe650b5ce777..2ec1ded3dbc41ad67b9fbb14a2821660fcf19e34 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -32,7 +32,7 @@
 #include "intl.h"
 #include "procmime.h"
 #include "procheader.h"
 #include "intl.h"
 #include "procmime.h"
 #include "procheader.h"

-#include "base64.h"
+#include "common/base64.h"

 #include "uuencode.h"
 #include "unmime.h"
 #include "html.h"
 #include "uuencode.h"
 #include "unmime.h"
 #include "html.h"

diff --git a/src/rfc2015.c b/src/rfc2015.c
index 5c7dffdbb03c6ff92e2c078820e29f1296a9978c..7074a5e43bc6f64cf3570cd6323c6ef834a4c0b6 100644 (file)
--- a/src/rfc2015.c
+++ b/src/rfc2015.c
@@ -36,7 +36,7 @@
 #include "intl.h"
 #include "procmime.h"
 #include "procheader.h"
 #include "intl.h"
 #include "procmime.h"
 #include "procheader.h"

-#include "base64.h"
+#include "common/base64.h"

 #include "uuencode.h"
 #include "unmime.h"
 #include "codeconv.h"
 #include "uuencode.h"
 #include "unmime.h"
 #include "codeconv.h"

diff --git a/src/smtp.c b/src/smtp.c
index deb47a7bfe199c079b67b07ffc849cf7b4b82eb3..674425e0760a21ab1bfc86ede009114a86ef2366 100644 (file)
--- a/src/smtp.c
+++ b/src/smtp.c
@@ -29,7 +29,7 @@
 #include "smtp.h"
 #include "socket.h"
 #include "md5.h"
 #include "smtp.h"
 #include "socket.h"
 #include "md5.h"

-#include "base64.h"
+#include "common/base64.h"

 #include "utils.h"
 
 static gint verbose = 1;
 #include "utils.h"
 
 static gint verbose = 1;

diff --git a/src/unmime.c b/src/unmime.c
index 1ba54c1f20c1f018bea5c8d0e2452bda4e542205..eeba2afa6c08640f6e96adf9aaf43980caf10d76 100644 (file)
--- a/src/unmime.c
+++ b/src/unmime.c
@@ -26,7 +26,7 @@
 #include <ctype.h>
 
 #include "codeconv.h"
 #include <ctype.h>
 
 #include "codeconv.h"

-#include "base64.h"
+#include "common/base64.h"

 
 #define ENCODED_WORD_BEGIN     "=?"
 #define ENCODED_WORD_END       "?="
 
 #define ENCODED_WORD_BEGIN     "=?"
 #define ENCODED_WORD_END       "?="