Silently return if a drag is already in progress, rather than asserting.
2006-12-20 Matthias Clasen <mclasen@redhat.com> * gtk/gtktextview.c (gtk_text_view_start_selection_drag): Silently return if a drag is already in progress, rather than asserting. (#335622, Li Yuan, testcase by Erwann Chenede)
This commit is contained in:
		
				
					committed by
					
						
						Matthias Clasen
					
				
			
			
				
	
			
			
			
						parent
						
							2dc9ec7c43
						
					
				
				
					commit
					10ae5ad60f
				
			@ -1,5 +1,9 @@
 | 
				
			|||||||
2006-12-20  Matthias Clasen  <mclasen@redhat.com>
 | 
					2006-12-20  Matthias Clasen  <mclasen@redhat.com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* gtk/gtktextview.c (gtk_text_view_start_selection_drag):
 | 
				
			||||||
 | 
						Silently return if a drag is already in progress, rather
 | 
				
			||||||
 | 
						than asserting.  (#335622, Li Yuan, testcase by Erwann Chenede)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
 | 
						* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
 | 
				
			||||||
	Allow any GtkDialog that implements GtkFileChooser as
 | 
						Allow any GtkDialog that implements GtkFileChooser as
 | 
				
			||||||
	dialog.  (#335473, Tommi Komulainen)
 | 
						dialog.  (#335473, Tommi Komulainen)
 | 
				
			||||||
 | 
				
			|||||||
@ -5768,7 +5768,8 @@ gtk_text_view_start_selection_drag (GtkTextView       *text_view,
 | 
				
			|||||||
  GtkTextBuffer *buffer;
 | 
					  GtkTextBuffer *buffer;
 | 
				
			||||||
  SelectionData *data;
 | 
					  SelectionData *data;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  g_assert (text_view->selection_drag_handler == 0);
 | 
					  if (text_view->selection_drag_handler != 0)
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  data = g_new0 (SelectionData, 1);
 | 
					  data = g_new0 (SelectionData, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user