2004-11-23 [colin] 0.9.12cvs158.7

	* src/compose.c
		Fix some signal handlers' prototypes
		Spotted by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f988803a4c6dd9df056690cd92d6ad417e4c2c76..6d5a586bfce3b4bb77e09f52688e78f254d30926 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -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
 2004-11-22 [colin]     0.9.12cvs158.6
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index cb75459e65552cdd6086517fd5b67ab91efa210a..1cd131a7dbcc2a41f2ae002e85ae6eb2192a6d82 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -252,3 +252,4 @@
 ( 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.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

diff --git a/configure.ac b/configure.ac
index 0e75f5bbb2e46fa6169e7a674b3c8e7cfe98aec5..b363248a6e0c30b03b2a0eeffd7aefef670475aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=158
 EXTRA_RELEASE=
 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}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index ed0d0a8f6c2cfff6d4c8797c6f49af8f353966a9..993fb9e2e1453cf8b657cfc5e1678fcb4eb89121 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -377,9 +377,9 @@ static void compose_allsel_cb               (Compose        *compose);
 static void compose_advanced_action_cb (Compose                   *compose,
                                         ComposeCallAdvancedAction  action);
 
 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);
                                         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,
                                         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 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));
 {
        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);
                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));
 {
        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;
 
        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)
 }
 
 static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)