CVS: sylpheedclaws/sylpheed-claws/src/gtk claws-marshal.list,NONE,1.1.4.1 Makefile.am,1.20.2.9.4.1,1.20.2.9.4.2 filesel.c,1.2.2.25.4.1,1.2.2.25.4.2 gtksctree.c,1.1.4.34.2.1,1.1.4.34.2.2 quicksearch.c,1.1.2.50.2.1,1.1.2.50.2.2 sylpheed-marshal.list,1.1.2.1,NONE
[email protected] Mon, 04 Dec 2006 14:22:16 +0000
Newsgroups
gmane.mail.sylpheed.claws.cvs
Message-ID
<[email protected] >
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk
In directory sunsite.dk:/tmp/cvs-serv28725/src/gtk
Modified Files:
Tag: stable_2_6
Makefile.am filesel.c gtksctree.c quicksearch.c
Added Files:
Tag: stable_2_6
claws-marshal.list
Removed Files:
Tag: stable_2_6
sylpheed-marshal.list
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
--- NEW FILE: claws-marshal.list ---
NONE:POINTER
NONE:INT,POINTER
Index: Makefile.am
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk/Makefile.am,v
retrieving revision 1.20.2.9.4.1
retrieving revision 1.20.2.9.4.2
diff -u -d -r1.20.2.9.4.1 -r1.20.2.9.4.2
--- Makefile.am 2006/11/24 10:52:57 1.20.2.9.4.1
+++ Makefile.am 2006/12/04 14:22:10 1.20.2.9.4.2
@@ -1,11 +1,11 @@
PLUGINDIR = $(pkglibdir)/plugins/
-noinst_LTLIBRARIES = libsylpheedgtk.la
+noinst_LTLIBRARIES = libclawsgtk.la
EXTRA_DIST = \
- sylpheed-marshal.list
+ claws-marshal.list
-libsylpheedgtk_la_SOURCES = \
+libclawsgtk_la_SOURCES = \
about.c \
colorlabel.c \
colorsel.c \
@@ -30,10 +30,10 @@
progressdialog.c \
quicksearch.c \
sslcertwindow.c \
- sylpheed-marshal.c
+ claws-marshal.c
-sylpheedgtkincludedir = $(pkgincludedir)/gtk
-sylpheedgtkinclude_HEADERS = \
+clawsgtkincludedir = $(pkgincludedir)/gtk
+clawsgtkinclude_HEADERS = \
about.h \
authors.h \
colorlabel.h \
@@ -60,7 +60,7 @@
progressdialog.h \
quicksearch.h \
sslcertwindow.h \
- sylpheed-marshal.h
+ claws-marshal.h
AM_CPPFLAGS = \
-I$(srcdir)/../common \
@@ -71,16 +71,16 @@
$(GNOMEPRINT_CFLAGS) \
-DPLUGINDIR=\"$(PLUGINDIR)\"
-libsylpheedgtk_la_LIBADD = \
- ../common/libsylpheedcommon.la \
+libclawsgtk_la_LIBADD = \
+ ../common/libclawscommon.la \
$(GTK_LIBS) \
$(ASPELL_LIBS) \
$(GNOMEPRINT_LIBS)
-BUILT_SOURCES=sylpheed-marshal.c sylpheed-marshal.h
+BUILT_SOURCES=claws-marshal.c claws-marshal.h
-sylpheed-marshal.h: sylpheed-marshal.list
- $(GLIB_GENMARSHAL) $< --header --prefix=sylpheed_marshal > $@
+claws-marshal.h: claws-marshal.list
+ $(GLIB_GENMARSHAL) $< --header --prefix=claws_marshal > $@
-sylpheed-marshal.c: sylpheed-marshal.list
- $(GLIB_GENMARSHAL) $< --body --prefix=sylpheed_marshal > $@
+claws-marshal.c: claws-marshal.list
+ $(GLIB_GENMARSHAL) $< --body --prefix=claws_marshal > $@
Index: filesel.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk/filesel.c,v
retrieving revision 1.2.2.25.4.1
retrieving revision 1.2.2.25.4.2
diff -u -d -r1.2.2.25.4.1 -r1.2.2.25.4.2
--- filesel.c 2006/11/24 13:13:19 1.2.2.25.4.1
+++ filesel.c 2006/12/04 14:22:10 1.2.2.25.4.2
@@ -34,7 +34,7 @@
#include <gtk/gtkfilechooser.h>
#include <gtk/gtkfilechooserdialog.h>
-#include "sylpheed.h"
+#include "claws.h"
#include "filesel.h"
#include "manage_window.h"
#include "gtkutils.h"
Index: gtksctree.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk/gtksctree.c,v
retrieving revision 1.1.4.34.2.1
retrieving revision 1.1.4.34.2.2
diff -u -d -r1.1.4.34.2.1 -r1.1.4.34.2.2
--- gtksctree.c 2006/11/24 13:13:21 1.1.4.34.2.1
+++ gtksctree.c 2006/12/04 14:22:10 1.1.4.34.2.2
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include "gtksctree.h"
-#include "sylpheed-marshal.h"
+#include "claws-marshal.h"
#include "stock_pixmap.h"
#include "prefs_common.h"
#include "utils.h"
@@ -1326,7 +1326,7 @@
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkSCTreeClass, row_popup_menu),
NULL, NULL,
- sylpheed_marshal_VOID__POINTER,
+ claws_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
GDK_TYPE_EVENT);
sctree_signals[EMPTY_POPUP_MENU] =
@@ -1335,7 +1335,7 @@
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkSCTreeClass, empty_popup_menu),
NULL, NULL,
- sylpheed_marshal_VOID__POINTER,
+ claws_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
GDK_TYPE_EVENT);
sctree_signals[OPEN_ROW] =
@@ -1352,7 +1352,7 @@
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkSCTreeClass, start_drag),
NULL, NULL,
- sylpheed_marshal_VOID__INT_POINTER,
+ claws_marshal_VOID__INT_POINTER,
G_TYPE_NONE, 2,
G_TYPE_INT,
GDK_TYPE_EVENT);
Index: quicksearch.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/gtk/quicksearch.c,v
retrieving revision 1.1.2.50.2.1
retrieving revision 1.1.2.50.2.2
diff -u -d -r1.1.2.50.2.1 -r1.1.2.50.2.2
--- quicksearch.c 2006/11/24 13:13:26 1.1.2.50.2.1
+++ quicksearch.c 2006/12/04 14:22:11 1.1.2.50.2.2
@@ -38,7 +38,7 @@
#include "folderview.h"
#include "folder.h"
#include "prefs_matcher.h"
-#include "sylpheed.h"
+#include "claws.h"
#include "statusbar.h"
struct _QuickSearch
--- sylpheed-marshal.list DELETED ---