2007-04-23 [colin] 2.9.1cvs15

* src/compose.c
		Fix bug 1196, 'Edit>Select All doesn't work' (Maemo)
This commit is contained in:
Colin Leroy 2007-04-23 16:15:16 +00:00
parent 18792d122b
commit fc5f11b372
4 changed files with 37 additions and 13 deletions

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -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);
}