2004-12-14 [colin] 0.9.13cvs18

	* src/gtk/prefswindow.c
		Fix build. Sorry :)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 567067972fb2d56e3096dfdc29f11e5b1488edc9..26fb1cc7a7f65e97579ebeed522bb0f3f6b3fb4a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-12-14 [colin]     0.9.13cvs18
+
+       * src/gtk/prefswindow.c
+               Fix build. Sorry :)
+

 2004-12-14 [colin]     0.9.13cvs17
 
        * src/gtk/gtkutils.c
 2004-12-14 [colin]     0.9.13cvs17
 
        * src/gtk/gtkutils.c

diff --git a/PATCHSETS b/PATCHSETS
index 18abd066404edd06647b69fdd918bbebca78e3b7..8bc0e16d597d36595616cbadcb3e92bf90b1fd50 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -187,3 +187,4 @@
 ( cvs diff -u -r 1.8 -r 1.9 src/plugins/spamassassin/libspamc.c; ) > 0.9.13cvs15.patchset
 ( cvs diff -u -r 1.449 -r 1.450 ChangeLog; cvs diff -u -r 1.444 -r 1.445 ChangeLog.jp; cvs diff -u -r 1.18 -r 1.19 src/action.c; cvs diff -u -r 1.463 -r 1.464 src/compose.c; cvs diff -u -r 1.60 -r 1.61 src/common/utils.c; ) > 0.9.13cvs16.patchset
 ( cvs diff -u -r 1.7 -r 1.8 src/gtk/gtkutils.c; cvs diff -u -r 1.6 -r 1.7 src/gtk/gtkutils.h; cvs diff -u -r 1.18 -r 1.19 src/gtk/prefswindow.c; ) > 0.9.13cvs17.patchset
 ( cvs diff -u -r 1.8 -r 1.9 src/plugins/spamassassin/libspamc.c; ) > 0.9.13cvs15.patchset
 ( cvs diff -u -r 1.449 -r 1.450 ChangeLog; cvs diff -u -r 1.444 -r 1.445 ChangeLog.jp; cvs diff -u -r 1.18 -r 1.19 src/action.c; cvs diff -u -r 1.463 -r 1.464 src/compose.c; cvs diff -u -r 1.60 -r 1.61 src/common/utils.c; ) > 0.9.13cvs16.patchset
 ( cvs diff -u -r 1.7 -r 1.8 src/gtk/gtkutils.c; cvs diff -u -r 1.6 -r 1.7 src/gtk/gtkutils.h; cvs diff -u -r 1.18 -r 1.19 src/gtk/prefswindow.c; ) > 0.9.13cvs17.patchset

+( cvs diff -u -r 1.19 -r 1.20 src/gtk/prefswindow.c; ) > 0.9.13cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 3bcbb1d30d0317e37d5fed0a429f68684470ae94..acda20696934f72842fadc43a1e384bd4f49366f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=17
+EXTRA_VERSION=18

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index b6630f4ab89d4d32b1cb2132a6f1bd41ae641a57..42f6dcd24e55c6edd52d29d49f41d15bb84a2910 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -207,7 +207,7 @@ gint compare_func(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 }
 
 static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
 }
 
 static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,

-                                   gpointer data)
+                                       PrefsWindow *data)

 {
        GtkWidget *focused_child;
        
 {
        GtkWidget *focused_child;