CVS: sylpheedclaws/sylpheed-claws Makefile.am,1.24.2.19,1.24.2.20 PATCHSETS,1.1.2.2204,1.1.2.2205 ChangeLog,1.396.2.1307,1.396.2.1308 configure.ac,1.654.2.2247,1.654.2.2248

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws
In directory sunsite.dk:/tmp/cvs-serv12102

Modified Files:
      Tag: gtk2
	Makefile.am PATCHSETS ChangeLog configure.ac 
Log Message:
2006-12-28 [colin]	2.6.1cvs86

	* Makefile.am
		Fix desktop/icon simplification

Index: Makefile.am
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/Makefile.am,v
retrieving revision 1.24.2.19
retrieving revision 1.24.2.20
diff -u -d -r1.24.2.19 -r1.24.2.20
--- Makefile.am	2006/12/28 17:11:39	1.24.2.19
+++ Makefile.am	2006/12/28 17:58:45	1.24.2.20
@@ -39,14 +39,6 @@
                 echo "***   $(gtk_update_icon_cache)";			\
 		echo "***";						\
         fi
-
-else
-if CLAWS_GNOME
-pixmapdir=$(gnomedatadir)/pixmaps
-pixmap_DATA=claws-mail.png
-gnomapdir=$(gnomedatadir)/gnome/apps/Internet
-gnomap_DATA=claws-mail.desktop
-endif
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig

Index: PATCHSETS
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/PATCHSETS,v
retrieving revision 1.1.2.2204
retrieving revision 1.1.2.2205
diff -u -d -r1.1.2.2204 -r1.1.2.2205
--- PATCHSETS	2006/12/28 17:11:39	1.1.2.2204
+++ PATCHSETS	2006/12/28 17:58:45	1.1.2.2205
@@ -2193,3 +2193,4 @@
 ( cvs diff -u -r 1.52.2.30 -r 1.52.2.31 src/prefs_folder_item.c;  ) > 2.6.1cvs83.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/claws.def;  ) > 2.6.1cvs84.patchset
 ( cvs diff -u -r 1.24.2.18 -r 1.24.2.19 Makefile.am;  ) > 2.6.1cvs85.patchset
+( cvs diff -u -r 1.24.2.19 -r 1.24.2.20 Makefile.am;  ) > 2.6.1cvs86.patchset

Index: ChangeLog
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/ChangeLog,v
retrieving revision 1.396.2.1307
retrieving revision 1.396.2.1308
diff -u -d -r1.396.2.1307 -r1.396.2.1308
--- ChangeLog	2006/12/28 17:11:41	1.396.2.1307
+++ ChangeLog	2006/12/28 17:58:46	1.396.2.1308
@@ -1,3 +1,8 @@
+2006-12-28 [colin]	2.6.1cvs86
+
+	* Makefile.am
+		Fix desktop/icon simplification
+
 2006-12-28 [colin]	2.6.1cvs85
 
 	* Makefile.am

Index: configure.ac
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/configure.ac,v
retrieving revision 1.654.2.2247
retrieving revision 1.654.2.2248
diff -u -d -r1.654.2.2247 -r1.654.2.2248
--- configure.ac	2006/12/28 17:11:46	1.654.2.2247
+++ configure.ac	2006/12/28 17:58:49	1.654.2.2248
@@ -11,7 +11,7 @@
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=85
+EXTRA_VERSION=86
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=