2007-04-23 [colin] 2.9.1cvs15

	* src/compose.c
		Fix bug 1196, 'Edit>Select All doesn't work' (Maemo)

diff --git a/ChangeLog b/ChangeLog
index e3722ed6511861ae0af8493fd871866efbe27d3c..a58b6d4f68954c78029afc64857e714536b6a740 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-23 [colin]     2.9.1cvs15
+
+       * src/compose.c
+               Fix bug 1196, 'Edit>Select All doesn't work' (Maemo)
+
 2007-04-21 [colin]     2.9.1cvs14
 
        * src/gtk/quicksearch.c

diff --git a/PATCHSETS b/PATCHSETS
index ab5446c028b19274a48d6ffedf506db20170f254..f154955634d20f071d0b722174d6173ee1d090b7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2542,3 +2542,4 @@
 ( cvs diff -u -r 1.20.2.13 -r 1.20.2.14 src/gtk/Makefile.am;  ) > 2.9.1cvs12.patchset
 ( cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/gtk/quicksearch.c;  ) > 2.9.1cvs13.patchset
 ( cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/gtk/quicksearch.c;  ) > 2.9.1cvs14.patchset
+( cvs diff -u -r 1.382.2.372 -r 1.382.2.373 src/compose.c;  ) > 2.9.1cvs15.patchset

diff --git a/configure.ac b/configure.ac
index db4717cea08c7c636921b8a8b63b123555e085ec..ba82f5437001f9ab77e9e3740f491618ed5976bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 102302e4e9c6e678707fff22bfb585838febbcc7..f288636f285b30df609e6c0d18e3bfa9223a810e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8607,15 +8607,21 @@ static void entry_allsel(GtkWidget *entry)
 
 static void compose_cut_cb(Compose *compose)
 {
-       if (compose->focused_editable &&
-           GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+       if (compose->focused_editable 
+#ifndef MAEMO
+           && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+           )
                entry_cut_clipboard(compose->focused_editable);
 }
 
 static void compose_copy_cb(Compose *compose)
 {
-       if (compose->focused_editable &&
-           GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+       if (compose->focused_editable 
+#ifndef MAEMO
+           && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+           )
                entry_copy_clipboard(compose->focused_editable);
 }
 
@@ -8635,8 +8641,11 @@ static void compose_paste_cb(Compose *compose)
 static void compose_paste_as_quote_cb(Compose *compose)
 {
        gint wrap_quote = prefs_common.linewrap_quote;
-       if (compose->focused_editable &&
-           GTK_WIDGET_HAS_FOCUS(compose->focused_editable)) {
+       if (compose->focused_editable 
+#ifndef MAEMO
+           && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+           ) {
                /* let text_insert() (called directly or at a later time
                 * after the gtk_editable_paste_clipboard) know that 
                 * text is to be inserted as a quotation. implemented
@@ -8660,8 +8669,11 @@ static void compose_paste_no_wrap_cb(Compose *compose)
        gint prev_autowrap;
        GtkTextBuffer *buffer;
        BLOCK_WRAP();
-       if (compose->focused_editable &&
-           GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+       if (compose->focused_editable 
+#ifndef MAEMO
+           && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+           )
                entry_paste_clipboard(compose, compose->focused_editable, FALSE,
                        GDK_SELECTION_CLIPBOARD, NULL);
        UNBLOCK_WRAP();
@@ -8672,8 +8684,11 @@ static void compose_paste_wrap_cb(Compose *compose)
        gint prev_autowrap;
        GtkTextBuffer *buffer;
        BLOCK_WRAP();
-       if (compose->focused_editable &&
-           GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+       if (compose->focused_editable 
+#ifndef MAEMO
+           && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+           )
                entry_paste_clipboard(compose, compose->focused_editable, TRUE,
                        GDK_SELECTION_CLIPBOARD, NULL);
        UNBLOCK_WRAP();
@@ -8681,8 +8696,11 @@ static void compose_paste_wrap_cb(Compose *compose)
 
 static void compose_allsel_cb(Compose *compose)
 {
-       if (compose->focused_editable &&
-           GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+       if (compose->focused_editable 
+#ifndef MAEMO
+           && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+           )
                entry_allsel(compose->focused_editable);
 }