2007-03-21 [colin] 2.8.1cvs35

	* configure.ac
		Fix previous commit
	* claws-mail.desktop
		Remove .png from the Icon, it's useless

diff --git a/ChangeLog b/ChangeLog
index c35b876bf32bd1fafcb074e1202822640d30d32f..5282b6353a36d7df89b0091f95c5a20b5598e02c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-21 [colin]     2.8.1cvs35
+
+       * configure.ac
+               Fix previous commit
+       * claws-mail.desktop
+               Remove .png from the Icon, it's useless
+

 2007-03-21 [colin]     2.8.1cvs34
 
        * configure.ac
 2007-03-21 [colin]     2.8.1cvs34
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 03a8ae067607061b7dfd220c14dc9c96d516faff..c3530db1dd97e81fe0e4d0bc07dcd1d9f0d655c0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2451,3 +2451,4 @@
 ( diff -u /dev/null claws-mail-40x40.png;  diff -u /dev/null claws-mail-26x26.png;  cvs diff -u -r 1.61.2.60 -r 1.61.2.61 src/account.c;  cvs diff -u -r 1.60.2.83 -r 1.60.2.84 src/addressbook.c;  cvs diff -u -r 1.382.2.361 -r 1.382.2.362 src/compose.c;  cvs diff -u -r 1.207.2.152 -r 1.207.2.153 src/folderview.c;  cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/folderview.h;  cvs diff -u -r 1.115.2.145 -r 1.115.2.146 src/main.c;  cvs diff -u -r 1.274.2.178 -r 1.274.2.179 src/mainwindow.c;  cvs diff -u -r 1.39.2.34 -r 1.39.2.35 src/mainwindow.h;  cvs diff -u -r 1.94.2.127 -r 1.94.2.128 src/messageview.c;  cvs diff -u -r 1.105.2.88 -r 1.105.2.89 src/prefs_account.c;  cvs diff -u -r 1.204.2.124 -r 1.204.2.125 src/prefs_common.c;  cvs diff -u -r 1.15.2.44 -r 1.15.2.45 src/summary_search.c;  cvs diff -u -r 1.395.2.287 -r 1.395.2.288 src/summaryview.c;  cvs diff -u -r 1.68.2.33 -r 1.68.2.34 src/summaryview.h;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/gtk/authors.h;  cvs diff -u -r 1.5.2.55 -r 1.5.2.56 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.32 -r 1.4.2.33 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/gtk/logwindow.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/menu.c;  cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/gtk/prefswindow.c;  ) > 2.8.1cvs32.patchset
 ( cvs diff -u -r 1.115.2.146 -r 1.115.2.147 src/main.c;  ) > 2.8.1cvs33.patchset
 ( cvs diff -u -r 1.654.2.2505 -r 1.654.2.2506 configure.ac;  cvs diff -u -r 1.155.2.55 -r 1.155.2.56 src/Makefile.am;  ) > 2.8.1cvs34.patchset
 ( diff -u /dev/null claws-mail-40x40.png;  diff -u /dev/null claws-mail-26x26.png;  cvs diff -u -r 1.61.2.60 -r 1.61.2.61 src/account.c;  cvs diff -u -r 1.60.2.83 -r 1.60.2.84 src/addressbook.c;  cvs diff -u -r 1.382.2.361 -r 1.382.2.362 src/compose.c;  cvs diff -u -r 1.207.2.152 -r 1.207.2.153 src/folderview.c;  cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/folderview.h;  cvs diff -u -r 1.115.2.145 -r 1.115.2.146 src/main.c;  cvs diff -u -r 1.274.2.178 -r 1.274.2.179 src/mainwindow.c;  cvs diff -u -r 1.39.2.34 -r 1.39.2.35 src/mainwindow.h;  cvs diff -u -r 1.94.2.127 -r 1.94.2.128 src/messageview.c;  cvs diff -u -r 1.105.2.88 -r 1.105.2.89 src/prefs_account.c;  cvs diff -u -r 1.204.2.124 -r 1.204.2.125 src/prefs_common.c;  cvs diff -u -r 1.15.2.44 -r 1.15.2.45 src/summary_search.c;  cvs diff -u -r 1.395.2.287 -r 1.395.2.288 src/summaryview.c;  cvs diff -u -r 1.68.2.33 -r 1.68.2.34 src/summaryview.h;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/gtk/authors.h;  cvs diff -u -r 1.5.2.55 -r 1.5.2.56 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.32 -r 1.4.2.33 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/gtk/logwindow.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/menu.c;  cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/gtk/prefswindow.c;  ) > 2.8.1cvs32.patchset
 ( cvs diff -u -r 1.115.2.146 -r 1.115.2.147 src/main.c;  ) > 2.8.1cvs33.patchset
 ( cvs diff -u -r 1.654.2.2505 -r 1.654.2.2506 configure.ac;  cvs diff -u -r 1.155.2.55 -r 1.155.2.56 src/Makefile.am;  ) > 2.8.1cvs34.patchset

+( cvs diff -u -r 1.654.2.2506 -r 1.654.2.2507 configure.ac;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-mail.desktop;  ) > 2.8.1cvs35.patchset

diff --git a/claws-mail.desktop b/claws-mail.desktop
index 684c6043ed5a486c30dae5095324740beac7579b..aec06b90425bd030dcde20dfc280629da4337687 100644 (file)
--- a/claws-mail.desktop
+++ b/claws-mail.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Claws Mail
 Exec=claws-mail
 Encoding=UTF-8
 Name=Claws Mail
 Exec=claws-mail

-Icon=claws-mail.png
+Icon=claws-mail

 Info="Claws Mail"
 Categories=GTK;Network;Email;
 Comment="Gtk+ based Mail Client"
 Info="Claws Mail"
 Categories=GTK;Network;Email;
 Comment="Gtk+ based Mail Client"

diff --git a/configure.ac b/configure.ac
index 0186d5264245fa5e4b21217ae487359baa868c65..19a1ee99699aeac9d1ee06affde8a4fd71fcf45e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=34
+EXTRA_VERSION=35

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -444,6 +444,8 @@ if test $ac_cv_enable_maemo = yes; then
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
                AC_MSG_ERROR(libosso or hildon-libs not found)
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
                AC_MSG_ERROR(libosso or hildon-libs not found)

+       else
+               AC_DEFINE(MAEMO, 1, Build for maemo)

        fi
 fi
 
        fi
 fi