2006-05-17 [wwp] 2.2.0cvs25

	* src/plugins/demo/demo.c
		updated product name in plugin demo (many plugins need to be
		sync'ed w/ that change).

diff --git a/ChangeLog b/ChangeLog
index dea9452c363812d022ced45b9646a3f7bd7a880d..c0bc1b855a4280a869af23853efbc6a468dfbdef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-17 [wwp]       2.2.0cvs25
+
+       * src/plugins/demo/demo.c
+               updated product name in plugin demo (many plugins need to be
+               sync'ed w/ that change).
+
 2006-05-17 [colin]     2.2.0cvs24
 
        * src/mh.c

diff --git a/PATCHSETS b/PATCHSETS
index 752f6bcc34ac4013da34bca6d4f2cda37caea1e1..37fdd11d131db399b8c9e7f55d1572ab3b9c58a6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1494,3 +1494,4 @@
 ( cvs diff -u -r 1.274.2.111 -r 1.274.2.112 src/mainwindow.c;  ) > 2.2.0cvs22.patchset
 ( cvs diff -u -r 1.274.2.112 -r 1.274.2.114 src/mainwindow.c;  ) > 2.2.0cvs23.patchset
 ( cvs diff -u -r 1.79.2.26 -r 1.79.2.27 src/mh.c;  ) > 2.2.0cvs24.patchset
+( cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/plugins/demo/demo.c;  ) > 2.2.0cvs25.patchset

diff --git a/configure.ac b/configure.ac
index ba4f7bd540ddabb355a69f45b607b0af536fb47f..ef88c6dc2cb98764354ef79336c395e56ea2d5ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index c58c31b3654a975839f559860e038b2ef9b4c802..2766372dbfed47945b7505e6a70e20d58dfea8bf 100644 (file)
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -42,12 +42,12 @@ static guint hook_id;
 gint plugin_init(gchar **error)
 {
        if ((sylpheed_get_version() > VERSION_NUMERIC)) {
-               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+               *error = g_strdup("Your sylpheed-claws version is newer than the version the plugin was built with");
                return -1;
        }
 
        if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 8, 11, 39))) {
-               *error = g_strdup("Your sylpheed version is too old");
+               *error = g_strdup("Your sylpheed-claws version is too old");
                return -1;
        }