callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert last change; it causes problems for pastes from other applications;

Browse Source 
Sat Mar 13 10:34:03 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktextview.c gtk/gtktextbuffer.c: Revert last change;
        it causes problems for pastes from other applications; see
        comments in bugzilla for #81880.
This commit is contained in:
Owen Taylor
2004-03-13 15:37:18 +00:00
committed by Owen Taylor
parent 87a67ac619
commit fe3558c786
7 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtktextbuffer.c
View File

@ -2936,8 +2936,6 @@ pre_paste_prep (ClipboardRequest *request_data,
if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
*insert_point = start;
}
gtk_text_buffer_move_mark_by_name (buffer, "insert", insert_point);
}
static void

19
gtk/gtktextview.c
View File

@ -3931,7 +3931,6 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
else if (event->button == 2)
{
GtkTextIter iter;
GtkTextMark *mark;
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&iter,
@ -3939,21 +3938,9 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
event->y + text_view->yoffset);
gtk_text_buffer_paste_clipboard (get_buffer (text_view),
gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY),
&iter,
text_view->editable);
mark = gtk_text_buffer_get_mark (get_buffer (text_view), "insert");
gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
&iter,
mark);
gtk_text_buffer_place_cursor (get_buffer (text_view), &iter);
DV(g_print (G_STRLOC": scrolling onscreen\n"));
gtk_text_view_scroll_mark_onscreen (text_view,
gtk_text_buffer_get_mark (get_buffer (text_view),
"insert"));
gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY),
&iter,
text_view->editable);
return TRUE;
}
else if (event->button == 3)