gedit r6085 - branches/printing/gedit

[paolo svn gnome org]

Author: paolo
Date: Sun Jan 13 16:48:01 2008
New Revision: 6085
URL: http://svn.gnome.org/viewvc/gedit?rev=6085&view=rev

Log:
Disable "FileClose" action and tab close button while printing



Modified:
   branches/printing/gedit/gedit-notebook.c
   branches/printing/gedit/gedit-tab.c
   branches/printing/gedit/gedit-window.c

Modified: branches/printing/gedit/gedit-notebook.c
==============================================================================
--- branches/printing/gedit/gedit-notebook.c	(original)
+++ branches/printing/gedit/gedit-notebook.c	Sun Jan 13 16:48:01 2008
@@ -1057,6 +1057,8 @@
 				  (state != GEDIT_TAB_STATE_CLOSING) &&
 				  (state != GEDIT_TAB_STATE_SAVING)  &&
 				  (state != GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW) &&
+				  (state != GEDIT_TAB_STATE_PRINTING) &&
+				  (state != GEDIT_TAB_STATE_PRINT_PREVIEWING) &&				  
 				  (state != GEDIT_TAB_STATE_SAVING_ERROR));
 }
 

Modified: branches/printing/gedit/gedit-tab.c
==============================================================================
--- branches/printing/gedit/gedit-tab.c	(original)
+++ branches/printing/gedit/gedit-tab.c	Sun Jan 13 16:48:01 2008
@@ -230,15 +230,6 @@
 {
 	GeditTab *tab = GEDIT_TAB (object);
 
-/* FIXME
-	if (tab->priv->print_job != NULL)
-	{
-		gedit_debug_message (DEBUG_TAB, "Cancelling printing");
-
-		gedit_print_job_cancel (tab->priv->print_job);
-		g_object_unref (tab->priv->print_job);
-	}
-*/
 	if (tab->priv->timer != NULL)
 		g_timer_destroy (tab->priv->timer);
 

Modified: branches/printing/gedit/gedit-window.c
==============================================================================
--- branches/printing/gedit/gedit-window.c	(original)
+++ branches/printing/gedit/gedit-window.c	Sun Jan 13 16:48:01 2008
@@ -679,6 +679,8 @@
 	                          (state != GEDIT_TAB_STATE_CLOSING) &&
 				  (state != GEDIT_TAB_STATE_SAVING) &&
 				  (state != GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW) &&
+				  (state != GEDIT_TAB_STATE_PRINTING) &&
+				  (state != GEDIT_TAB_STATE_PRINT_PREVIEWING) &&
 				  (state != GEDIT_TAB_STATE_SAVING_ERROR));
 
 	action = gtk_action_group_get_action (window->priv->action_group,