Skip to content
Commits on Source (19)
Expand all Hide whitespace changes
Inline Side-by-side
data/icons/hicolor_apps_symbolic_org.gnome.Terminal.Preferences-symbolic.svg 0 → 100644
View file @ 2fd1936f
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
id="svg7384"
version="1.1"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
height="16.000019"
sodipodi:docname="hicolor_apps_symbolic_org.gnome.Terminal.Preferences-symbolic.svg"
width="16"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<!--
Copyright © 2018 Tobias Bernard
Copyright © 2018 Lapo Calamandrei
Copyright © 2018 Sam Hewitt
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/>.
-->
<metadata
id="metadata90">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Gnome Symbolic Icon Theme</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:object-paths="true"
inkscape:cy="7.1038682"
inkscape:current-layer="layer11"
inkscape:window-width="1920"
pagecolor="#555753"
showborder="false"
showguides="true"
inkscape:snap-nodes="false"
objecttolerance="10"
showgrid="true"
inkscape:object-nodes="true"
inkscape:pageshadow="2"
inkscape:guide-bbox="true"
inkscape:window-x="0"
inkscape:snap-bbox="true"
bordercolor="#666666"
id="namedview88"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:window-y="0"
gridtolerance="10"
inkscape:zoom="57.926187"
inkscape:window-height="1015"
borderopacity="1"
guidetolerance="10"
inkscape:snap-bbox-midpoints="false"
inkscape:cx="15.830491"
inkscape:bbox-paths="false"
inkscape:snap-grids="true"
inkscape:pageopacity="1"
inkscape:snap-to-guides="true"
inkscape:pagecheckerboard="0">
<inkscape:grid
visible="true"
spacingx="1"
type="xygrid"
spacingy="1"
id="grid4866"
empspacing="2"
enabled="true"
snapvisiblegridlinesonly="true"
originx="0"
originy="0" />
</sodipodi:namedview>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer9"
inkscape:label="status"
style="display:inline" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer10"
inkscape:label="devices" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer11"
inkscape:label="apps">
<path
d="M 124.1875,490 C 122.98196,490 122,491.01672 122,492.21875 l 0,10.5625 c 0,1.20203 0.98197,2.21875 2.1875,2.21875 l 11.625,0 c 1.20553,0 2.1875,-1.01671 2.1875,-2.21875 l 0,-10.5625 C 138,491.01671 137.01804,490 135.8125,490 l -11.625,0 z m 0,2 11.625,0 c 0.1228,0 0.1875,0.0809 0.1875,0.21875 l 0,10.5625 C 136,502.91909 135.93531,503 135.8125,503 l -11.625,0 C 124.06469,503 124,502.9191 124,502.78125 l 0,-10.5625 C 124,492.0809 124.0647,492 124.1875,492 z"
id="rect11749-5-9"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" />
<path
d="m 126.3125,495.90625 a 0.60006002,0.60006002 0 0 0 -0.25,1.03125 l 1.5625,1.5625 -1.5625,1.5625 a 0.61871843,0.61871843 0 1 0 0.875,0.875 l 2,-2 a 0.60006002,0.60006002 0 0 0 0,-0.875 l -2,-2 a 0.60006002,0.60006002 0 0 0 -0.625,-0.15625 z"
id="path11751-2-3"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" />
<rect
x="130"
y="500"
id="rect4987"
height="1.00001"
width="3"
style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 134.974,492.25706 -0.61562,0.575 c -0.18126,0.16875 -0.2125,0.45938 -0.10782,0.68282 l -2.35468,2.39843 c -0.005,0 -0.008,0 -0.0125,0 -0.10313,-0.0516 -0.22032,-0.0734 -0.33594,-0.0594 -0.13125,0.0188 -0.25313,0.0797 -0.34688,0.17656 l -1.57812,1.59844 c -0.15625,0.15 -0.21875,0.37344 -0.1625,0.58281 0.0563,0.20938 0.22187,0.37188 0.43281,0.42344 0.21094,0.0531 0.43281,-0.0125 0.58125,-0.17031 l 1.57812,-1.59844 c 0.18907,-0.18125 0.2375,-0.4625 0.11876,-0.69531 l 2.35624,-2.38594 c 0.22344,0.1 0.50938,0.0594 0.68282,-0.11563 l 0.56562,-0.625 z m -4.12344,0.0359 c -0.15937,0 -0.31406,0.0375 -0.45625,0.0875 l 0.75313,0.75157 c 0.15625,0.15312 0.15625,0.4 0,0.55469 l -0.28438,0.28281 c -0.15468,0.15469 -0.4,0.15469 -0.55625,0 l -0.75312,-0.75157 c -0.05,0.14219 -0.0875,0.29688 -0.0875,0.45626 0,0.7625 0.62031,1.38124 1.38437,1.38124 0.16094,0 0.31563,-0.0375 0.45782,-0.0875 l 0.47031,0.46876 h 0.0234 l 0.82812,-0.825 -0.48125,-0.48126 c 0.05,-0.14374 0.0859,-0.29687 0.0859,-0.45624 0,-0.7625 -0.61875,-1.38126 -1.38438,-1.38126 z m 2.62032,3.15626 -0.82813,0.82656 c 0.005,0.0109 0.009,0.0234 0.0125,0.0359 l 0.45781,0.45625 c -0.05,0.14219 -0.0875,0.29687 -0.0875,0.45625 0,0.76094 0.62032,1.37968 1.38438,1.37968 0.17344,0 0.34218,-0.0406 0.49531,-0.0984 l -0.80313,-0.8 c -0.15468,-0.15469 -0.15468,-0.41407 0,-0.56719 l 0.27188,-0.27188 c 0.0781,-0.0766 0.18281,-0.12343 0.28438,-0.12343 0.10156,0 0.20624,0.0469 0.28437,0.12343 l 0.77813,0.77657 c 0.0422,-0.13125 0.0734,-0.27344 0.0734,-0.41875 0,-0.7625 -0.61875,-1.38125 -1.38437,-1.38125 -0.15938,0 -0.31406,0.0375 -0.45625,0.0875 z m 0,0"
fill="#2e3436"
id="path19"
style="fill:#bebebe;fill-opacity:1;stroke-width:0.4"
inkscape:transform-center-x="9.2704186"
inkscape:transform-center-y="-0.56969053" />
</g>
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer12"
inkscape:label="actions" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer13"
inkscape:label="places" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer14"
inkscape:label="mimetypes" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="layer15"
inkscape:label="emblems"
style="display:inline" />
<g
transform="translate(-122,-489.99998)"
inkscape:groupmode="layer"
id="g4953"
inkscape:label="categories"
style="display:inline" />
</svg>
data/icons/meson.build
View file @ 2fd1936f
......@@ -19,7 +19,9 @@ public_icons_themes = [
public_icons_sources = [
'hicolor_apps_scalable_org.gnome.Terminal.svg',
'hicolor_apps_scalable_org.gnome.Terminal.Preferences.svg',
'hicolor_apps_symbolic_org.gnome.Terminal-symbolic.svg',
'hicolor_apps_symbolic_org.gnome.Terminal.Preferences-symbolic.svg',
]
public_icons_renames = []
......
data/meson.build
View file @ 2fd1936f
......@@ -46,6 +46,16 @@ i18n.merge_file(
install_dir: desktopdatadir,
)
i18n.merge_file(
input: gt_dns_name + '.Preferences.desktop.in',
install: true,
install_dir: desktopdatadir,
install_tag: 'runtime',
output: '@BASENAME@',
po_dir: po_dir,
type: 'desktop',
)
meson.add_install_script(
'meson_desktopfile.py',
desktopdatadir,
......
data/org.gnome.Terminal.Preferences.desktop.in 0 → 100644
View file @ 2fd1936f
[Desktop Entry]
Categories=GNOME;GTK;System;TerminalEmulator;
Comment=Use the command line
DBusActivatable=false
Exec=gnome-terminal --preferences
Icon=org.gnome.Terminal.Preferences
Keywords=shell;prompt;command;commandline;cmd;
Name=Preferences
NoDisplay=true
SingleMainWindow=true
StartupNotify=true
StartupWMClass=Gnome-terminal-preferences
TryExec=gnome-terminal
Type=Application
debian/changelog
View file @ 2fd1936f
gnome-terminal (3.46.2-1ubuntu1) kinetic; urgency=medium
* Merge with Debian. Remaining changes:
+ gnome-terminal.wrap, debian/rules:
- Add a wrapper script to restore command line compatibility.
+ debian/control.in:
- gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for
the wrapper script.
- add a build dependency on gettext to match the use of the i18n meson
module
+ Add 0001-Restore-transparency.patch:
- Restore transparency support
+ Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch:
- Add CSS names and style classes so we can theme things more easily.
+ Add 0001-screen-window-Extra-padding-around-transparent-termi.patch:
- Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @
Fedora
+ Add 52_support_apturl.patch:
- Support apt: urls.
+ Add 60_add_lp_handler.patch:
- Add a handler for launchpad bug URLs.
+ Add scrollbar-background-theming.patch:
- Draw background under the scrollbar that matches the actual terminal
background color. This allows proper theming.
+ Add screen-Use-clean-env-when-creating-new-tab.patch:
- Fix environment variables on opening new tab via the "Open in
Terminal" right click menu in Nautilus. (LP: #1922839)
-- Jeremy Bicha <jbicha@ubuntu.com> Wed, 12 Oct 2022 13:56:53 -0400
gnome-terminal (3.46.2-1) unstable; urgency=medium
* New upstream release (LP: #1992683)
* Drop 3 patches applied in new release
-- Jeremy Bicha <jbicha@ubuntu.com> Wed, 12 Oct 2022 13:55:34 -0400
gnome-terminal (3.46.1-2ubuntu1) kinetic; urgency=medium
* Merge with debian, remaining changes:
......
debian/patches/client-Use-verified-schema.patch deleted 100644 → 0
View file @ c1d00180
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 18 Sep 2022 19:19:27 +0200
Subject: client: Use verified schema
... and pass the correct schema source when creating the profile list.
(cherry picked from commit 640f2078656d953f661cef2f8ea4f3539cdb7d4d)
Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7930
(cherry picked from commit b19b82be2b6d4a6a45f654bede864629d3247abe)
---
src/terminal-options.cc | 25 +++++++++++++++++++++----
src/terminal-options.hh | 2 ++
src/terminal-settings-list.cc | 4 +---
src/terminal-settings-utils.cc | 8 ++++++--
src/terminal-settings-utils.hh | 1 -
5 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/terminal-options.cc b/src/terminal-options.cc
index e2e562d..9e672f5 100644
--- a/src/terminal-options.cc
+++ b/src/terminal-options.cc
@@ -38,6 +38,7 @@
#include "terminal-util.hh"
#include "terminal-version.hh"
#include "terminal-libgsystem.hh"
+#include "terminal-settings-utils.hh"
static int verbosity = 1;
@@ -107,11 +108,23 @@ terminal_log_writer (GLogLevelFlags log_level,
static GOptionContext *get_goption_context (TerminalOptions *options);
+static void
+terminal_options_ensure_schema_source(TerminalOptions* options)
+{
+ if (options->schema_source)
+ return;
+
+ options->schema_source = terminal_g_settings_schema_source_get_default();
+}
+
static TerminalSettingsList *
terminal_options_ensure_profiles_list (TerminalOptions *options)
{
- if (options->profiles_list == nullptr)
- options->profiles_list = terminal_profiles_list_new(nullptr, nullptr);
+ if (options->profiles_list == nullptr) {
+ terminal_options_ensure_schema_source(options);
+ options->profiles_list = terminal_profiles_list_new(nullptr /* default backend */,
+ options->schema_source);
+ }
return options->profiles_list;
}
@@ -1264,8 +1277,11 @@ terminal_options_merge_config (TerminalOptions *options,
void
terminal_options_ensure_window (TerminalOptions *options)
{
- gs_unref_object GSettings *global_settings =
- g_settings_new (TERMINAL_SETTING_SCHEMA);
+ terminal_options_ensure_schema_source(options);
+ gs_unref_object auto global_settings =
+ terminal_g_settings_new(nullptr, // default backend
+ options->schema_source,
+ TERMINAL_SETTING_SCHEMA);
gs_free char *mode_str = g_settings_get_string (global_settings,
TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY);
@@ -1304,6 +1320,7 @@ terminal_options_free (TerminalOptions *options)
g_free (options->sm_config_prefix);
g_clear_object (&options->profiles_list);
+ g_clear_pointer (&options->schema_source, g_settings_schema_source_unref);
g_free (options);
}
diff --git a/src/terminal-options.hh b/src/terminal-options.hh
index 60adebb..fe88361 100644
--- a/src/terminal-options.hh
+++ b/src/terminal-options.hh
@@ -25,6 +25,7 @@
#include <glib.h>
#include <stdio.h>
+#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include "terminal-profiles-list.hh"
@@ -63,6 +64,7 @@ enum
typedef struct
{
+ GSettingsSchemaSource* schema_source; /* may be nullptr */
TerminalSettingsList *profiles_list; /* may be nullptr */
gboolean print_environment;
diff --git a/src/terminal-settings-list.cc b/src/terminal-settings-list.cc
index 40b9a98..f0db40d 100644
--- a/src/terminal-settings-list.cc
+++ b/src/terminal-settings-list.cc
@@ -468,9 +468,7 @@ terminal_settings_list_constructed (GObject *object)
g_object_get(object, "backend", &list->settings_backend, nullptr);
g_assert(list->settings_backend);
-
- if (list->schema_source == nullptr)
- list->schema_source = g_settings_schema_source_get_default();
+ g_assert(list->schema_source);
g_assert (list->schema_source != nullptr);
g_assert (list->child_schema_id != nullptr);
diff --git a/src/terminal-settings-utils.cc b/src/terminal-settings-utils.cc
index 60e7a9a..494a257 100644
--- a/src/terminal-settings-utils.cc
+++ b/src/terminal-settings-utils.cc
@@ -18,6 +18,8 @@
#include "config.h"
#define G_SETTINGS_ENABLE_BACKEND
+#include <gio/gsettingsbackend.h>
+
#include "terminal-settings-utils.hh"
#include "terminal-client-utils.hh"
#include "terminal-debug.hh"
@@ -217,6 +219,8 @@ terminal_g_settings_backend_erase_path(GSettingsBackend* backend,
return r;
}
+#endif /* TERMINAL_SERVER || TERMINAL_PREFERENCES */
+
#define TERMINAL_SCHEMA_VERIFIER_ERROR (g_quark_from_static_string("TerminalSchemaVerifier"))
typedef enum {
@@ -558,6 +562,8 @@ terminal_g_settings_schema_source_get_default(void)
TERM_LIBEXECDIR,
#elif defined(TERMINAL_PREFERENCES)
TERM_LIBEXECDIR,
+#elif defined(TERMINAL_CLIENT)
+ TERM_BINDIR,
#else
#error Need to define installed location
#endif
@@ -593,8 +599,6 @@ terminal_g_settings_schema_source_get_default(void)
return g_settings_schema_source_ref(default_source);
}
-#endif /* TERMINAL_SERVER || TERMINAL_PREFERENCES */
-
// BEGIN copied from glib/gio/gsettingsbackend.c
/*
diff --git a/src/terminal-settings-utils.hh b/src/terminal-settings-utils.hh
index 9079485..8a20042 100644
--- a/src/terminal-settings-utils.hh
+++ b/src/terminal-settings-utils.hh
@@ -18,7 +18,6 @@
#pragma once
#include <gio/gio.h>
-#include <gio/gsettingsbackend.h>
GSettings* terminal_g_settings_new (GSettingsBackend* backend,
GSettingsSchemaSource* source,
debian/patches/prefs-Add-NoDisplay-desktop-file-for-the-prefs-binary.patch deleted 100644 → 0
View file @ c1d00180
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 18 Sep 2022 18:49:49 +0200
Subject: prefs: Add NoDisplay desktop file for the prefs binary
Backported from master but modified not to include new translatable
strings.
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7928
(cherry picked from commit f767de5de87fd9452758d1ad015a3cb6f932b00a)
(cherry picked from commit 11424208e8ffd426c5f6a66b05d6ff78d8c78a86)
---
data/meson.build | 10 ++++++++++
data/org.gnome.Terminal.Preferences.desktop.in | 14 ++++++++++++++
po/POTFILES.in | 1 +
3 files changed, 25 insertions(+)
create mode 100644 data/org.gnome.Terminal.Preferences.desktop.in
diff --git a/data/meson.build b/data/meson.build
index e0bcbb9..1eda205 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -46,6 +46,16 @@ i18n.merge_file(
install_dir: desktopdatadir,
)
+i18n.merge_file(
+ input: gt_dns_name + '.Preferences.desktop.in',
+ install: true,
+ install_dir: desktopdatadir,
+ install_tag: 'runtime',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+ type: 'desktop',
+)
+
meson.add_install_script(
'meson_desktopfile.py',
desktopdatadir,
diff --git a/data/org.gnome.Terminal.Preferences.desktop.in b/data/org.gnome.Terminal.Preferences.desktop.in
new file mode 100644
index 0000000..5a57bdf
--- /dev/null
+++ b/data/org.gnome.Terminal.Preferences.desktop.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Categories=GNOME;GTK;System;TerminalEmulator;
+Comment=Use the command line
+DBusActivatable=false
+Exec=gnome-terminal --preferences
+Icon=org.gnome.Terminal
+Keywords=shell;prompt;command;commandline;cmd;
+Name=Preferences
+NoDisplay=true
+SingleMainWindow=true
+StartupNotify=true
+StartupWMClass=Gnome-terminal
+TryExec=gnome-terminal
+Type=Application
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 561f5a9..1c67396 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/org.gnome.Terminal.desktop.in
+data/org.gnome.Terminal.Preferences.desktop.in
data/org.gnome.Terminal.metainfo.xml.in
data/org.gnome.Terminal.Nautilus.metainfo.xml.in
src/org.gnome.Terminal.gschema.xml
debian/patches/prefs-Move-prefs-binary-to-libexecdir.patch deleted 100644 → 0
View file @ c1d00180
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 18 Sep 2022 16:04:46 +0200
Subject: prefs: Move prefs binary to libexecdir
For FHS compliance, move the prefs binary from pkglibdir to libexecdir.
Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7927
(cherry picked from commit d69297f003c519b0cdb06d4115a6539297793910)
(cherry picked from commit 5c0167980b9f35b4148d410c12cc49ecf307b664)
---
src/meson.build | 2 +-
src/terminal-prefs-process.cc | 2 +-
src/terminal-settings-utils.cc | 2 +-
src/terminal.cc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 726c4cd..41a215f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -337,7 +337,7 @@ prefs_main = executable(
include_directories: prefs_main_incs,
dependencies: prefs_main_deps,
install: true,
- install_dir: gt_prefix / gt_pkglibdir,
+ install_dir: gt_prefix / gt_libexecdir,
sources: prefs_main_sources,
)
diff --git a/src/terminal-prefs-process.cc b/src/terminal-prefs-process.cc
index e06b17f..a19386f 100644
--- a/src/terminal-prefs-process.cc
+++ b/src/terminal-prefs-process.cc
@@ -255,7 +255,7 @@ terminal_prefs_process_initable_init(GInitable* initable,
socket_fds[1] = -1;
gs_free auto exe = terminal_client_get_file_uninstalled(TERM_LIBEXECDIR,
- TERM_PKGLIBDIR,
+ TERM_LIBEXECDIR,
TERMINAL_PREFERENCES_BINARY_NAME,
G_FILE_TEST_IS_EXECUTABLE);
diff --git a/src/terminal-settings-utils.cc b/src/terminal-settings-utils.cc
index f64d9cc..60e7a9a 100644
--- a/src/terminal-settings-utils.cc
+++ b/src/terminal-settings-utils.cc
@@ -557,7 +557,7 @@ terminal_g_settings_schema_source_get_default(void)
#if defined(TERMINAL_SERVER)
TERM_LIBEXECDIR,
#elif defined(TERMINAL_PREFERENCES)
- TERM_PKGLIBDIR,
+ TERM_LIBEXECDIR,
#else
#error Need to define installed location
#endif
diff --git a/src/terminal.cc b/src/terminal.cc
index ea1836e..ce6060f 100644
--- a/src/terminal.cc
+++ b/src/terminal.cc
@@ -385,7 +385,7 @@ handle_show_preferences(TerminalOptions *options,
// If that isn't possible, launch the prefs binary directly
auto launcher = g_subprocess_launcher_new(GSubprocessFlags(0));
gs_free auto exe = terminal_client_get_file_uninstalled(TERM_BINDIR,
- TERM_PKGLIBDIR,
+ TERM_LIBEXECDIR,
TERMINAL_PREFERENCES_BINARY_NAME,
G_FILE_TEST_IS_EXECUTABLE);
char *argv[2] = {exe, nullptr};
debian/patches/series
View file @ 2fd1936f
01_onlyshowin.patch
Provide-fallback-for-reading-current-directory-if-OS.patch
prefs-Move-prefs-binary-to-libexecdir.patch
prefs-Add-NoDisplay-desktop-file-for-the-prefs-binary.patch
client-Use-verified-schema.patch
0001-Restore-transparency.patch
0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
0001-screen-window-Extra-padding-around-transparent-termi.patch
......
meson.build
View file @ 2fd1936f
......@@ -27,7 +27,7 @@ project(
'GFDL-1.3-only', # the appstream data
],
meson_version: '>= 0.49.0',
version: '3.46.1',
version: '3.46.2',
)
# Naming
......@@ -177,9 +177,15 @@ if system == 'freebsd'
libc_feature_defines = []
elif system == 'darwin'
# See issue #2592
libc_feature_defines += [
['_DARWIN_C_SOURCE', '1'],
]
elif system == 'netbsd'
libc_feature_defines += [
'_NETBSD_SOURCE',
['_NETBSD_SOURCE', '1'],
]
endif
......
po/POTFILES.in
View file @ 2fd1936f
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/org.gnome.Terminal.desktop.in
data/org.gnome.Terminal.Preferences.desktop.in
data/org.gnome.Terminal.metainfo.xml.in
data/org.gnome.Terminal.Nautilus.metainfo.xml.in
src/org.gnome.Terminal.gschema.xml
......
po/ab.po
View file @ 2fd1936f
This diff is collapsed.
po/tr.po
View file @ 2fd1936f
# Turkish translation of gnome-terminal.
# Copyright (C) 2002-2019 The Free Software Foundation.
# Copyright (C) 2020 gnome-terminal'S COPYRIGHT HOLDER
# Copyright (C) 2020-2022 gnome-terminal's COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome-terminal package.
#
# Görkem Çetin <gorkem@gelecek.com.tr>, 2002.
......@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-terminal master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
"POT-Creation-Date: 2022-02-14 11:00+0000\n"
"POT-Creation-Date: 2022-08-15 18:58+0000\n"
"PO-Revision-Date: 2022-02-23 12:35+0300\n"
"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
"Language-Team: Turkish <gnome-turk@gnome.org>\n"
......@@ -100,10 +100,6 @@ msgstr "Komut satırını kullan"
msgid "shell;prompt;command;commandline;cmd;"
msgstr "shell;kabuk;istem;komut;komut satırı;cmd;kmt;"
#: data/org.gnome.Terminal.desktop.in:8
msgid "org.gnome.Terminal"
msgstr "org.gnome.Terminal"
#: data/org.gnome.Terminal.desktop.in:17 src/terminal-accels.cc:127
msgid "New Window"
msgstr "Yeni Pencere"
......@@ -1347,144 +1343,134 @@ msgstr "Solarize koyu"
msgid "Error parsing command: %s"
msgstr "Komut ayrıştırılırken hata: %s"
#: src/profile-editor.cc:744
msgid "Armenian"
msgstr "Ermenice"
#: src/profile-editor.cc:745 src/profile-editor.cc:746
#: src/profile-editor.cc:750
#: src/profile-editor.cc:744 src/profile-editor.cc:745
#: src/profile-editor.cc:749
msgid "Chinese Traditional"
msgstr "Geleneksel Çince"
#: src/profile-editor.cc:747
#: src/profile-editor.cc:746
msgid "Cyrillic/Russian"
msgstr "Kiril/Rusça"
#: src/profile-editor.cc:748 src/profile-editor.cc:761
#: src/profile-editor.cc:791
#: src/profile-editor.cc:747 src/profile-editor.cc:786
msgid "Japanese"
msgstr "Japonca"
#: src/profile-editor.cc:749 src/profile-editor.cc:762
#: src/profile-editor.cc:793
#: src/profile-editor.cc:748 src/profile-editor.cc:788
msgid "Korean"
msgstr "Korece"
#: src/profile-editor.cc:751 src/profile-editor.cc:752
#: src/profile-editor.cc:753
#: src/profile-editor.cc:750 src/profile-editor.cc:751
#: src/profile-editor.cc:752
msgid "Chinese Simplified"
msgstr "Basitleştirilmiş Çince"
#: src/profile-editor.cc:754
msgid "Georgian"
msgstr "Gürcüce"
#: src/profile-editor.cc:755 src/profile-editor.cc:763
#: src/profile-editor.cc:767 src/profile-editor.cc:787
#: src/profile-editor.cc:797
#: src/profile-editor.cc:753 src/profile-editor.cc:759
#: src/profile-editor.cc:763 src/profile-editor.cc:782
#: src/profile-editor.cc:792
msgid "Western"
msgstr "Batı"
#: src/profile-editor.cc:756 src/profile-editor.cc:769
#: src/profile-editor.cc:783 src/profile-editor.cc:795
#: src/profile-editor.cc:754 src/profile-editor.cc:765
#: src/profile-editor.cc:778 src/profile-editor.cc:790
msgid "Central European"
msgstr "Merkez Avrupa"
#: src/profile-editor.cc:757 src/profile-editor.cc:772
#: src/profile-editor.cc:778 src/profile-editor.cc:779
#: src/profile-editor.cc:781 src/profile-editor.cc:796
#: src/profile-editor.cc:755 src/profile-editor.cc:768
#: src/profile-editor.cc:774 src/profile-editor.cc:776
#: src/profile-editor.cc:791
msgid "Cyrillic"
msgstr "Kiril"
#: src/profile-editor.cc:758 src/profile-editor.cc:777
#: src/profile-editor.cc:789 src/profile-editor.cc:799
#: src/profile-editor.cc:756 src/profile-editor.cc:773
#: src/profile-editor.cc:784 src/profile-editor.cc:794
msgid "Turkish"
msgstr "Türkçe"
#: src/profile-editor.cc:759 src/profile-editor.cc:776
#: src/profile-editor.cc:786 src/profile-editor.cc:800
#: src/profile-editor.cc:757 src/profile-editor.cc:772
#: src/profile-editor.cc:781 src/profile-editor.cc:795
msgid "Hebrew"
msgstr "İbranice"
#: src/profile-editor.cc:760 src/profile-editor.cc:773
#: src/profile-editor.cc:782 src/profile-editor.cc:801
#: src/profile-editor.cc:758 src/profile-editor.cc:769
#: src/profile-editor.cc:777 src/profile-editor.cc:796
msgid "Arabic"
msgstr "Arapça"
#: src/profile-editor.cc:764
#: src/profile-editor.cc:760
msgid "Nordic"
msgstr "Nordik"
#: src/profile-editor.cc:765 src/profile-editor.cc:771
#: src/profile-editor.cc:802
#: src/profile-editor.cc:761 src/profile-editor.cc:767
#: src/profile-editor.cc:797
msgid "Baltic"
msgstr "Baltık"
#: src/profile-editor.cc:766
#: src/profile-editor.cc:762
msgid "Celtic"
msgstr "Seltik"
#: src/profile-editor.cc:768 src/profile-editor.cc:788
#: src/profile-editor.cc:764 src/profile-editor.cc:783
msgid "Romanian"
msgstr "Romanca"
#: src/profile-editor.cc:770
#: src/profile-editor.cc:766
msgid "South European"
msgstr "Güney Avrupa"
#: src/profile-editor.cc:774 src/profile-editor.cc:785
#: src/profile-editor.cc:798
#: src/profile-editor.cc:770 src/profile-editor.cc:780
#: src/profile-editor.cc:793
msgid "Greek"
msgstr "Yunanca"
#: src/profile-editor.cc:775
#: src/profile-editor.cc:771
msgid "Hebrew Visual"
msgstr "Görsel İbranice"
#: src/profile-editor.cc:780 src/profile-editor.cc:790
#: src/profile-editor.cc:775 src/profile-editor.cc:785
msgid "Cyrillic/Ukrainian"
msgstr "Kiril/Ukraynaca"
#: src/profile-editor.cc:784
#: src/profile-editor.cc:779
msgid "Croatian"
msgstr "Hırvatça"
#: src/profile-editor.cc:792
#: src/profile-editor.cc:787
msgid "Thai"
msgstr "Tayca"
#: src/profile-editor.cc:794 src/profile-editor.cc:810
#: src/profile-editor.cc:789 src/profile-editor.cc:805
msgid "Unicode"
msgstr "Unikod"
#: src/profile-editor.cc:803
#: src/profile-editor.cc:798
msgid "Vietnamese"
msgstr "Vietnamca"
#: src/profile-editor.cc:811
#: src/profile-editor.cc:806
msgid "Legacy CJK Encodings"
msgstr "Eski CJK Kodlamaları"
#: src/profile-editor.cc:812
#: src/profile-editor.cc:807
msgid "Obsolete Encodings"
msgstr "Artık Kullanılmayan Kodlamalar"
#. Translators: Appears as: [numeric entry] × width
#: src/profile-editor.cc:1012
#: src/profile-editor.cc:1011
msgid "width"
msgstr "genişlik"
#. Translators: Appears as: [numeric entry] × height
#: src/profile-editor.cc:1017
#: src/profile-editor.cc:1016
msgid "height"
msgstr "yükseklik"
#: src/profile-editor.cc:1065
#: src/profile-editor.cc:1064
#, c-format
msgid "Choose Palette Color %u"
msgstr "Palet Rengini Seç %u"
#: src/profile-editor.cc:1069
#: src/profile-editor.cc:1068
#, c-format
msgid "Palette entry %u"
msgstr "Palet girdisi %u"
......@@ -1757,7 +1743,7 @@ msgstr "_4. 132×43"
msgid "_Inspector"
msgstr "_İnceleyici"
#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1513
#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1534
#: src/terminal-window.cc:1795
msgid "_Preferences"
msgstr "_Tercihler"
......@@ -1886,31 +1872,31 @@ msgstr "Uçbirimi _Ayır"
msgid "_Contents"
msgstr "İç_erik"
#: src/terminal-nautilus.cc:542
#: src/terminal-nautilus.cc:540
msgid "Open in _Remote Terminal"
msgstr "_Uzak Uçbirimde Aç"
#: src/terminal-nautilus.cc:544
#: src/terminal-nautilus.cc:542
msgid "Open in _Local Terminal"
msgstr "_Yerel Uçbirimde Aç"
#: src/terminal-nautilus.cc:548 src/terminal-nautilus.cc:559
#: src/terminal-nautilus.cc:546 src/terminal-nautilus.cc:557
msgid "Open the currently selected folder in a terminal"
msgstr "Şu anda seçili olan klasörü uçbirimde aç"
#: src/terminal-nautilus.cc:550 src/terminal-nautilus.cc:561
#: src/terminal-nautilus.cc:548 src/terminal-nautilus.cc:559
msgid "Open the currently open folder in a terminal"
msgstr "Şu anda açık olan klasörü uçbirimde aç"
#: src/terminal-nautilus.cc:556
#: src/terminal-nautilus.cc:554
msgid "Open in T_erminal"
msgstr "Uçbirimd_e Aç"
#: src/terminal-nautilus.cc:566
#: src/terminal-nautilus.cc:564
msgid "Open T_erminal"
msgstr "_Uçbirim Aç"
#: src/terminal-nautilus.cc:567
#: src/terminal-nautilus.cc:565
msgid "Open a terminal"
msgstr "Uçbirim aç"
......@@ -2256,29 +2242,29 @@ msgstr "Kısayollar"
msgid "Profiles"
msgstr "Profiller"
#: src/terminal-screen.cc:1398
#: src/terminal-screen.cc:1401
msgid "No command supplied nor shell requested"
msgstr "Ne bir komut sağlandı ne de kabuk istendi"
#: src/terminal-screen.cc:1514 src/terminal-screen.cc:1861
#: src/terminal-screen.cc:1535 src/terminal-screen.cc:1882
msgid "_Relaunch"
msgstr "_Yeniden başlat"
#: src/terminal-screen.cc:1517
#: src/terminal-screen.cc:1538
msgid "There was an error creating the child process for this terminal"
msgstr "Bu uçbirim için oğul işlem yaratırken bir hata oluştu"
#: src/terminal-screen.cc:1865
#: src/terminal-screen.cc:1886
#, c-format
msgid "The child process exited normally with status %d."
msgstr "Çocuk süreç %d durum kodu ile olağan biçimde çıkış yaptı."
#: src/terminal-screen.cc:1868
#: src/terminal-screen.cc:1889
#, c-format
msgid "The child process was aborted by signal %d."
msgstr "Çocuk süreç %d sinyaliyle iptal edildi."
#: src/terminal-screen.cc:1871
#: src/terminal-screen.cc:1892
msgid "The child process was aborted."
msgstr "Çocuk süreç iptal edildi."
......@@ -2445,317 +2431,3 @@ msgstr "_Pencereyi Kapat"
#, c-format
msgid "Failed to parse arguments: %s\n"
msgstr "Bağımsız değişkenler ayrıştırılamadı: %s\n"
#~ msgid "Whether to allow bold text"
#~ msgstr "Kalın metne izin verilip verilmeyeceği"
#~ msgid "If true, allow applications in the terminal to make text boldface."
#~ msgstr ""
#~ "Eğer doğruysa, teminalde çalışan uygulamalar kalın metin yazdırabilirler."
#~ msgid "Hindi"
#~ msgstr "Hintçe"
#~ msgid "Persian"
#~ msgstr "Farsça"
#~ msgid "Gujarati"
#~ msgstr "Gujarati"
#~ msgid "Gurmukhi"
#~ msgstr "Gurmukhi"
#~ msgid "Icelandic"
#~ msgstr "İzlandaca"
#~ msgid "Set _Character Encoding"
#~ msgstr "_Karakter Kodlamasını Ayarla"
#~ msgid "Move Tab _Left"
#~ msgstr "Sekmeyi _Sola Taşı"
#~ msgid "Move Tab _Right"
#~ msgstr "Sekmeyi Sa_ğa Taşı"
#~ msgid "_Detach Tab"
#~ msgstr "Sekmeyi _Ayır"
#~ msgid "Unnamed"
#~ msgstr "Adsız"
#~ msgid "Whether to show menubar in new windows/tabs"
#~ msgstr "Yeni pencere/sekmelerde menü çubuğunun gösterilip gösterilmeyeceği"
#~ msgid "True if the menubar should be shown in new window"
#~ msgstr "Yeni pencerede menü çubuğunun gösterilmesi gerekiyorsa seçilidir"
#~ msgid "_Quit"
#~ msgstr "_Çıkış"
#~ msgid "Open in _Midnight Commander"
#~ msgstr "_Midnight Commanderda Aç"
#~ msgid ""
#~ "Open the currently selected folder in the terminal file manager Midnight "
#~ "Commander"
#~ msgstr ""
#~ "Şu anda seçili olan klasörü uçbirim dosya yöneticisi Midnight Commander "
#~ "ile aç"
#~ msgid ""
#~ "Open the currently open folder in the terminal file manager Midnight "
#~ "Commander"
#~ msgstr ""
#~ "Şu anda açık olan klasörü uçbirim dosya yöneticisi Midnight Commander ile "
#~ "aç"
#~ msgid "Open _Midnight Commander"
#~ msgstr "_Midnight Commander’ı Aç"
#~ msgid "Open the terminal file manager Midnight Commander"
#~ msgstr "Uçbirim dosya yöneticisi Midnight Commander’ı aç"
#~ msgid "label"
#~ msgstr "etiket"
#~ msgid "Keyboard shortcut to create a new profile"
#~ msgstr "Yeni bir profil oluşturmak için kullanılan klavye kısayolu"
#~ msgid "Keyboard shortcut to open the current profile’s Preferences dialog"
#~ msgstr ""
#~ "Geçerli profilin Tercihler iletişim penceresini açmak için kullanılan "
#~ "klavye kısayolu"
#~ msgid "_Profile used when launching a new terminal:"
#~ msgstr "_Yeni bir uçbirim başlatıldığı zaman kullanılacak profil:"
#~ msgid "Profile Editor"
#~ msgstr "Profil Düzenleyici"
#~ msgid "_Profile name:"
#~ msgstr "_Profil adı:"
#~ msgid "_Rewrap on resize"
#~ msgstr "_Yeniden boyutlandırmada yeniden sar"
#~| msgid "Reset"
#~ msgid "R_eset"
#~ msgstr "S_ıfırla"
#~ msgid "Profile Preferences"
#~ msgstr "Profil Tercihleri"
#~| msgid "New Profile"
#~ msgid "New _Profile"
#~ msgstr "Yeni _Profil"
#~| msgid "Profile Preferences"
#~ msgid "Pr_ofile Preferences"
#~ msgstr "Pr_ofil Tercihleri"
#~ msgid "_Find"
#~ msgstr "_Bul"
#~ msgid "Click button to choose profile"
#~ msgstr "Profil seçmek için düğmeye tıklayın"
#~ msgid "Profile list"
#~ msgstr "Profil listesi"
#~ msgid "_Profile Preferences"
#~ msgstr "_Profil Tercihleri"
#~ msgid ""
#~ "<b>Note:</b> Terminal applications have these colors available to them."
#~ msgstr ""
#~ "<b>Not:</b> Uçbirim uygulamalarının kullanımına bu renkler sunulmuştur."
#~ msgid ""
#~ "<b>Note:</b> These options may cause some applications to behave "
#~ "incorrectly. They are only here to allow you to work around certain "
#~ "applications and operating systems that expect different terminal "
#~ "behavior."
#~ msgstr ""
#~ "<b>Not:</b> Bu seçenekler bazı uygulamaların yanlış çalışmasına neden "
#~ "olabilir. Bunlar yalnızca daha farklı uçbirim davranışı bekleyen çeşitli "
#~ "uygulamalar ve işletim sistemleri için geçici bir çözüm sağlar."
#~ msgid "New _Profile…"
#~ msgstr "Yeni _Profil…"
#~ msgid "Pr_ofile Preferences…"
#~ msgstr "Pr_ofil Tercihleri…"
#~ msgid "_Profile Preferences…"
#~ msgstr "_Profil Tercihleri…"
#~ msgid "Verbose output"
#~ msgstr "Ayrıntılı çıktı"
#~ msgid "Output options:"
#~ msgstr "Çıktı seçenekleri:"
#~ msgid "Show output options"
#~ msgstr "Çıktı seçeneklerini göster"
#~ msgid "“%s” is not a valid application ID"
#~ msgstr "“%s” geçerli bir uygulama kimliği (ID) değil"
#~ msgid "Server application ID"
#~ msgstr "Sunucu uygulama kimliği"
#~ msgid "ID"
#~ msgstr "ID"
#~ msgid "Show completions"
#~ msgstr "Tamamlamaları göster"
#~ msgid "Global options:"
#~ msgstr "Küresel seçenekler:"
#~ msgid "Show global options"
#~ msgstr "Küresel seçenekleri göster"
#~ msgid "FD passing of stdin is not supported"
#~ msgstr "stdin için FD geçme desteklenmiyor"
#~ msgid "FD passing of stdout is not supported"
#~ msgstr "stdout için FD geçme desteklenmiyor"
#~ msgid "FD passing of stderr is not supported"
#~ msgstr "stderr için FD geçme desteklenmiyor"
#~ msgid "Invalid argument “%s” to --fd option"
#~ msgstr "--fd seçeneği için geçersiz bağımsız değişken “%s”"
#~ msgid "Forward stdin"
#~ msgstr "stdin İlet"
#~ msgid "Forward stdout"
#~ msgstr "stdout İlet"
#~ msgid "Forward stderr"
#~ msgstr "stderr İlet"
#~ msgid "Exec options:"
#~ msgstr "Exec seçenekleri:"
#~ msgid "Show exec options"
#~ msgstr "Exec (yürütme) seçeneklerini göster"
#~ msgid "Maximise the window"
#~ msgstr "Pencereyi büyült"
#~ msgid "Window options:"
#~ msgstr "Pencere seçenekleri:"
#~ msgid "Show window options"
#~ msgstr "Pencere seçeneklerini göster"
#~ msgid "Zoom value “%s” is outside allowed range"
#~ msgstr "“%s” yakınlaştırma değeri izin verilen aralık dışında"
#~ msgid "UUID"
#~ msgstr "UUID"
#~ msgid "Terminal options:"
#~ msgstr "Uçbirim seçenekleri:"
#~ msgid "Processing options:"
#~ msgstr "İşleme seçenekleri:"
#~ msgid "Show processing options"
#~ msgstr "İşleme seçeneklerini göster"
#~ msgid "Missing argument"
#~ msgstr "Eksik bağımsız değişken"
#~ msgid "Unknown command “%s”"
#~ msgstr "Bilinmeyen komut “%s”"
#~ msgid "“%s” needs the command to run as arguments after “--”"
#~ msgstr ""
#~ "“%s”, komutun “--”dan sonra bağımsız değişken olarak çalıştırılmasına "
#~ "gereksinim duyuyor"
#~ msgid "Extraneous arguments after “--”"
#~ msgstr "“--”dan sonra ilgisiz bağımsız değişkenler"
#~ msgid "GTerminal"
#~ msgstr "GTerminal"
#~ msgid "Error processing arguments: %s\n"
#~ msgstr "Bağımsız değişkenler işlenirken hata oluştu: %s\n"
#~ msgid "List of available encodings"
#~ msgstr "Kullanılabilir kodlamaların listesi"
#~ msgid ""
#~ "A subset of possible encodings are presented in the Encoding submenu. "
#~ "This is a list of encodings to appear there."
#~ msgstr ""
#~ "Olası kodlamaların bir alt kümesi Kodlama menüsünde sunulmuştur. Bu liste "
#~ "orada gözükecek kodlamaları içerir."
#~ msgid "E_ncodings shown in menu:"
#~ msgstr "Menüde gösterilen k_odlamalar:"
#~ msgid "New Terminal in New Tab"
#~ msgstr "Yeni Sekmede Yeni Uçbirim"
#~ msgid "New Terminal in New Window"
#~ msgstr "Yeni Pencerede Yeni Uçbirim"
#~ msgid "Close All Terminals"
#~ msgstr "Tüm Uçbirimleri Kapat"
#~ msgid "Clear Find Highlight"
#~ msgstr "Arama Vurgulamayı Temizle"
#~ msgid "User Defined"
#~ msgstr "Kullanıcı Tanımlı"
#~ msgid "Show"
#~ msgstr "Göster"
#~ msgid "_Encoding"
#~ msgstr "_Kodlama"
#~ msgid "_%u. %s"
#~ msgstr "_%u. %s"
#~ msgid "_%c. %s"
#~ msgstr "_%c. %s"
#~ msgid "Open _Terminal"
#~ msgstr "_Uçbirim Aç"
#~ msgid "Open Ta_b"
#~ msgstr "_Sekme Aç"
#~ msgid "_Close All Terminals"
#~ msgstr "Tüm Uçbirimleri _Kapat"
#~ msgid "Pre_ferences"
#~ msgstr "_Tercihler"
#~ msgid "Find Ne_xt"
#~ msgstr "Sonrakini B_ul"
#~ msgid "Find Pre_vious"
#~ msgstr "Ö_ncekini Bul"
#~ msgid "Go to _Line…"
#~ msgstr "Satıra _Git…"
#~ msgid "_Incremental Search…"
#~ msgstr "_Artımlı Arama…"
#~ msgid "_Add or Remove…"
#~ msgstr "_Ekle veya Çıkar…"
#~ msgid "Search _backwards"
#~ msgstr "_Geriye doğru ara"
#~ msgid "_Same as text color"
#~ msgstr "_Metin rengiyle aynı"
src/meson.build
View file @ 2fd1936f
......@@ -337,7 +337,7 @@ prefs_main = executable(
include_directories: prefs_main_incs,
dependencies: prefs_main_deps,
install: true,
install_dir: gt_prefix / gt_pkglibdir,
install_dir: gt_prefix / gt_libexecdir,
sources: prefs_main_sources,
)
......
src/terminal-app.cc
View file @ 2fd1936f
......@@ -70,6 +70,8 @@
#include <gdk/gdkx.h>
#endif
#define GNOME_TERMINAL_PREFERENCES_ICON_NAME "org.gnome.Terminal.Preferences"
#define DESKTOP_INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
#define SYSTEM_PROXY_SETTINGS_SCHEMA "org.gnome.system.proxy"
......@@ -852,7 +854,13 @@ terminal_app_startup (GApplication *application)
G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application);
/* Need to set the WM class (bug #685742) */
#if defined(TERMINAL_SERVER)
gdk_set_program_class("Gnome-terminal");
#elif defined(TERMINAL_PREFERENCES)
gdk_set_program_class("Gnome-terminal-preferences");
#else
#error
#endif
app_load_css (application);
......@@ -914,7 +922,13 @@ terminal_app_constructed(GObject *object)
terminal_app_init_debug ();
#if defined(TERMINAL_SERVER)
gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
#elif defined(TERMINAL_PREFERENCES)
gtk_window_set_default_icon_name(GNOME_TERMINAL_PREFERENCES_ICON_NAME);
#else
#error
#endif
if (app->settings_backend == nullptr)
app->settings_backend = g_settings_backend_get_default ();
......
src/terminal-options.cc
View file @ 2fd1936f
......@@ -38,6 +38,7 @@
#include "terminal-util.hh"
#include "terminal-version.hh"
#include "terminal-libgsystem.hh"
#include "terminal-settings-utils.hh"
static int verbosity = 1;
......@@ -107,11 +108,23 @@ terminal_log_writer (GLogLevelFlags log_level,
static GOptionContext *get_goption_context (TerminalOptions *options);
static void
terminal_options_ensure_schema_source(TerminalOptions* options)
{
if (options->schema_source)
return;
options->schema_source = terminal_g_settings_schema_source_get_default();
}
static TerminalSettingsList *
terminal_options_ensure_profiles_list (TerminalOptions *options)
{
if (options->profiles_list == nullptr)
options->profiles_list = terminal_profiles_list_new(nullptr, nullptr);
if (options->profiles_list == nullptr) {
terminal_options_ensure_schema_source(options);
options->profiles_list = terminal_profiles_list_new(nullptr /* default backend */,
options->schema_source);
}
return options->profiles_list;
}
......@@ -1264,8 +1277,11 @@ terminal_options_merge_config (TerminalOptions *options,
void
terminal_options_ensure_window (TerminalOptions *options)
{
gs_unref_object GSettings *global_settings =
g_settings_new (TERMINAL_SETTING_SCHEMA);
terminal_options_ensure_schema_source(options);
gs_unref_object auto global_settings =
terminal_g_settings_new(nullptr, // default backend
options->schema_source,
TERMINAL_SETTING_SCHEMA);
gs_free char *mode_str = g_settings_get_string (global_settings,
TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY);
......@@ -1304,6 +1320,7 @@ terminal_options_free (TerminalOptions *options)
g_free (options->sm_config_prefix);
g_clear_object (&options->profiles_list);
g_clear_pointer (&options->schema_source, g_settings_schema_source_unref);
g_free (options);
}
......
src/terminal-options.hh
View file @ 2fd1936f
......@@ -25,6 +25,7 @@
#include <glib.h>
#include <stdio.h>
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include "terminal-profiles-list.hh"
......@@ -63,6 +64,7 @@ enum
typedef struct
{
GSettingsSchemaSource* schema_source; /* may be nullptr */
TerminalSettingsList *profiles_list; /* may be nullptr */
gboolean print_environment;
......
src/terminal-prefs-process.cc
View file @ 2fd1936f
......@@ -255,7 +255,7 @@ terminal_prefs_process_initable_init(GInitable* initable,
socket_fds[1] = -1;
gs_free auto exe = terminal_client_get_file_uninstalled(TERM_LIBEXECDIR,
TERM_PKGLIBDIR,
TERM_LIBEXECDIR,
TERMINAL_PREFERENCES_BINARY_NAME,
G_FILE_TEST_IS_EXECUTABLE);
......
src/terminal-settings-list.cc
View file @ 2fd1936f
......@@ -468,9 +468,7 @@ terminal_settings_list_constructed (GObject *object)
g_object_get(object, "backend", &list->settings_backend, nullptr);
g_assert(list->settings_backend);
if (list->schema_source == nullptr)
list->schema_source = g_settings_schema_source_get_default();
g_assert(list->schema_source);
g_assert (list->schema_source != nullptr);
g_assert (list->child_schema_id != nullptr);
......@@ -635,10 +633,14 @@ terminal_settings_list_new (GSettingsBackend* backend,
g_return_val_if_fail (child_schema_id != nullptr, nullptr);
g_return_val_if_fail (g_str_has_suffix (path, ":/"), nullptr);
gs_unref_settings_schema auto schema =
g_settings_schema_source_lookup(schema_source, schema_id, true);
g_assert_nonnull(schema);
return reinterpret_cast<TerminalSettingsList*>(g_object_new (TERMINAL_TYPE_SETTINGS_LIST,
"backend", backend,
"schema-source", schema_source,
"schema-id", schema_id,
"settings-schema", schema,
"child-schema-id", child_schema_id,
"path", path,
"flags", flags,
......