0.8.6claws56

* src/Makefile.am
* src/md5.[ch]                  ** REMOVE **
* srm/common/Makefile.am
* src/common/md5.[ch]           ** NEW **
        move md5 files to common directory

* src/gtkstext.c
        remove not required #include

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0b3ec487c8dc2f1642ece9911f6897b41e08232b..7398210a6b03b212243f797a795fa2cae75355ce 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2002-12-03 [christoph] 0.8.6claws56
+
+       * src/Makefile.am
+       * src/md5.[ch]                  ** REMOVE **
+       * srm/common/Makefile.am
+       * src/common/md5.[ch]           ** NEW **
+               move md5 files to common directory
+
+       * src/gtkstext.c
+               remove not required #include
+

 2002-12-03 [sergey]    0.8.6claws55
 
        * src/gtkutils.c
 2002-12-03 [sergey]    0.8.6claws55
 
        * src/gtkutils.c

diff --git a/configure.in b/configure.in
index 0336ea4a5f2b6e7bf22cb633722e1057bfe0117e..d5122d4e86079764db4aa1fe8f5fe459978f0f96 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=claws55
+EXTRA_VERSION=claws56

 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 04e73d7ae024cbbc247026877eaffe01eed01260..78ecb7f40ed662d50c0eebd6c37255e8290931af 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,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 \

-       md5.c md5.h \

        ssl_certificate.c ssl_certificate.h \
        ssl_manager.c ssl_manager.h \
        automaton.c automaton.h \
        ssl_certificate.c ssl_certificate.h \
        ssl_manager.c ssl_manager.h \
        automaton.c automaton.h \

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 6601deeef5d0827defe53d8f10abead59b0552b9..a8d41fdc637a762253644c9dc371cb02325ea799 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,13 +1,14 @@
 noinst_LTLIBRARIES = libsylpheedcommon.la
 
 libsylpheedcommon_la_SOURCES = \
 noinst_LTLIBRARIES = libsylpheedcommon.la
 
 libsylpheedcommon_la_SOURCES = \

-       utils.c utils.h \
-       hooks.c hooks.h \

        base64.c base64.h \
        base64.c base64.h \

-       uuencode.c uuencode.h \
+       hooks.c hooks.h \
+       log.c log.h \
+       md5.c md5.h \

        socket.c socket.h \
        ssl.c ssl.h \
        socket.c socket.h \
        ssl.c ssl.h \

-       log.c log.h
+       utils.c utils.h \
+       uuencode.c uuencode.h

 
 INCLUDES = \
        $(GLIB_CFLAGS)
 
 INCLUDES = \
        $(GLIB_CFLAGS)

diff --git a/src/md5.c b/src/common/md5.c
similarity index 99%
rename from src/md5.c
rename to src/common/md5.c
index 465cbf0dd9c02f74460d75c2efdcc2d47a219068..f9eeff9cb7ad6af7ab4dcc475fc03cf53e3955b2 100644 (file)
--- a/src/md5.c
+++ b/src/common/md5.c
@@ -36,10 +36,8 @@
 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>
 

-#include "utils.h"

 #include "md5.h"
 
 #include "md5.h"
 

-

 /****************
  * Rotate a 32 bit integer by n bytes
  */
 /****************
  * Rotate a 32 bit integer by n bytes
  */

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

diff --git a/src/gtkstext.c b/src/gtkstext.c
index 70cde2676f9f02c7de8f1acbb4d2bd3382aa8977..d05a61f27d4446550ae53420ab9f3e74012bd908 100644 (file)
--- a/src/gtkstext.c
+++ b/src/gtkstext.c
@@ -42,7 +42,7 @@
 #include <gtk/gtkselection.h>
 #include <gtk/gtksignal.h>
 
 #include <gtk/gtkselection.h>
 #include <gtk/gtksignal.h>
 

-#include "compose.h"
+/* #include "compose.h" */

 #include "gtkstext.h"
 #include "gtkutils.h"
 
 #include "gtkstext.h"
 #include "gtkutils.h"