gtksourceview r1966 - in trunk: . gtksourceview

[muntyan svn gnome org]

Author: muntyan
Date: Fri Jun 20 02:36:25 2008
New Revision: 1966
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=1966&view=rev

Log:
2008-06-18  Yevgen Muntyan  <muntyan tamu edu>

	* gtksourceview/gtksourceview.c (gtk_source_view_undo),
        (gtk_source_view_redo), (gtk_source_view_populate_popup),
        (gtk_source_view_paint_margin): check whether the buffer
        is a GtkSourceBuffer, bug #139461.



Modified:
   trunk/ChangeLog
   trunk/gtksourceview/gtksourceview.c

Modified: trunk/gtksourceview/gtksourceview.c
==============================================================================
--- trunk/gtksourceview/gtksourceview.c	(original)
+++ trunk/gtksourceview/gtksourceview.c	Fri Jun 20 02:36:25 2008
@@ -882,6 +882,9 @@
 		view->priv->source_buffer = NULL;
 	}
 
+	/* if buffer isn't NULL then we aren't being destroyed, so call
+	 * gtk_source_view_update_style_scheme(), that will check whether it's
+	 * a GtkSourceBuffer or not */
 	if (buffer)
 		gtk_source_view_update_style_scheme (view);
 }
@@ -896,6 +899,7 @@
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
 	if (gtk_text_view_get_editable (GTK_TEXT_VIEW (view)) &&
+	    GTK_IS_SOURCE_BUFFER (buffer) &&
 	    gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER (buffer)))
 	{
 		gtk_source_buffer_undo (GTK_SOURCE_BUFFER (buffer));
@@ -914,6 +918,7 @@
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
 	if (gtk_text_view_get_editable (GTK_TEXT_VIEW (view)) &&
+	    GTK_IS_SOURCE_BUFFER (buffer) &&
 	    gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER (buffer)))
 	{
 		gtk_source_buffer_redo (GTK_SOURCE_BUFFER (buffer));
@@ -930,7 +935,7 @@
 	GtkWidget *menu_item;
 
 	buffer = gtk_text_view_get_buffer (text_view);
-	if (!buffer && !GTK_IS_SOURCE_BUFFER (buffer))
+	if (!GTK_IS_SOURCE_BUFFER (buffer))
 		return;
 
 	/* separator */
@@ -1458,7 +1463,7 @@
 					  layout);
 		}
 
-		if (view->priv->show_line_marks)
+		if (view->priv->show_line_marks && view->priv->source_buffer != NULL)
 		{
 			GSList *marks;
 
@@ -2732,7 +2737,7 @@
 	}
 
 	/* if tab or shift+tab:
-	 * with shift+tab key is GDK_ISO_Left_Tab (depends on X?)
+	 * with shift+tab key is GDK_ISO_Left_Tab (yay! on win32 and mac too!)
 	 */
 	if ((key == GDK_Tab || key == GDK_KP_Tab || key == GDK_ISO_Left_Tab) &&
 	    ((event->state & modifiers) == 0 ||