From ae273a5603f64e47ca413dba0f95f3e69c668e45 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Feb 08 2017 07:34:20 +0000
Subject: clean up branch


---

diff --git a/mate-terminal_0001-call-gtk_notebook_detach_tab-only-if-the-tab-is-deta-1.16.patch b/mate-terminal_0001-call-gtk_notebook_detach_tab-only-if-the-tab-is-deta-1.16.patch
deleted file mode 100644
index 3d30678..0000000
--- a/mate-terminal_0001-call-gtk_notebook_detach_tab-only-if-the-tab-is-deta-1.16.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2c530ab0d31b2fe8680cbfc2b8689704498f8fc9 Mon Sep 17 00:00:00 2001
-From: raveit65 <chat-to-me@raveit.de>
-Date: Tue, 31 Jan 2017 09:20:41 +0100
-Subject: [PATCH] call gtk_notebook_detach_tab only if the tab is detached
-
-Fixes:
-https://bugzilla.redhat.com/show_bug.cgi?id=1398234
----
- src/terminal-window.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index b0977fb..1a01dda 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -44,6 +44,8 @@
- #include "skey-popup.h"
- #endif
- 
-+static gboolean detach_tab = FALSE;
-+
- struct _TerminalWindowPrivate
- {
-     GtkActionGroup *action_group;
-@@ -2637,8 +2639,15 @@ terminal_window_remove_screen (TerminalWindow *window,
- 
-     screen_container = terminal_screen_container_get_from_screen (screen);
- #if GTK_CHECK_VERSION(3, 16, 0)
--    gtk_notebook_detach_tab (GTK_NOTEBOOK (priv->notebook),
--                             GTK_WIDGET (screen_container));
-+    if (detach_tab)
-+    {
-+        gtk_notebook_detach_tab (GTK_NOTEBOOK (priv->notebook),
-+                                 GTK_WIDGET (screen_container));
-+        detach_tab = FALSE;
-+    }
-+    else
-+        gtk_container_remove (GTK_CONTAINER (priv->notebook),
-+                              GTK_WIDGET (screen_container));
- #else
-     gtk_container_remove (GTK_CONTAINER (priv->notebook),
-                           GTK_WIDGET (screen_container));
-@@ -2669,6 +2678,9 @@ terminal_window_move_screen (TerminalWindow *source_window,
-      */
-     g_object_ref_sink (screen_container);
-     g_object_ref_sink (screen);
-+
-+    detach_tab = TRUE;
-+
-     terminal_window_remove_screen (source_window, screen);
- 
-     /* Now we can safely remove the screen from the container and let the container die */
--- 
-2.7.4
-
diff --git a/mate-terminal_0001-notebook-avoid-crash-on-tab-DND.patch b/mate-terminal_0001-notebook-avoid-crash-on-tab-DND.patch
deleted file mode 100644
index a423143..0000000
--- a/mate-terminal_0001-notebook-avoid-crash-on-tab-DND.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 06b83026b37a199b9bee00bdb16ab560b73a4f62 Mon Sep 17 00:00:00 2001
-From: ZenWalker <scow@riseup.net>
-Date: Fri, 7 Oct 2016 22:21:44 +0200
-Subject: [PATCH] notebook: avoid crash on tab DND
-
-based on gnome-terminal commit:
-https://git.gnome.org/browse/gnome-terminal/commit/?id=85b448f7c9e219e82d4d8abafe405d73349c08c1
-
-Fixes #145
----
- src/terminal-window.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 7026c83..c06bbc5 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -2633,8 +2633,13 @@ terminal_window_remove_screen (TerminalWindow *window,
-     update_tab_visibility (window, -1);
- 
-     screen_container = terminal_screen_container_get_from_screen (screen);
-+#if GTK_CHECK_VERSION(3, 16, 0)
-+    gtk_notebook_detach_tab (GTK_NOTEBOOK (priv->notebook),
-+                             GTK_WIDGET (screen_container));
-+#else
-     gtk_container_remove (GTK_CONTAINER (priv->notebook),
-                           GTK_WIDGET (screen_container));
-+#endif
- }
- 
- void
--- 
-2.7.4
-
diff --git a/mate-terminal_0002-Fix-window-size-when-a-second-tab-is-added-by-drag-n.patch b/mate-terminal_0002-Fix-window-size-when-a-second-tab-is-added-by-drag-n.patch
deleted file mode 100644
index ad5eed2..0000000
--- a/mate-terminal_0002-Fix-window-size-when-a-second-tab-is-added-by-drag-n.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2e6db62d1f01fb92dd57fdf229147ff26ffc561e Mon Sep 17 00:00:00 2001
-From: ZenWalker <scow@riseup.net>
-Date: Sun, 6 Nov 2016 02:04:11 +0100
-Subject: [PATCH 2/2] Fix window size when a second tab is added by drag-n-drop
-
-based on gnome-terminal commit:
-https://git.gnome.org/browse/gnome-terminal/commit/?id=d3e593e4974303618305da4e0d20f0d5c10f83b0
----
- src/terminal-window.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index c06bbc5..fd374ec 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -3038,6 +3038,7 @@ notebook_page_added_callback (GtkWidget       *notebook,
- {
-     TerminalWindowPrivate *priv = window->priv;
-     TerminalScreen *screen;
-+    int pages;
- 
-     screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container));
- 
-@@ -3096,6 +3097,8 @@ notebook_page_added_callback (GtkWidget       *notebook,
-         gtk_window_present_with_time (GTK_WINDOW (window), gtk_get_current_event_time ());
-         priv->present_on_insert = FALSE;
-     }
-+    pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
-+    if (pages == 2) terminal_window_update_size (window, priv->active_screen, TRUE);
- }
- 
- static void
--- 
-2.7.4
-