2004-11-23 [colin] 0.9.12cvs158.7
authorColin Leroy <colin@colino.net>
Tue, 23 Nov 2004 07:46:15 +0000 (07:46 +0000)
committerColin Leroy <colin@colino.net>
Tue, 23 Nov 2004 07:46:15 +0000 (07:46 +0000)
* src/compose.c
Fix some signal handlers' prototypes
Spotted by Alfons

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c

index f988803..6d5a586 100644 (file)
@@ -1,3 +1,9 @@
+2004-11-23 [colin]     0.9.12cvs158.7
+
+       * src/compose.c
+               Fix some signal handlers' prototypes
+               Spotted by Alfons
+
 2004-11-22 [colin]     0.9.12cvs158.6
 
        * src/compose.c
index cb75459..1cd131a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.69 -r 1.382.2.70 src/compose.c; ) > 0.9.12cvs158.4.patchset
 ( cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/prefs_themes.c; ) > 0.9.12cvs158.5.patchset
 ( cvs diff -u -r 1.382.2.70 -r 1.382.2.71 src/compose.c; ) > 0.9.12cvs158.6.patchset
+( cvs diff -u -r 1.382.2.71 -r 1.382.2.72 src/compose.c; ) > 0.9.12cvs158.7.patchset
index 0e75f5b..b363248 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=158
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.6
+EXTRA_GTK2_VERSION=.7
 
 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 ed0d0a8..993fb9e 100644 (file)
@@ -377,9 +377,9 @@ static void compose_allsel_cb               (Compose        *compose);
 static void compose_advanced_action_cb (Compose                   *compose,
                                         ComposeCallAdvancedAction  action);
 
-static gboolean compose_grab_focus_cb  (GtkWidget      *widget,
+static void compose_grab_focus_cb      (GtkWidget      *widget,
                                         Compose        *compose);
-static gboolean compose_grab_focus_before_cb   (GtkWidget      *widget,
+static void compose_grab_focus_before_cb(GtkWidget     *widget,
                                         Compose        *compose);
 
 static void compose_changed_cb         (GtkTextBuffer  *textbuf,
@@ -6910,7 +6910,7 @@ static void compose_advanced_action_cb(Compose *compose,
 
 static gchar *cliptext = NULL;
 
-static gboolean compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
+static void compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
 {
        gchar *str = NULL;
        GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
@@ -6918,11 +6918,9 @@ static gboolean compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose
                g_free(cliptext);
        if (gtk_clipboard_wait_is_text_available(clip))
                cliptext = gtk_clipboard_wait_for_text(clip);
-       
-       return FALSE;
 }
 
-static gboolean compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
+static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 {
        gchar *str = NULL;
        GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
@@ -6938,8 +6936,6 @@ static gboolean compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 
        if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
                compose->focused_editable = widget;
-       
-       return TRUE;
 }
 
 static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)