From 76129c715c6038821afafa1bcdc6974c4fec7ae5 Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 22 May 2004 14:21:27 +0000 Subject: [PATCH] Fix indentation after Richard B's patch in rev 1.137 [r3409]. git-svn-id: svn://svn.tartarus.org/sgt/putty@4241 cda61777-01e9-0310-a592-d414129be87e --- unix/pterm.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/unix/pterm.c b/unix/pterm.c index 483122ad..c52b9208 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -1591,34 +1591,35 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata, charset = CS_ISO8859_1; free_required = 1; } else { - /* - * Convert COMPOUND_TEXT into UTF-8. - */ - if (seldata->type == compound_text_atom) { - tp.value = seldata->data; - tp.encoding = (Atom) seldata->type; - tp.format = seldata->format; - tp.nitems = seldata->length; - ret = Xutf8TextPropertyToTextList(GDK_DISPLAY(), &tp, &list, &count); - if (ret != 0 || count != 1) { - /* - * Compound text failed; fall back to STRING. - */ - gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, - GDK_SELECTION_TYPE_STRING, - inst->input_event_time); - return; + /* + * Convert COMPOUND_TEXT into UTF-8. + */ + if (seldata->type == compound_text_atom) { + tp.value = seldata->data; + tp.encoding = (Atom) seldata->type; + tp.format = seldata->format; + tp.nitems = seldata->length; + ret = Xutf8TextPropertyToTextList(GDK_DISPLAY(), &tp, + &list, &count); + if (ret != 0 || count != 1) { + /* + * Compound text failed; fall back to STRING. + */ + gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY, + GDK_SELECTION_TYPE_STRING, + inst->input_event_time); + return; + } + text = list[0]; + length = strlen(list[0]); + charset = CS_UTF8; + free_list_required = 1; + } else { + text = (char *)seldata->data; + length = seldata->length; + charset = (seldata->type == utf8_string_atom ? + CS_UTF8 : inst->ucsdata.line_codepage); } - text = list[0]; - length = strlen(list[0]); - charset = CS_UTF8; - free_list_required = 1; - } else { - text = (char *)seldata->data; - length = seldata->length; - charset = (seldata->type == utf8_string_atom ? - CS_UTF8 : inst->ucsdata.line_codepage); - } } if (inst->pastein_data) -- 2.11.0