rpms/gnome-terminal
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Try massaging the patches so that they apply

Browse Source
This commit is contained in:
Debarshi Ray 2015-02-23 17:34:42 +01:00
parent f0a3089e49
commit 6e892c0636
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnome-terminal-command-notify.patch
View File

@ -1,4 +1,4 @@
From 5a956c497e970abf74aab5e72dae7c3e68ebb35a Mon Sep 17 00:00:00 2001
From 2cfb5a8b205c61f773d5d438842b829ef3fcc220 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 27 Jan 2015 18:40:13 +0100
Subject: [PATCH 1/3] Support desktop notifications from OSC 777
@ -13,7 +13,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059
5 files changed, 135 insertions(+), 1 deletion(-)
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 8a9434f..3d09914 100644
index 95302c5..ae2043e 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -299,6 +299,31 @@ app_menu_quit_cb (GSimpleAction *action,
@ -92,7 +92,7 @@ index d855a7b..31f2771 100644
* all pages. When the widget is hidden, its size will not be taken into
* account.
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 8813295..3699874 100644
index 62c9f5e..78b9d43 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -48,6 +48,7 @@
@ -140,7 +140,7 @@ index 8813295..3699874 100644
settings = gtk_widget_get_settings (GTK_WIDGET (screen));
g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA,
@@ -1603,6 +1613,64 @@ terminal_screen_child_exited (VteTerminal *terminal,
@@ -1623,6 +1633,64 @@ terminal_screen_child_exited (VteTerminal *terminal,
}
static void
@ -284,7 +284,7 @@ index 20cfbce..a987025 100644
2.1.0
From fa5163b82ef72cfc43ce2016749eb1e6fa0be813 Mon Sep 17 00:00:00 2001
From a3413cd8453351cdb1fbe0e54166d5e326b27091 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 27 Jan 2015 19:04:19 +0100
Subject: [PATCH 2/3] Make notifications based on org.gtk.Notification work
@ -517,7 +517,7 @@ index b6506f2..1b9f81c 100644
2.1.0
From 8ad7481febb1cd6e4341c650abc082c12cd79755 Mon Sep 17 00:00:00 2001
From d65d9045e4458fc27a5a08450c07c8ac1fa29178 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 29 Jan 2015 11:47:21 +0100
Subject: [PATCH 3/3] Sprinkle debug messages for notifications
@ -559,10 +559,10 @@ index 5dc3ca4..7499ebe 100644
void _terminal_debug_init(void);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 3699874..326dd3f 100644
index 78b9d43..3845b10 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1621,6 +1621,8 @@ terminal_screen_notification_received (VteTerminal *terminal,
@@ -1641,6 +1641,8 @@ terminal_screen_notification_received (VteTerminal *terminal,
TerminalScreenPrivate *priv = screen->priv;
TerminalWindow *window;
@ -571,7 +571,7 @@ index 3699874..326dd3f 100644
if (G_UNLIKELY (!priv->shell_prompt_shown))
{
priv->shell_prompt_shown = TRUE;
@@ -1652,6 +1654,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
@@ -1672,6 +1674,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container));
terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), TRUE);
terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary);
@ -579,7 +579,7 @@ index 3699874..326dd3f 100644
}
}
else
@@ -1667,6 +1670,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
@@ -1687,6 +1690,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
app = terminal_app_get ();
g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);

12
gnome-terminal-restore-dark.patch
View File

@ -1,4 +1,4 @@
From 2abe546b53ee00005ab76c5ef26e557a9422b980 Mon Sep 17 00:00:00 2001
From 7da7309d203e51fb03c002f87a9a6ddd8ee67978 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 13:22:11 +0100
Subject: [PATCH 1/2] Revert "prefs: Remove dark theme pref"
@ -13,10 +13,10 @@ This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
5 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index e480155..668e8e1 100644
index 051bdc4..95c5405 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -646,6 +646,11 @@
@@ -656,6 +656,11 @@
<summary>Whether to show the menubar in new windows</summary>
</key>
@ -105,10 +105,10 @@ index 97f6c33..a57dde6 100644
new_terminal_mode_combo,
"active-id",
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index 17ffdb2..8a1b45a 100644
index 0fcbf52..c6acd7c 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -66,6 +66,7 @@ G_BEGIN_DECLS
@@ -69,6 +69,7 @@ G_BEGIN_DECLS
#define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"
#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
@ -120,7 +120,7 @@ index 17ffdb2..8a1b45a 100644
2.1.0
From c940c71749614e32bf8878c9303432da6ac15164 Mon Sep 17 00:00:00 2001
From 9fc68b087180e48cb4e2275f3134f66f2c43de14 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 13:22:21 +0100
Subject: [PATCH 2/2] Revert "help: Remove dark theme pref"