fix 547
authorColin Leroy <colin@colino.net>
Sat, 24 Jul 2004 14:12:25 +0000 (14:12 +0000)
committerColin Leroy <colin@colino.net>
Sat, 24 Jul 2004 14:12:25 +0000 (14:12 +0000)
ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/prefs_msg_colors.c

index dfa93fefcea8a3a0412a62e1a078254990e74dd9..cd65b206feeb4c72b5fd66fc2152da98818f23b5 100644 (file)
@@ -1,3 +1,9 @@
+2004-07-24 [colin]     0.9.12cvs33.18
+
+       * src/prefs_msg_colors.c
+               Fix prototype mismatch
+       (Fixes 547 void function cannot return value)
+
 2004-07-24 [colin]     0.9.12cvs33.17
 
        * src/mainwindow.c
index c14468759fc2e1a3fe498122bb4e9602623a66a9..e302ca140178627bd0a87b8a1ab3685267a3896b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -71,3 +71,4 @@
 ( cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/gtk/gtkaspell.c; ) > 0.9.12cvs33.15.patchset
 ( cvs diff -u -r 1.382.2.32 -r 1.382.2.33 src/compose.c; ) > 0.9.12cvs33.16.patchset
 ( cvs diff -u -r 1.274.2.11 -r 1.274.2.12 src/mainwindow.c; ) > 0.9.12cvs33.17.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_msg_colors.c; ) > 0.9.12cvs33.18.patchset
index 3c3a837653dd742502268e2cb24bdd228e1a9cf8..ca3e08529618d863cc3bc279bea688f1922b481a 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=33
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.17
+EXTRA_GTK2_VERSION=.18
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 88f4c6464333a91066f79b20f9be78fb0cf95ce2..d0ab9582daf262f16472a81ac0b4de577ce8303e 100644 (file)
@@ -60,7 +60,7 @@ typedef struct _MsgColorsPage
 
 static GtkWidget *color_dialog;
 
-static void prefs_quote_colors_key_pressed     (GtkWidget      *widget,
+static gboolean prefs_quote_colors_key_pressed (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
 static void quote_color_set_dialog             (GtkWidget      *widget,
@@ -69,7 +69,7 @@ static void quote_colors_set_dialog_ok                (GtkWidget      *widget,
                                                 gpointer        data);
 static void quote_colors_set_dialog_cancel     (GtkWidget      *widget,
                                                 gpointer        data);
-static void quote_colors_set_dialog_key_pressed        (GtkWidget      *widget,
+static gboolean quote_colors_set_dialog_key_pressed    (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
 static void set_button_bg_color                        (GtkWidget      *widget,
@@ -224,7 +224,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_msg_colors->page.widget = table;
 }
 
-static void prefs_quote_colors_key_pressed(GtkWidget *widget,
+static gboolean prefs_quote_colors_key_pressed(GtkWidget *widget,
                                           GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
@@ -338,7 +338,7 @@ static void quote_colors_set_dialog_cancel(GtkWidget *widget, gpointer data)
        gtk_widget_destroy(color_dialog);
 }
 
-static void quote_colors_set_dialog_key_pressed(GtkWidget *widget,
+static gboolean quote_colors_set_dialog_key_pressed(GtkWidget *widget,
                                                GdkEventKey *event,
                                                gpointer data)
 {