CVS: sylpheedclaws/sylpheed-claws/src/plugins/trayicon trayicon.c,1.14.2.40.2.1,1.14.2.40.2.2

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/trayicon
In directory sunsite.dk:/tmp/cvs-serv28725/src/plugins/trayicon

Modified Files:
      Tag: stable_2_6
	trayicon.c 
Log Message:
2006-12-04 [paul]	2.6.0cvs25-stable

	* ChangeLog
	* Makefile.am
	* configure.ac
	* m4/aclocal-include.m4
	* m4/check-type.m4
	* src/Makefile.am
	* src/addr_compl.c
	* src/compose.c
	* src/crash.c
	* src/export.c
	* src/exporthtml.c
	* src/exportldif.c
	* src/imap.c
	* src/import.c
	* src/main.c
	* src/main.h
	* src/matcher.c
	* src/mimeview.c
	* src/procmsg.c
	* src/common/Makefile.am
	* src/common/claws.c
	* src/common/claws.h
	* src/common/ssl.c
	* src/common/sylpheed.c
	* src/common/sylpheed.h
	* src/etpan/Makefile.am
	* src/gtk/Makefile.am
	* src/gtk/claws-marshal.list
	* src/gtk/filesel.c
	* src/gtk/gtksctree.c
	* src/gtk/quicksearch.c
	* src/gtk/sylpheed-marshal.list
	* src/plugins/bogofilter/bogofilter.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/clamav/clamav_plugin.c
	* src/plugins/clamav/clamav_plugin_gtk.c
	* src/plugins/demo/demo.c
	* src/plugins/dillo_viewer/dillo_viewer.c
	* src/plugins/pgpcore/Makefile.am
	* src/plugins/pgpcore/claws.def
	* src/plugins/pgpcore/pgp_viewer.c
	* src/plugins/pgpcore/plugin.c
	* src/plugins/pgpcore/sylpheed.def
	* src/plugins/pgpinline/Makefile.am
	* src/plugins/pgpinline/claws.def
	* src/plugins/pgpinline/plugin.c
	* src/plugins/pgpinline/sylpheed.def
	* src/plugins/pgpmime/Makefile.am
	* src/plugins/pgpmime/claws.def
	* src/plugins/pgpmime/plugin.c
	* src/plugins/pgpmime/sylpheed.def
	* src/plugins/spamassassin/spamassassin.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
		backport from 2.6.0cvs64:
		yet more renaming 

Index: trayicon.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/trayicon/trayicon.c,v
retrieving revision 1.14.2.40.2.1
retrieving revision 1.14.2.40.2.2
diff -u -d -r1.14.2.40.2.1 -r1.14.2.40.2.2
--- trayicon.c	2006/11/24 13:14:27	1.14.2.40.2.1
+++ trayicon.c	2006/12/04 14:22:41	1.14.2.40.2.2
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "common/sylpheed.h"
+#include "common/claws.h"
 #include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
@@ -295,7 +295,6 @@
 		G_CALLBACK(click_cb), NULL);
 
 	tooltips = gtk_tooltips_new();
-	gtk_tooltips_set_delay(tooltips, 1000);
 	gtk_tooltips_enable(tooltips);
 
 	n_entries = sizeof(trayicon_popup_menu_entries) /
@@ -311,12 +310,12 @@
 
 int plugin_init(gchar **error)
 {
-	if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+	if ((claws_get_version() > VERSION_NUMERIC)) {
 		*error = g_strdup(_("Your version of Claws Mail is newer than the version the Trayicon plugin was built with"));
 		return -1;
 	}
 
-	if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+	if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
 		*error = g_strdup(_("Your version of Claws Mail is too old for the Trayicon plugin"));
 		return -1;
 	}
@@ -350,7 +349,7 @@
 	hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, folder_hook_id);
 	hooks_unregister_hook(OFFLINE_SWITCH_HOOKLIST, offline_hook_id);
 
-	if (sylpheed_is_exiting())
+	if (claws_is_exiting())
 		return;
 
 	g_signal_handler_disconnect(G_OBJECT(trayicon), destroy_signal_id);