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

Update to 3.15.90

Browse Source 
- Restore translations for transparency strings
- Restore dark terminals
- Add command-notify patches
This commit is contained in:
Debarshi Ray 2015-02-18 16:46:24 +01:00
parent 8c25cb042f
commit 1ab5f00547
7 changed files with 2406 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -47,3 +47,4 @@ gnome-terminal-2.31.3.tar.bz2
/gnome-terminal-3.14.0.tar.xz /gnome-terminal-3.14.0.tar.xz
/gnome-terminal-3.14.1.tar.xz /gnome-terminal-3.14.1.tar.xz
/gnome-terminal-3.14.2.tar.xz /gnome-terminal-3.14.2.tar.xz
/gnome-terminal-3.15.90.tar.xz

328
0001-Restore-transparency-gnome-3-14.patch
View File

@ -1,328 +0,0 @@
From 1cb63cd1c90cb5bfc8ed2e6d161a7b96c51d8a29 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 12 May 2014 14:57:18 +0200
Subject: [PATCH 1/2] Restore transparency
The transparency settings were removed as a side effect of
2bff4b63ed3ceef6055e35563e9b0b33ad57349d
This restores them and you will need a compositing window manager to
use it. The background image setting, also known as faux transparency,
was not restored.
---
src/org.gnome.Terminal.gschema.xml | 10 +++++
src/profile-editor.c | 11 +++++
src/profile-preferences.ui | 92 ++++++++++++++++++++++++++++++++++++++
src/terminal-schemas.h | 3 ++
src/terminal-screen.c | 22 ++++++++-
src/terminal-window.c | 7 +++
6 files changed, 144 insertions(+), 1 deletion(-)
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index c7d0edb..8910ddd 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -318,6 +318,16 @@
<default>'narrow'</default>
<summary>Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding</summary>
</key>
+ <key name="use-transparent-background" type="b">
+ <default>false</default>
+ <summary>Whether to use a transparent background</summary>
+ </key>
+ <key name="background-transparency-percent" type="i">
+ <default>50</default>
+ <range min="0" max="100"/>
+ <summary>Adjust the amount of transparency</summary>
+ <description>A value between 0 and 100, where 0 is opaque and 100 is fully transparent.</description>
+ </key>
</schema>
<!-- Keybinding settings -->
diff --git a/src/profile-editor.c b/src/profile-editor.c
index 8e5732d..dac5341 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -1099,7 +1099,18 @@ terminal_profile_edit (GSettings *profile,
"active-id",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
+ gtk_builder_get_object (builder, "use-transparent-background"),
+ "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ g_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND,
+ gtk_builder_get_object (builder, "background-transparent-scale-box"),
+ "sensitive", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
+ g_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT,
+ gtk_builder_get_object (builder, "background-transparent-adjustment"),
+ "value", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+
/* Finished! */
+
terminal_util_bind_mnemonic_label_sensitivity (editor);
terminal_util_dialog_focus_widget (editor, widget_name);
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index de901ee..25a284e 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -23,6 +23,11 @@
<property name="step_increment">1</property>
<property name="page_increment">100</property>
</object>
+ <object class="GtkAdjustment" id="background-transparent-adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
@@ -1073,6 +1078,93 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="use-transparent-background-box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="use-transparent-background">
+ <property name="label" translatable="yes">Use t_ransparent background</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="background-transparent-scale-box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="background-transparent-min-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.5</property>
+ <property name="label" translatable="yes">none</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="background-transparent-scale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">background-transparent-adjustment</property>
+ <property name="draw_value">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="background-transparent-max-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.5</property>
+ <property name="label" translatable="yes">full</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index 90cc5a0..a3849eb 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -63,6 +63,9 @@ G_BEGIN_DECLS
#define TERMINAL_PROFILE_USE_THEME_COLORS_KEY "use-theme-colors"
#define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name"
+#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background"
+#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent"
+
#define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"
#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index ad78388..d09d812 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -750,7 +750,9 @@ terminal_screen_profile_changed_cb (GSettings *profile,
prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR_KEY) ||
prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY) ||
prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_KEY) ||
- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY))
+ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) ||
+ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) ||
+ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT))
update_color_scheme (screen);
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
@@ -809,6 +811,8 @@ update_color_scheme (TerminalScreen *screen)
GdkRGBA fg, bg, bold, theme_fg, theme_bg;
GdkRGBA *boldp;
GtkStyleContext *context;
+ GtkWidget *toplevel;
+ gboolean transparent;
context = gtk_widget_get_style_context (widget);
gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg);
@@ -829,9 +833,25 @@ update_color_scheme (TerminalScreen *screen)
boldp = NULL;
colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors);
+
+ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND);
+ if (transparent)
+ {
+ gint transparency_percent;
+
+ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT);
+ bg.alpha = (100 - transparency_percent) / 100.0;
+ }
+ else
+ bg.alpha = 1.0;
+
vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg,
colors, n_colors);
vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp);
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel))
+ gtk_widget_set_app_paintable (toplevel, transparent);
}
static void
diff --git a/src/terminal-window.c b/src/terminal-window.c
index ce85744..98acab4 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2549,6 +2549,8 @@ terminal_window_init (TerminalWindow *window)
TerminalWindowPrivate *priv;
TerminalApp *app;
TerminalSettingsList *profiles_list;
+ GdkScreen *screen;
+ GdkVisual *visual;
GtkActionGroup *action_group;
GtkAction *action;
GtkUIManager *manager;
@@ -2564,6 +2566,11 @@ terminal_window_init (TerminalWindow *window)
gtk_widget_init_template (GTK_WIDGET (window));
+ screen = gtk_widget_get_screen (GTK_WIDGET (window));
+ visual = gdk_screen_get_rgba_visual (screen);
+ if (visual != NULL)
+ gtk_widget_set_visual (GTK_WIDGET (window), visual);
+
uuid_generate (u);
uuid_unparse (u, uuidstr);
priv->uuid = g_strdup (uuidstr);
--
1.9.3
From df5793813d19dccfb6dfa75c1be766df562adb48 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 28 May 2014 14:11:02 +0200
Subject: [PATCH 2/2] window: Make the drawing robust across all themes
There are lots of themes out there in the wild that do not specify a
background-color for all widgets and the default is transparent. This
is usually not a problem because GTK+ sets an opaque region on the
whole window and things without a background-color get drawn with the
theme's default background colour. However, to achieve transparency
we disable the opaque region by making the window app-paintable. This
can lead to transparent menubars or notebook tabs in some themes. We
can avoid this by ensuring that the window always renders a background.
https://bugzilla.gnome.org/show_bug.cgi?id=730016
---
src/terminal-window.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 98acab4..b838424 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2189,6 +2189,26 @@ terminal_window_realize (GtkWidget *widget)
}
static gboolean
+terminal_window_draw (GtkWidget *widget,
+ cairo_t *cr)
+{
+ if (gtk_widget_get_app_paintable (widget))
+ {
+ GtkStyleContext *context;
+ int width;
+ int height;
+
+ context = gtk_widget_get_style_context (widget);
+ width = gtk_widget_get_allocated_width (widget);
+ height = gtk_widget_get_allocated_height (widget);
+ gtk_render_background (context, cr, 0, 0, width, height);
+ gtk_render_frame (context, cr, 0, 0, width, height);
+ }
+
+ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr);
+}
+
+static gboolean
terminal_window_state_event (GtkWidget *widget,
GdkEventWindowState *event)
{
@@ -2748,6 +2768,7 @@ terminal_window_class_init (TerminalWindowClass *klass)
widget_class->show = terminal_window_show;
widget_class->realize = terminal_window_realize;
+ widget_class->draw = terminal_window_draw;
widget_class->window_state_event = terminal_window_state_event;
widget_class->screen_changed = terminal_window_screen_changed;
widget_class->style_updated = terminal_window_style_updated;
--
1.9.3

592
gnome-terminal-command-notify.patch Normal file
View File

@ -0,0 +1,592 @@
From 5a956c497e970abf74aab5e72dae7c3e68ebb35a 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
https://bugzilla.gnome.org/show_bug.cgi?id=711059
---
src/terminal-app.c | 32 +++++++++++++++++++++++
src/terminal-notebook.c | 4 +++
src/terminal-screen.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
src/terminal-tab-label.c | 28 +++++++++++++++++++-
src/terminal-tab-label.h | 4 +++
5 files changed, 135 insertions(+), 1 deletion(-)
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 8a9434f..3d09914 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -299,6 +299,31 @@ app_menu_quit_cb (GSimpleAction *action,
gtk_widget_destroy (GTK_WIDGET (window));
}
+/* Other action callbacks */
+
+static void
+action_activate_tab_cb (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ GtkApplication *application = user_data;
+ GtkWidget *toplevel;
+ TerminalScreen *screen;
+ const char *uuid;
+
+ g_variant_get (parameter, "&s", &uuid);
+ screen = terminal_app_get_screen_by_uuid (TERMINAL_APP (application), uuid);
+ if (screen == NULL)
+ return;
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
+ if (!gtk_widget_is_toplevel (toplevel))
+ return;
+
+ terminal_window_switch_screen (TERMINAL_WINDOW (toplevel), screen);
+ gtk_window_present (GTK_WINDOW (toplevel));
+}
+
/* Class implementation */
G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION)
@@ -321,6 +346,10 @@ terminal_app_startup (GApplication *application)
{ "quit", app_menu_quit_cb, NULL, NULL, NULL }
};
+ const GActionEntry other_actions[] = {
+ { "activate-tab", action_activate_tab_cb, "s", NULL, NULL }
+ };
+
gs_unref_object GtkBuilder *builder;
GError *error = NULL;
@@ -332,6 +361,9 @@ terminal_app_startup (GApplication *application)
g_action_map_add_action_entries (G_ACTION_MAP (application),
app_menu_actions, G_N_ELEMENTS (app_menu_actions),
application);
+ g_action_map_add_action_entries (G_ACTION_MAP (application),
+ other_actions, G_N_ELEMENTS (other_actions),
+ application);
builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder,
diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
index d855a7b..31f2771 100644
--- a/src/terminal-notebook.c
+++ b/src/terminal-notebook.c
@@ -243,6 +243,7 @@ terminal_notebook_switch_page (GtkNotebook *gtk_notebook,
{
TerminalNotebook *notebook = TERMINAL_NOTEBOOK (gtk_notebook);
TerminalNotebookPrivate *priv = notebook->priv;
+ GtkWidget *tab_label;
TerminalScreen *screen, *old_active_screen;
GTK_NOTEBOOK_CLASS (terminal_notebook_parent_class)->switch_page (gtk_notebook, child, page_num);
@@ -253,6 +254,9 @@ terminal_notebook_switch_page (GtkNotebook *gtk_notebook,
if (screen == old_active_screen)
return;
+ tab_label = gtk_notebook_get_tab_label (gtk_notebook, child);
+ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), NULL, NULL);
+
/* Workaround to remove gtknotebook's feature of computing its size based on
* 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
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -48,6 +48,7 @@
#include "terminal-marshal.h"
#include "terminal-schemas.h"
#include "terminal-screen-container.h"
+#include "terminal-tab-label.h"
#include "terminal-util.h"
#include "terminal-window.h"
#include "terminal-info-bar.h"
@@ -81,6 +82,7 @@ struct _TerminalScreenPrivate
char **initial_env;
char **override_command;
gboolean shell;
+ gboolean shell_prompt_shown;
int child_pid;
GSList *match_tags;
guint launch_child_source_id;
@@ -136,6 +138,9 @@ static gboolean terminal_screen_do_exec (TerminalScreen *screen,
GError **error);
static void terminal_screen_child_exited (VteTerminal *terminal,
int status);
+static void terminal_screen_notification_received (VteTerminal *terminal,
+ const char *summary,
+ const char *body);
static void terminal_screen_window_title_changed (VteTerminal *vte_terminal,
TerminalScreen *screen);
@@ -440,6 +445,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
widget_class->popup_menu = terminal_screen_popup_menu;
terminal_class->child_exited = terminal_screen_child_exited;
+ terminal_class->notification_received = terminal_screen_notification_received;
signals[PROFILE_SET] =
g_signal_new (I_("profile-set"),
@@ -561,6 +567,10 @@ terminal_screen_dispose (GObject *object)
TerminalScreen *screen = TERMINAL_SCREEN (object);
TerminalScreenPrivate *priv = screen->priv;
GtkSettings *settings;
+ TerminalApp *app;
+
+ app = terminal_app_get ();
+ g_application_withdraw_notification (G_APPLICATION (app), priv->uuid);
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,
}
static void
+terminal_screen_notification_received (VteTerminal *terminal,
+ const char *summary,
+ const char *body)
+{
+ TerminalScreen *screen = TERMINAL_SCREEN (terminal);
+ TerminalScreenPrivate *priv = screen->priv;
+ TerminalWindow *window;
+
+ if (G_UNLIKELY (!priv->shell_prompt_shown))
+ {
+ priv->shell_prompt_shown = TRUE;
+ return;
+ }
+
+ window = terminal_screen_get_window (screen);
+ if (window == NULL)
+ return;
+
+ if (gtk_window_is_active (GTK_WINDOW (window)))
+ {
+ GtkWidget *mdi_container;
+ TerminalScreenContainer *screen_container;
+
+ if (screen == terminal_window_get_active (window))
+ return;
+
+ screen_container = terminal_screen_container_get_from_screen (screen);
+ if (screen_container == NULL)
+ return;
+
+ mdi_container = terminal_window_get_mdi_container (window);
+ /* FIXME: add interface method to retrieve tab label */
+ if (GTK_IS_NOTEBOOK (mdi_container))
+ {
+ GtkWidget *tab_label;
+
+ 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);
+ }
+ }
+ else
+ {
+ gs_unref_object GNotification *notification = NULL;
+ TerminalApp *app;
+ gs_free char *detailed_action = NULL;
+
+ notification = g_notification_new (summary);
+ g_notification_set_body (notification, body);
+ detailed_action = g_strdup_printf ("app.activate-tab::%s", priv->uuid);
+ g_notification_set_default_action (notification, detailed_action);
+
+ app = terminal_app_get ();
+ g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
+ }
+}
+
+static void
terminal_screen_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
gint x,
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
index 0850652..987e93c 100644
--- a/src/terminal-tab-label.c
+++ b/src/terminal-tab-label.c
@@ -34,6 +34,7 @@
struct _TerminalTabLabelPrivate
{
TerminalScreen *screen;
+ GtkWidget *icon;
GtkWidget *label;
GtkWidget *close_button;
gboolean bold;
@@ -179,7 +180,7 @@ terminal_tab_label_constructed (GObject *object)
{
TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object);
TerminalTabLabelPrivate *priv = tab_label->priv;
- GtkWidget *hbox, *label, *close_button;
+ GtkWidget *hbox, *icon, *label, *close_button;
G_OBJECT_CLASS (terminal_tab_label_parent_class)->constructed (object);
@@ -189,6 +190,10 @@ terminal_tab_label_constructed (GObject *object)
gtk_box_set_spacing (GTK_BOX (hbox), SPACING);
+ priv->icon = icon = gtk_image_new ();
+ gtk_widget_set_no_show_all (icon, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
+
priv->label = label = gtk_label_new (NULL);
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label,
}
/**
+ * terminal_tab_label_set_icon:
+ * @tab_label: a #TerminalTabLabel
+ * @icon_name: (allow-none): an icon name
+ * @tooltip: (allow-none): text to be used as tooltip
+ *
+ * Shows an icon at the beginning of @tab_label. If @icon_name is
+ * %NULL, then the icon will be hidden.
+ */
+void
+terminal_tab_label_set_icon (TerminalTabLabel *tab_label,
+ const char *icon_name,
+ const char *tooltip)
+{
+ TerminalTabLabelPrivate *priv = tab_label->priv;
+
+ gtk_widget_set_visible (priv->icon, icon_name != NULL);
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), icon_name, GTK_ICON_SIZE_MENU);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip);
+}
+
+/**
* terminal_tab_label_get_screen:
* @tab_label: a #TerminalTabLabel
*
diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h
index 20cfbce..a987025 100644
--- a/src/terminal-tab-label.h
+++ b/src/terminal-tab-label.h
@@ -59,6 +59,10 @@ GtkWidget * terminal_tab_label_new (TerminalScreen *screen);
void terminal_tab_label_set_bold (TerminalTabLabel *tab_label,
gboolean bold);
+void terminal_tab_label_set_icon (TerminalTabLabel *tab_label,
+ const char *icon_name,
+ const char *tooltip);
+
TerminalScreen *terminal_tab_label_get_screen (TerminalTabLabel *tab_label);
G_END_DECLS
--
2.1.0
From fa5163b82ef72cfc43ce2016749eb1e6fa0be813 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
The desktop file should be named after the application ID for this.
https://bugzilla.gnome.org/show_bug.cgi?id=711059
---
Makefile.am | 4 ++--
configure.ac | 2 +-
gnome-terminal.appdata.xml.in | 38 ----------------------------------
gnome-terminal.desktop.in.in | 16 --------------
org.gnome.Terminal.appdata.xml.in | 38 ++++++++++++++++++++++++++++++++++
org.gnome.Terminal.desktop.in.in | 16 ++++++++++++++
po/POTFILES.in | 4 ++--
po/POTFILES.skip | 2 +-
src/gnome-terminal-search-provider.ini | 2 +-
9 files changed, 61 insertions(+), 61 deletions(-)
delete mode 100644 gnome-terminal.appdata.xml.in
delete mode 100644 gnome-terminal.desktop.in.in
create mode 100644 org.gnome.Terminal.appdata.xml.in
create mode 100644 org.gnome.Terminal.desktop.in.in
diff --git a/Makefile.am b/Makefile.am
index f6f41a6..3aa8677 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
$(NULL)
desktopdir = $(datadir)/applications
-desktop_in_files = @PACKAGE@.desktop.in.in
+desktop_in_files = org.gnome.Terminal.desktop.in.in
nodist_desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
@@ -25,7 +25,7 @@ desktop-file-validate: $(nodist_desktop_DATA)
done
appdatadir = $(datadir)/appdata
-appdata_in_files = gnome-terminal.appdata.xml.in
+appdata_in_files = org.gnome.Terminal.appdata.xml.in
nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
diff --git a/configure.ac b/configure.ac
index 523a0da..e68392d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,7 +345,7 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
-gnome-terminal.desktop.in
+org.gnome.Terminal.desktop.in
src/Makefile
src/terminal-version.h
help/Makefile
diff --git a/gnome-terminal.appdata.xml.in b/gnome-terminal.appdata.xml.in
deleted file mode 100644
index 7ef61e9..0000000
--- a/gnome-terminal.appdata.xml.in
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2014 Christian Persch
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope conf it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<!-- FIXME: the xmlns for appdata is made-up -->
-<application
- xmlns="https://www.freedesktop.org/standards/appdata/1.0"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:its="http://www.w3.org/2005/11/its">
- <id type="desktop">gnome-terminal.desktop</id>
- <metadata_license>GPL-3.0+</metadata_license>
- <project_license>GPL-3.0+</project_license>
- <_name>Terminal</_name>
- <_summary>Use the command line</_summary>
- <description>
- <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system.</_p>
- <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts.</_p>
- </description>
- <screenshots>
- <screenshot type="default">https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png</screenshot>
- </screenshots>
- <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
- <project_group>GNOME</project_group>
- <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
-</application>
diff --git a/gnome-terminal.desktop.in.in b/gnome-terminal.desktop.in.in
deleted file mode 100644
index e01c998..0000000
--- a/gnome-terminal.desktop.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-_Name=Terminal
-_Comment=Use the command line
-_Keywords=shell;prompt;command;commandline;
-TryExec=gnome-terminal
-Exec=gnome-terminal
-Icon=utilities-terminal
-Type=Application
-X-GNOME-DocPath=gnome-terminal/index.html
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-terminal
-X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;System;TerminalEmulator;
-StartupNotify=true
-X-GNOME-SingleWindow=false
diff --git a/org.gnome.Terminal.appdata.xml.in b/org.gnome.Terminal.appdata.xml.in
new file mode 100644
index 0000000..ab4f23b
--- /dev/null
+++ b/org.gnome.Terminal.appdata.xml.in
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2014 Christian Persch
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope conf it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<!-- FIXME: the xmlns for appdata is made-up -->
+<application
+ xmlns="https://www.freedesktop.org/standards/appdata/1.0"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:its="http://www.w3.org/2005/11/its">
+ <id type="desktop">org.gnome.Terminal.desktop</id>
+ <metadata_license>GPL-3.0+</metadata_license>
+ <project_license>GPL-3.0+</project_license>
+ <_name>Terminal</_name>
+ <_summary>Use the command line</_summary>
+ <description>
+ <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system.</_p>
+ <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts.</_p>
+ </description>
+ <screenshots>
+ <screenshot type="default">https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png</screenshot>
+ </screenshots>
+ <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
+ <project_group>GNOME</project_group>
+ <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
+</application>
diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in
new file mode 100644
index 0000000..e01c998
--- /dev/null
+++ b/org.gnome.Terminal.desktop.in.in
@@ -0,0 +1,16 @@
+[Desktop Entry]
+_Name=Terminal
+_Comment=Use the command line
+_Keywords=shell;prompt;command;commandline;
+TryExec=gnome-terminal
+Exec=gnome-terminal
+Icon=utilities-terminal
+Type=Application
+X-GNOME-DocPath=gnome-terminal/index.html
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-terminal
+X-GNOME-Bugzilla-Component=BugBuddyBugs
+X-GNOME-Bugzilla-Version=@VERSION@
+Categories=GNOME;GTK;System;TerminalEmulator;
+StartupNotify=true
+X-GNOME-SingleWindow=false
diff --git a/po/POTFILES.in b/po/POTFILES.in
index af1304d..0aa03ec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
[encoding: UTF-8]
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-gnome-terminal.appdata.xml.in
-gnome-terminal.desktop.in.in
+org.gnome.Terminal.appdata.xml.in
+org.gnome.Terminal.desktop.in.in
[type: gettext/glade]src/find-dialog.ui
src/gterminal.vala
src/migration.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 7c37b7f..ef7c635 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,4 @@
# List of source files that should *not* be translated.
# Please keep this file sorted alphabetically.
-gnome-terminal.desktop.in
+org.gnome.Terminal.desktop.in
src/gterminal.c
diff --git a/src/gnome-terminal-search-provider.ini b/src/gnome-terminal-search-provider.ini
index b6506f2..1b9f81c 100644
--- a/src/gnome-terminal-search-provider.ini
+++ b/src/gnome-terminal-search-provider.ini
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
[Shell Search Provider]
-DesktopId=gnome-terminal.desktop
+DesktopId=org.gnome.Terminal.desktop
BusName=org.gnome.Terminal
ObjectPath=/org/gnome/Terminal/SearchProvider
Version=2
--
2.1.0
From 8ad7481febb1cd6e4341c650abc082c12cd79755 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
This can be useful for finding out whether the escape sequence wasn't
emitted or the filtering was faulty.
https://bugzilla.gnome.org/show_bug.cgi?id=711059
---
src/terminal-debug.c | 1 +
src/terminal-debug.h | 3 ++-
src/terminal-screen.c | 4 ++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/terminal-debug.c b/src/terminal-debug.c
index 0ff321f..dac79c3 100644
--- a/src/terminal-debug.c
+++ b/src/terminal-debug.c
@@ -38,6 +38,7 @@ _terminal_debug_init(void)
{ "settings-list", TERMINAL_DEBUG_SETTINGS_LIST },
{ "appmenu", TERMINAL_DEBUG_APPMENU },
{ "search", TERMINAL_DEBUG_SEARCH },
+ { "notifications", TERMINAL_DEBUG_NOTIFICATIONS },
};
_terminal_debug_flags = g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"),
diff --git a/src/terminal-debug.h b/src/terminal-debug.h
index 5dc3ca4..7499ebe 100644
--- a/src/terminal-debug.h
+++ b/src/terminal-debug.h
@@ -34,7 +34,8 @@ typedef enum {
TERMINAL_DEBUG_PROFILE = 1 << 6,
TERMINAL_DEBUG_SETTINGS_LIST = 1 << 7,
TERMINAL_DEBUG_APPMENU = 1 << 8,
- TERMINAL_DEBUG_SEARCH = 1 << 9
+ TERMINAL_DEBUG_SEARCH = 1 << 9,
+ TERMINAL_DEBUG_NOTIFICATIONS = 1 << 10
} TerminalDebugFlags;
void _terminal_debug_init(void);
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 3699874..326dd3f 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1621,6 +1621,8 @@ terminal_screen_notification_received (VteTerminal *terminal,
TerminalScreenPrivate *priv = screen->priv;
TerminalWindow *window;
+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body);
+
if (G_UNLIKELY (!priv->shell_prompt_shown))
{
priv->shell_prompt_shown = TRUE;
@@ -1652,6 +1654,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);
+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n");
}
}
else
@@ -1667,6 +1670,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
app = terminal_app_get ();
g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
+ _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify desktop\n");
}
}
--
2.1.0

196
gnome-terminal-restore-dark.patch Normal file
View File

@ -0,0 +1,196 @@
From 2abe546b53ee00005ab76c5ef26e557a9422b980 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"
This reverts commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18.
---
src/org.gnome.Terminal.gschema.xml | 5 +++++
src/preferences.ui | 16 ++++++++++++++++
src/terminal-app.c | 4 ++++
src/terminal-prefs.c | 9 ++++++++-
src/terminal-schemas.h | 1 +
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
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -646,6 +646,11 @@
<summary>Whether to show the menubar in new windows</summary>
</key>
+ <key name="dark-theme" type="b">
+ <default>false</default>
+ <summary>Whether to use a dark theme variant</summary>
+ </key>
+
<key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
<default>'window'</default>
<summary>Whether to open new terminals as windows or tabs</summary>
diff --git a/src/preferences.ui b/src/preferences.ui
index f64a11b..df82508 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -139,6 +139,22 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="dark-theme-checkbutton">
+ <property name="label" translatable="yes">Use _dark theme variant</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="hbox140">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 8a9434f..95302c5 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -362,6 +362,10 @@ terminal_app_init (TerminalApp *app)
/* Terminal global settings */
app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
+ g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
+ gtk_settings_get_default (),
+ "gtk-application-prefer-dark-theme",
+ G_SETTINGS_BIND_GET);
/* Check if we need to migrate from gconf to dconf */
maybe_migrate_settings (app);
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index 97f6c33..a57dde6 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
GtkWidget *disable_shortcuts_button;
GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
- GtkWidget *new_terminal_mode_combo;
+ GtkWidget *dark_theme_button, *new_terminal_mode_combo;
GtkWidget *default_hbox, *default_label;
GtkTreeSelection *selection;
GSettings *settings;
@@ -583,6 +583,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
"preferences-dialog",
"preferences-dialog", &dialog,
"default-show-menubar-checkbutton", &show_menubar_button,
+ "dark-theme-checkbutton", &dark_theme_button,
"new-terminal-mode-combobox", &new_terminal_mode_combo,
"disable-mnemonics-checkbutton", &disable_mnemonics_button,
"disable-shortcuts-checkbutton", &disable_shortcuts_button,
@@ -613,6 +614,12 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
g_settings_bind (settings,
+ TERMINAL_SETTING_DARK_THEME_KEY,
+ dark_theme_button,
+ "active",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+
+ g_settings_bind (settings,
TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
new_terminal_mode_combo,
"active-id",
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index 17ffdb2..8a1b45a 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -66,6 +66,7 @@ G_BEGIN_DECLS
#define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close"
#define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar"
+#define TERMINAL_SETTING_DARK_THEME_KEY "dark-theme"
#define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled"
#define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY "mnemonics-enabled"
#define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY "shortcuts-enabled"
--
2.1.0
From c940c71749614e32bf8878c9303432da6ac15164 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"
This reverts commit baaca6a4cc5ca78d7b0e02cfaee6c159bad7ce4b.
---
help/C/pref-theme.page | 41 +++++++++++++++++++++++++++++++++++++++++
help/Makefile.am | 1 +
2 files changed, 42 insertions(+)
create mode 100644 help/C/pref-theme.page
diff --git a/help/C/pref-theme.page b/help/C/pref-theme.page
new file mode 100644
index 0000000..a997d14
--- /dev/null
+++ b/help/C/pref-theme.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ xmlns:its="http://www.w3.org/2005/11/its"
+ type="guide"
+ id="pref-theme">
+
+ <info>
+ <link type="guide" xref="index#appearance"/>
+ <revision pkgversion="3.12" date="2014-02-26" status="review"/>
+
+ <credit type="author copyright">
+ <name>Ekaterina Gerasimova</name>
+ <email its:translate="no">kittykat3756@gmail.com</email>
+ <years>2014</years>
+ </credit>
+ <!--<credit type="copyright editor">
+ <name></name>
+ <email its:translate="no"></email>
+ <years></years>
+ </credit>-->
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+ <desc>Use either the light or dark theme for <app>Terminal</app>.</desc>
+ </info>
+
+ <title>Chose the window theme</title>
+
+ <p>You can chose to use either the dark theme or the light theme for the
+ terminal window.</p>
+
+ <steps>
+ <item>
+ <p>Select
+ <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
+ </item>
+ <item>
+ <p>To use the dark theme, select <gui>Use dark theme variant</gui>.</p>
+ </item>
+ </steps>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index 33389c5..9c02a74 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -35,6 +35,7 @@ HELP_FILES = \
pref-profile-encoding.page \
pref-scrolling.page \
pref-tab-window.page \
+ pref-theme.page \
pref-user-input.page \
profile.page \
prob-reset.page \
--
2.1.0

1600
gnome-terminal-restore-transparency.patch Normal file
View File

File diff suppressed because it is too large Load Diff

24
gnome-terminal.spec
View File

@ -7,18 +7,18 @@
Summary: Terminal emulator for GNOME Summary: Terminal emulator for GNOME
Name: gnome-terminal Name: gnome-terminal
Version: 3.14.2 Version: 3.15.90
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv3+ and GFDL License: GPLv3+ and GFDL
Group: User Interface/Desktops Group: User Interface/Desktops
URL: http://www.gnome.org/ URL: http://www.gnome.org/
#VCS: git:git://git.gnome.org/gnome-terminal #VCS: git:git://git.gnome.org/gnome-terminal
Source0: http://download.gnome.org/sources/gnome-terminal/3.14/gnome-terminal-%{version}.tar.xz Source0: http://download.gnome.org/sources/gnome-terminal/3.15/gnome-terminal-%{version}.tar.xz
Source1: org.gnome.Terminal.gschema.override Source1: org.gnome.Terminal.gschema.override
Patch0: 0001-Restore-transparency-gnome-3-14.patch Patch100: gnome-terminal-restore-transparency.patch
# Company's initial patch for https://bugzilla.gnome.org/show_bug.cgi?id=743395 Patch101: gnome-terminal-restore-dark.patch
Patch1: gnome-terminal-3.15-resize.patch Patch102: gnome-terminal-command-notify.patch
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -57,10 +57,12 @@ option to the right-click context menu in Nautilus.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch100 -p1 -b .transparency
%patch1 -p1 %patch101 -p1 -b .dark
%patch101 -p1 -b .command-notify
%build %build
autoreconf -f -i
%configure --disable-static --with-gtk=3.0 --with-nautilus-extension %configure --disable-static --with-gtk=3.0 --with-nautilus-extension
make %{?_smp_mflags} make %{?_smp_mflags}
@ -102,6 +104,12 @@ fi
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
%changelog %changelog
* Wed Feb 18 2015 Debarshi Ray <rishi@fedoraproject.org> - 3.15.90-1
- Update to 3.15.90
- Restore translations for transparency strings
- Restore dark terminals
- Add command-notify patches
* Mon Jan 26 2015 Adam Williamson <awilliam@redhat.com> - 3.14.2-2 * Mon Jan 26 2015 Adam Williamson <awilliam@redhat.com> - 3.14.2-2
- backport partial fix for BGO#743395 - backport partial fix for BGO#743395

2
sources
View File

@ -1 +1 @@
8d1138bafa419882e37194a50869952f gnome-terminal-3.14.2.tar.xz 3bef6f12fb46340989981a8535353e90 gnome-terminal-3.15.90.tar.xz