[gedit] Deprecate GEDIT_TAB_STATE_PRINT_PREVIEWING (unused)



commit 1a1fc4f5eb1eb3b27246cf8f3727d64a669330a6
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jun 14 16:55:41 2015 +0200

    Deprecate GEDIT_TAB_STATE_PRINT_PREVIEWING (unused)
    
    GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW is enough.

 gedit/gedit-commands-file.c       |    6 ++----
 gedit/gedit-notebook-popup-menu.c |    1 -
 gedit/gedit-tab-label.c           |    1 -
 gedit/gedit-tab.c                 |    5 +----
 gedit/gedit-tab.h                 |    2 +-
 gedit/gedit-window.c              |    2 --
 6 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index 4deca8d..847a29e 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -1301,7 +1301,6 @@ save_documents_list (GeditWindow *window,
                state = gedit_tab_get_state (tab);
 
                g_return_if_fail (state != GEDIT_TAB_STATE_PRINTING);
-               g_return_if_fail (state != GEDIT_TAB_STATE_PRINT_PREVIEWING);
                g_return_if_fail (state != GEDIT_TAB_STATE_CLOSING);
 
                if (state == GEDIT_TAB_STATE_NORMAL ||
@@ -1341,7 +1340,7 @@ save_documents_list (GeditWindow *window,
                           - GEDIT_TAB_STATE_REVERTING: we do not save since the user wants
                             to return back to the version of the file she previously saved
                           - GEDIT_TAB_STATE_SAVING: well, we are already saving (no need to save again)
-                          - GEDIT_TAB_STATE_PRINTING, GEDIT_TAB_STATE_PRINT_PREVIEWING: there is not a
+                          - GEDIT_TAB_STATE_PRINTING: there is not a
                             real reason for not saving in this case, we do not save to avoid to run
                             two operations using the message area at the same time (may be we can remove
                             this limitation in the future). Note that SaveAll, ClosAll
@@ -1723,7 +1722,7 @@ save_and_close_documents (GList         *docs,
                     the original file has been deleted)
                   - [*] GEDIT_TAB_STATE_SAVING: invalid, ClosAll
                     and Quit are unsensitive if the window state is SAVING.
-                  - [*] GEDIT_TAB_STATE_PRINTING, GEDIT_TAB_STATE_PRINT_PREVIEWING: there is not a
+                  - [*] GEDIT_TAB_STATE_PRINTING: there is not a
                     real reason for not closing in this case, we do not save to avoid to run
                     two operations using the message area at the same time (may be we can remove
                     this limitation in the future). Note that ClosAll
@@ -1739,7 +1738,6 @@ save_and_close_documents (GList         *docs,
                */
 
                g_return_if_fail (state != GEDIT_TAB_STATE_PRINTING);
-               g_return_if_fail (state != GEDIT_TAB_STATE_PRINT_PREVIEWING);
                g_return_if_fail (state != GEDIT_TAB_STATE_CLOSING);
                g_return_if_fail (state != GEDIT_TAB_STATE_SAVING);
 
diff --git a/gedit/gedit-notebook-popup-menu.c b/gedit/gedit-notebook-popup-menu.c
index c245cba..d36d7b1 100644
--- a/gedit/gedit-notebook-popup-menu.c
+++ b/gedit/gedit-notebook-popup-menu.c
@@ -124,7 +124,6 @@ update_sensitivity (GeditNotebookPopupMenu *menu)
                                     (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 = g_action_map_lookup_action (G_ACTION_MAP (menu->priv->action_group),
diff --git a/gedit/gedit-tab-label.c b/gedit/gedit-tab-label.c
index cd4e214..51f4b9d 100644
--- a/gedit/gedit-tab-label.c
+++ b/gedit/gedit-tab-label.c
@@ -138,7 +138,6 @@ update_close_button_sensitivity (GeditTabLabel *tab_label)
                                  (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));
 }
 
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 58fb855..067c256 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -456,7 +456,6 @@ set_cursor_according_to_state (GtkTextView   *view,
            (state == GEDIT_TAB_STATE_REVERTING)        ||
            (state == GEDIT_TAB_STATE_SAVING)           ||
            (state == GEDIT_TAB_STATE_PRINTING)         ||
-           (state == GEDIT_TAB_STATE_PRINT_PREVIEWING) ||
            (state == GEDIT_TAB_STATE_CLOSING))
        {
                cursor = gdk_cursor_new_for_display (
@@ -1632,7 +1631,6 @@ _gedit_tab_get_icon (GeditTab *tab)
                        icon_name = "printer-printing-symbolic";
                        break;
 
-               case GEDIT_TAB_STATE_PRINT_PREVIEWING:
                case GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW:
                        icon_name = "printer-symbolic";
                        break;
@@ -2747,8 +2745,7 @@ done_printing_cb (GeditPrintJob       *job,
 {
        GeditView *view;
 
-       g_return_if_fail (tab->state == GEDIT_TAB_STATE_PRINT_PREVIEWING ||
-                         tab->state == GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW ||
+       g_return_if_fail (tab->state == GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW ||
                          tab->state == GEDIT_TAB_STATE_PRINTING);
 
        if (result == GEDIT_PRINT_JOB_RESULT_OK)
diff --git a/gedit/gedit-tab.h b/gedit/gedit-tab.h
index 776aa66..0c24d5d 100644
--- a/gedit/gedit-tab.h
+++ b/gedit/gedit-tab.h
@@ -34,7 +34,7 @@ typedef enum
        GEDIT_TAB_STATE_REVERTING,
        GEDIT_TAB_STATE_SAVING,
        GEDIT_TAB_STATE_PRINTING,
-       GEDIT_TAB_STATE_PRINT_PREVIEWING,
+       GEDIT_TAB_STATE_PRINT_PREVIEWING, /* unused, deprecated */
        GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW,
        GEDIT_TAB_STATE_GENERIC_NOT_EDITABLE,
        GEDIT_TAB_STATE_LOADING_ERROR,
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index e8812b1..ba1c62f 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -646,7 +646,6 @@ update_actions_sensitivity (GeditWindow *window)
                                     (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 = g_action_map_lookup_action (G_ACTION_MAP (window), "undo");
@@ -1494,7 +1493,6 @@ analyze_tab_state (GeditTab    *tab,
                        break;
 
                case GEDIT_TAB_STATE_PRINTING:
-               case GEDIT_TAB_STATE_PRINT_PREVIEWING:
                        window->priv->state |= GEDIT_WINDOW_STATE_PRINTING;
                        break;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]