diff --git a/.gitignore b/.gitignore index 23a2a73..1e1cd04 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /mate-terminal-1.13.2.tar.xz /mate-terminal-1.14.0.tar.xz /mate-terminal-1.14.1.tar.xz +/mate-terminal-1.16.0.tar.xz diff --git a/mate-terminal.spec b/mate-terminal.spec index 2ab5535..f445a99 100644 --- a/mate-terminal.spec +++ b/mate-terminal.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.14 +%global branch 1.16 # Settings used for build from snapshots. %{!?rel_build:%global commit ac33ed09bb41ba717df3722cc71e25c1aa5134c5} @@ -14,9 +14,9 @@ Summary: Terminal emulator for MATE Name: mate-terminal -Version: %{branch}.1 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 3%{?dist} +Release: 1%{?dist} %else Release: 0.2%{?git_rel}%{?dist} %endif @@ -30,24 +30,10 @@ URL: http://mate-desktop.org %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} #Default to black bg white fg, unlimited scrollback, turn off use theme default -Patch0: mate-terminal_better_defaults.patch -# https://github.com/mate-desktop/mate-terminal/pull/118 -Patch1: mate-terminal_0001-drop-ancient-and-irrelevant-gnome-files.patch -Patch2: mate-terminal_0002-window-react-on-WM-change-only-on-X11.patch -Patch3: mate-terminal_0003-use-About-dialog-from-GTK-instead-of-forked-one-from.patch -Patch4: mate-terminal_0004-use-dconf-directly-instead-of-wrapper-functions-from.patch -Patch5: mate-terminal_0005-copy-gsettings-helpers-from-libmate-desktop-see-also.patch -Patch6: mate-terminal_0006-drop-build-dep-on-libmate-desktop-it-s-not-needed-an.patch -Patch7: mate-terminal_0007-require-GTK-3.14-and-VTE-0.38-API-2.91-drop-with-gtk.patch -Patch8: mate-terminal_0008-drop-old-GTK-2-code.patch -Patch9: mate-terminal_0009-drop-old-code-for-VTE-0.38-it-was-used-in-GTK-2-buil.patch -# https://github.com/mate-desktop/mate-terminal/pull/139 -Patch10: mate-terminal_0001-fix-resize-menu-buttons-122.patch -Patch11: mate-terminal_0002-don-t-use-deprecated-gtk_window_parse_geometry.patch +Patch0: mate-terminal_better_defaults-1.15.1.patch # fix rhbz (#1377805) # https://github.com/mate-desktop/mate-terminal/pull/142 -Patch12: mate-terminal_0003-fix-position-with-geometry-option.patch - +Patch1: mate-terminal_0003-fix-position-with-geometry-option.patch BuildRequires: dconf-devel BuildRequires: desktop-file-utils @@ -70,20 +56,7 @@ clickable URLs. %setup -q%{!?rel_build:n %{name}-%{commit}} %patch0 -p1 -b .better_defaults -%patch1 -p1 -b .0001 -%patch2 -p1 -b .0002 -%patch3 -p1 -b .0003 -%patch4 -p1 -b .0004 -%patch5 -p1 -b .0005 -%patch6 -p1 -b .0006 -%patch7 -p1 -b .0007 -%patch8 -p1 -b .0008 -%patch9 -p1 -b .0009 -%patch10 -p1 -b .0001 -%patch11 -p1 -b .0002 -%patch12 -p1 -b .0003 - -NOCONFIGURE=1 ./autogen.sh +%patch1 -p1 -b .fix-position %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh @@ -131,6 +104,9 @@ fi %changelog +* Sun Oct 02 2016 Wolfgang Ulbrich - 1.16.0-1 +- update to 1.16.0 release + * Thu Sep 22 2016 Wolfgang Ulbrich - 1.14.1-3 - fix rhbz (#1377805) - fix terminal window position with geometry option diff --git a/mate-terminal_0001-drop-ancient-and-irrelevant-gnome-files.patch b/mate-terminal_0001-drop-ancient-and-irrelevant-gnome-files.patch deleted file mode 100644 index 58c5693..0000000 --- a/mate-terminal_0001-drop-ancient-and-irrelevant-gnome-files.patch +++ /dev/null @@ -1,784 +0,0 @@ -From 7ac202c5d9cd7232fb2b56d4c0124f54f7a0593a Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 11:47:12 +0300 -Subject: [PATCH 1/9] drop ancient and irrelevant gnome files - ---- - HACKING | 13 -- - Makefile.am | 2 - - NEWS.GNOME | 730 ------------------------------------------------------------ - 3 files changed, 745 deletions(-) - delete mode 100644 HACKING - delete mode 100644 NEWS.GNOME - -diff --git a/HACKING b/HACKING -deleted file mode 100644 -index a0c8d3f..0000000 ---- a/HACKING -+++ /dev/null -@@ -1,13 +0,0 @@ --Do NOT commit to this module without permission from a maintainer; --see the MAINTAINERS file for who they are. -- --=============================================================================== -- --Discussion about mate-terminal should happen on desktop-devel-list@gnome.org, --mate-list@gnome.org, or usability@gnome.org, depending on what sort of --discussion it is. Reporting a bug on http://bugzilla.mate.org is equally fine. -- --Remember that the terminal emulation is provided by the VTE widget, maintained --as the 'vte' module on the MATE SVN. The mate-terminal product in bugzilla --only covers the menubar, toolbar, and command line options, essentially. VTE, --in turn, is responsible for the actual terminal display. -diff --git a/Makefile.am b/Makefile.am -index 896e361..26f2e87 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,8 +25,6 @@ bin_SCRIPTS = mate-terminal.wrapper - - EXTRA_DIST = \ - autogen.sh \ -- HACKING \ -- NEWS.GNOME \ - xmldocs.make \ - omf.make \ - mate-terminal.wrapper \ -diff --git a/NEWS.GNOME b/NEWS.GNOME -deleted file mode 100644 -index 4fa9a95..0000000 ---- a/NEWS.GNOME -+++ /dev/null -@@ -1,730 +0,0 @@ --2.32.0 --====== -- * MATE Terminal is now licensed under GPL 3 or later -- * New features: -- * Add a Search menu (#78963) -- * Enable "File -> Save Contents" again -- * Show an info-bar if failed to execute command -- * Add "Use custom default terminal size" profile setting (#607875) -- * Bugs fixed: -- * Closing tabs regression fixed (#521193) -- * Fix compiler warnings (#521417) -- * Escape ":", "@" or "/" chars within proxy user/password env vars (#614464) -- * All bugs fixed: http://bugzilla.mate.org/buglist.cgi?product=mate-terminal&bug_status=RESOLVED&resolution=FIXED&chfieldfrom=2010-03-29&chfieldto=2010-09-27+23:59:00&chfield=bug_status -- * Documentation updates -- * Many translation updates -- --2.30.0 --====== -- * Changes: -- * --geometry works again -- * tab detaching works again -- * unlimited scrollback -- * improved proxy env suppport -- * bold color support -- * Many bugs fixed: http://bugzilla.mate.org/buglist.cgi?product=mate-terminal&bug_status=RESOLVED&resolution=FIXED&chfieldfrom=2009-09-24&chfieldto=2010-03-29+23:59:00&chfield=bug_status -- * Many translation updates -- --2.28.0 --====== -- * Many bugs fixed: http://bugzilla.mate.org/buglist.cgi?product=mate-terminal&bug_status=RESOLVED&resolution=FIXED&chfieldfrom=2009-03-16&chfieldto=2009-09-21+23:59:00&chfield=bug_status -- * Many translation updates -- --2.26.0 --====== -- * Libmatecomponent dependency dropped -- * Libmate and libmateui dependency dropped -- * Depends on VTE 0.19 -- * Now uses DBus for single instance/factory setup -- * Many bugs fixed: http://bugzilla.mate.org/buglist.cgi?product=mate-terminal&bug_status=RESOLVED&resolution=FIXED&chfieldfrom=2008-09-22&chfieldto=2009-03-16+23:59:00&chfield=bug_status -- * Many translation updates -- --2.23.4.2 --======== -- --* Fix crash at startup on non-UTF8 locale (RH#450808, RH#450979) --* Fix Ctrl-C (#538809) -- --2.23.4.1 --======== -- --* Fix the S/Key challenge dialogue (RH #451641) -- --2.23.4 --====== -- --* Bug fixes (#528683, #418192, #537112, #537888, #536899, #537215, #536639) --* Translation updates -- --2.23.3.1 --======== -- --- Fix the factory (bug #536463) -- --2.23.3 --====== -- --* Code cleanup --* Bug fixes -- --2.22.0 --=== --- Update translations. -- --2.21.92 --=== -- --- Ensure menu items are always drawn (weren't in some cases) --- Stop forcing invisible_char to '*' (yet again) -- --Updated translations: --* Djihed Afifi (ar) --* Josep Puigdemont (ca) --* Iñaki Larrañaga Murgoitio (eu) --* Ilkka Tuohela (fi) --* Robert-André Mauchin (fr) --* Massimo Furlani (fur) --* Ignacio Casal Quinteiro (gl) --* Yair Hershkovitz (he) --* Nabin Gautam (ne) --* Yannig Marchegay (Kokoyaya) (oc) --* wadim dziedzic (pl) --* Hugo Doria (pt_BR) --* Funda Wang (zh_CN) --* Woodman Tuen (zh_HK) --* Woodman Tuen (zh_TW) -- --2.21.5 --=== --- Adapt to new GChecksum API --- Bug 336155 – [patch] port mate-terminal to goption; based on patch -- from Christian Kirbach --- Fix cropped tab close buttons with mate-icon-theme svn --- Translation updates -- --2.21.4 --=== --- Fix a crasher and some cleanup: -- Bug 501635 – crash in Terminal: running mate-session-sa... -- Bug 501667 – Use GCheksum for md5 and sha1 -- Patch from Christian Persch -- Bug 501665 – Remove simple-x-font-selector -- Bug 144000 – encodings other than the current encoding are not listed -- in mate-terminal on Solaris. -- --2.21.3 --=== --- Synch version number to MATE release. --- Fix a crasher and some cleanup: -- Bug 499877 – Update terminal_app_get_clone_command() to use g_array -- Patch from Dubon -- Bug 499588 – remove menu icons handling code -- Patch from Christian Persch -- Bug 353775 – Use GtkNotebook instead of TerminalNotebook -- Patch from Christian Persch and Mariano Suárez-Alvarez -- Bug 441618 – Message-ID/news-Link crashes mate-terminal -- --2.18.3 --=== --- Updated translations. --- Fix couple of crashers -- Bug 494828 – crash in Terminal: Using elinks in a termin... -- Bug 499797 – crash in Terminal: Creating a new profile b... -- --2.18.2 --=== --- Misc bug fixes: -- Bug 464410 – license confusion -- Bug 458115 – Use tango color scheme by default -- --2.18.1 --=== --- A couple of crasher fixes. -- --2.18.0 --=== --- Fix some compilation issues. -- --Updated translations: -- norbu (dz), Ankit Patel (gu), Stefano Canepa (it), Žygimantas Beručka (lt) -- Thierry Randrianiriana (mg), Jovan Naumovski (mk), Leonardo Ferreira -- Fontenelle (pt_BR), Tuchinsky Artem (ru), Maxim Dziumanenko (uk) -- --2.17.92 --=== --- Fix some compilation issues. -- --Updated translations: -- bg(Alexander Shopov), fr(Robert-André Mauchin), he(Yair Hershkovitz), -- hu(Gabor Kelemen), ja(Takeshi AIHANA), lt(Žygimantas Beručka), pl(Wadim -- Dziedzic), pt(Duarte Loreto), zh_CN(Funda Wang), zh_HK(Woodman Tuen), -- zh_TW(Woodman Tuen) -- --2.17.91 --=== --- Plug a memory leak. --- Do not disable some keybindings when DnDing notebook pages. -- --Updated translations: -- et(Ivar Smolin), fr(Jonathan Ernst, Robert-André Mauchin), -- ko(Young-Ho Cha), nl(Wouter Bolsterlee), pt_BT(Guilherme de S. Pastore) -- -- --2.17.90 --=== --- Include the Tango color scheme. --- Remember the zoom setting for new tabs. --- Do not have clashing shortcuts in popups. --- Do not resize when switching between tabs, hopefully. --- Focus new terminals when they are created, always. --- Handle long terminal titles better. --- Do not paint initially terminals black. --- Various UI updates and inconsistencies eliminated. --- A few crashes fixed. -- --Thanks to all contributors: -- Behdad Esfahbod -- Dennis Cranston -- Diego Escalante Urrelo -- Egmont Koblinger -- Eric Anderson -- Mark Schreiber -- Matthias Clasen -- Michael Terry -- Wouter Bolsterlee -- --New and updated translations: -- ar(Mohamed Magdy, Djihed Afifi), be(Ihar Hrachyshka), ca(Josep -- Puigdemont i Casamajó), cs(Jakub Friedl), cy(Rhys Jones), da(Lasse -- Bang Mikkelsen), de(Hendrik Richter), en_GB(David Lodge), es(Francisco -- Javier F. Serrador), et(Ivar Smolin), fi(Ilkka Tuohela), ja(Satoru -- SATOH), ku(Erdal Ronahi, Elixan Loran), lv(Raivis Dejus), nb(Kjartan -- Maraas), nn(Åsmund Skjæveland), sv(Daniel Nylander), th(Theppitak -- Karoonboonyanan), vi(Clytie Siddall) -- --2.16.1 --=== -- --- Honours the --title switch (bug #342531) --- Fixes a couples of memory leaks (bugs #353553 and #353732) -- --- New and updated translations: -- * az: Metin Amiroff -- * bn_IN: Runa Bhattacharjee -- * ca: Jordi Mallach -- * cy: Rhys Jones -- * de: Hendrik Richter -- * en_GB: David Lodge -- * es: Francisco Javier F. Serrador -- * et: Ivar Smolin -- * ga: Alastair McKinstry -- * gu: Ankit Patel -- * he: Yair Hershkovitz -- * hi: Rajesh Ranjan -- * hu: Gabor Kelemen -- * lv: Raivis Dejus -- * pa: A S Alam -- * pt: Duarte Loreto -- * ru: Tuchinsky Artem -- * uk: Maxim Dziumanenko -- * vi: Clytie Siddall -- * wa: Pablo Saratxaga -- * zh_CN: Funda Wang -- * zh_TW: Woodman Tuen -- --2.16.0 --=== -- Bug 354056 – Build broken: missing help/fr/Makefile.am -- Bug 351319 – crash on Terminal -- Patch from Mariano Suárez-Alvarez -- Part of Bug 352873 – crash in Terminal: Edit current profile aft... -- Patch from Mariano Suárez-Alvarez -- Bug 353020 – Detaching a tab does not preserve the size -- Patch from Mariano Suárez-Alvarez -- Bug 336943 – Critical warning and crash in mate-terminal -- Patch from Mariano Suárez-Alvarez -- Bug 138609 – Next/prev TAB keybindings should not be passed through on -- first/last tab -- Patch from Bastien Nocera -- Fix intltool req. [Kjartan Maraas] -- --2.15.4 --=== -- Bug 349459 – does not assert dependency on gdk 2.10 -- Bug 85926 – dnd'd filenames should be escaped -- Patch from Thomas Folz-Donahue -- --2.15.3 --=== -- Bug 324426 – Open/close tab adds row to terminal -- Patch from Eric Anderson -- Bug 336947 – [patch] Redundant vte_terminal_set_font_full() calls -- Patch from Aivars Kalvans -- This change, with the respective change in vte-0.13.4, -- improves g-t's startup time around 20%. -- --2.15.2 --=== -- --- Use real transparency when it's available (bug #345378, Kristian Høgsberg) --- Improve the dialog to ask for confirmation when closing a window -- with more than one tab open. (bug #345166) -- --2.15.1 --=== -- --- Use intltool 0.35 to fix the bug with no translations in tarball. -- (bug #342068) --- Remove the m4 directory. -- --2.15.0 --=== -- --Thanks for this release go to Behdad Esfahbod, Guilherme de S. Pastore, --Tommi Vainikainen and all the translators listed below. -- --- Migrated to mate-doc-utils. --- Migrated to po/LINGUAS (bug #337904). --- Exports authentication proxy settings (bug #339134). --- Correctly recognizes Xrender on Solaris (bug #339979). --- Fixes the close button of the about dialog (bug #335945). --- Includes final slashes on URL highlighting (bug #329003). --- Eliminates superfluous resize on drag-n-drop (bug #336325). --- Stores the position of the window on session save (bug #336910). -- --- New and updated translations: -- * Belarusian [Ales Nyakhaychyk] -- * Dutch [Wouter Bolsterlee] -- * Dzongkha [Tommi Vainikainen] -- * Estonian [Ivar Smolin] -- * French [Laurent Richard] -- * Georgian [Vladimer Sichinava] -- * Hungarian [Gabor Kelemen] -- * Spanish [Francisco Javier F. Serrador] -- --2.14.0 --=== -- --- New and updated translations: -- * Albanian [Laurent Dhima] -- * Brazilian Portuguese [Guilherme de S. Pastore] -- * Czech [Petr Tomeš] -- * Danish [Lasse Bang Mikkelsen] -- * Estonian [Ivar Smolin] -- * Hindi [Rajesh Ranjan] -- * Italian [Stefano Canepa] -- * Romanian [Mugurel Tudor] -- * Spanish [Francisco Javier F. Serrador] -- * Swedish [Daniel Nylander] -- --2.13.93 --=== -- --- Fixes two crashes/freezes (bugs #318797, #330246) --- Has a slightly better Brazilian Portuguese translation -- --2.13.92 --=== -- --- Fixes a build failure (bug #333292) --- Adds licensing informaiton to the UI (bug #330875) --- Has lots of updated translations! -- --2.13.91 --=== -- --- Stopped forcing invisible_char to '*' (bug #329294) --- Re-added the context menu for highlighted URLs (bug #329553) -- --- Updated translations: -- * Canadian English [Adam Weinberger] -- * Catalan [Josep Puigdemont i Casamajó] -- * Dutch [Tino Meinen] -- * Finnish [Ilkka Tuohela] -- * Simplified Chinese [Funda Wang] -- * Thai [Theppitak Karoonboonyanan] -- * Vietnamese [Clytie Siddall] -- --2.13.90 --=== -- --- Fixed the handling of file:// URLs --- Fixed the setting of accelerators (bug #328052) --- Fixed the heights of the huge tabs (bug #327412) --- Added a tool tip to the tabs' close buttons --- Added F11 as default accelerator for fullscreen (bug #326781) --- Allow returning to dynamically setting the title by manually -- setting it to an empty string (bug #328932) --- Several fixes and improvements to the patches applied for exporting -- the MATE proxy settings to the terminal and disabling anti-aliasing --- Other optimizations, cleanups and standards-compliance changes (bug #328043) -- --- Lots of updated translations; huge thanks to the translators! -- --2.13.3 --=== -- --- Fix a crash at startup (bug #327313) -- --- New, updated and fixed translations: -- * Belarusian [Ales Nyakhaychyk] -- * Danish [Lasse Bang Mikkelsen] -- * Canadian English [Adam Weinberger] -- * Estonian [Ivar Smolin] -- * Finnish [Ilkka Tuohela] -- * Gujarati [Ankit Patel] -- * Serbian [Слободан Д. Средојевић] -- * Vietnamese [Clyttie Siddall] -- --2.13.2 --=== -- --- Added close buttons to the tabs (bug #71444) --- Added support for One-Time Passwords (bug #310529) --- Added tooltips that display the full title to the tabs (bug #310137) --- Make file:// URLs work by splitting their handling from others (bug #309201) --- Avoid title desyncs by setting icon title together with window title (bug #324965) --- Keep the title unchanged after it has been manually set (bug #152986) --- Export the MATE proxy settings to the terminal (bug #321952) --- General build, user interface, performance and internationalization improvements -- (bugs #100038, #129889, #139332, #158319, #324246) -- --- New, updated and fixed translations: -- * Bulgarian [Vladimir Petkov] -- * Brazilian Portuguese [Guilherme de S. Pastore] -- * Canadian English [Adam Weinberger] -- * Danish [Lasse Bang Mikkelsen] -- * Dutch [Tino Meinen] -- * Estonian [Ivar Smolin] -- * Finnish [Ilkka Tuohela] -- * Galician [Ignacio Casal Quinteiro] -- * German [Hendrik Brandt] -- * Gujarati [Ankit Patel] -- * Japanese [Takeshi AIHANA] -- * Norwegian [Kjartan Maraas] -- * Norwegian bokmål [Kjartan Maraas] -- * Serbian [Слободан Д. Средојевић] -- * Spanish [Francisco Javier F. Serrador] -- * Thai [Theppitak Karoonboonyanan] -- * Vietnamese [Clytie Siddall] -- --2.13.1 --=== -- --- New maintainer! (Guilherme de S. Pastore) -- --- Revert the environment variable patch. It caused hangs etc. (Olav Vitters) --- Fix i18n issue with application name (Frédéric Crozat, Olav) --- Fix some compiler warnings (Kjartan Maraas) --- Drop lots of unnecessary strings (Guilherme) --- General cleanups and UI improvements (Guilherme) --- Actually remove profiles when they are deleted (Guilherme) --- Moved from section System to Utility in the menu (Guilherme) -- --- New, updated and fixed translations: -- * Brazilian Portuguese [Guilherme de S. Pastore] -- * Catalan [Josep Puigdemont i Casamajó] -- * Finnish [Ilkka Tuohela] -- * Gujarati [Ankit Patel] -- * Japanese [Takeshi AIHANA] -- * Kinyarwanda [Guilherme de S. Pastore] -- * Lithuanian [Žygimantas Beručka] -- * Nepali [Guilherme de S. Pastore] -- * Spanish [Francisco Javier F. Serrador] -- * Thai [Theppitak Karoonboonyanan] -- * Vietnamese [Clytie Siddall] -- * Xhosa [Guilherme de S. Pastore] -- --2.13.0 --=== -- --- Don't lose environment variables on startup (Davyd) --- Only show mnemonics when the menubar is visible (DanW) --- Detachable and movable tabs (Tony Tsui, Mario Manno) --- Don't use deprecated widgets (Dennis Cranston) --- Don't pass include flags to the link stage (dmacks@netspace.org) -- --2.12.0 --=== -- --- Translation updates: -- -- Catalan, Czech, Estonian, French, German, -- Hungarian, Lithuanian, Norwegian Nynorsk, Russian, -- Serbian, Turkish, Welsh. -- --2.11.3 --=== -- --- Don't always go back to the default profile when editing -- a different profile (Chris Heath) --- Translation updates -- --2.11.2 --=== -- --- Reimplement the S/KEY support so we don't ship code that -- isn't GPL-compliant. (Michele Baldessari) --- HIG fixes (Dennis Cranston) --- Translation updates -- --2.11.1 --=== -- --- Accept DND drops from Konqueror (Bastien Nocera) --- HIG fixes (Dennis Cranston, Corey Burger, Olav Vitters) --- Update profile names instantly (Anoop M.) --- Include trailing slash when highlighting an URL (Samuel Abels) --- Use the correct name for the Cyrillic/Ukrainian locale (Michele -- Baldessari) --- Open folders that are dropped on a terminal launcher (John Spray) --- Ask the user before creating two profiles with the same name -- (egeetha@novell.com) --- Fix highlighting of NNTP links (Sebastien Bacher) --- Use the right keycombo to zoom to normal size (according to the HIG) -- (Olav Vitters, Sitsofe Wheeler) --- Add Name attribute to the server definition (Rodrigo Moya) --- Translation updates: be, bg, el, en_CA, et, gl, nb, pt_BR, rw, vi, -- wa, xh, zh_TW -- --2.10.0 --=== -- --- Translation updates: bg, ca, et, hu, lt, nl, ro, sr, sr@Latn, uk, zh_TW --- Ukrainian translation of the docs -- --2.9.3 --=== -- --- Approximate the time that mate-terminal was launched if not launched with -- startup-notification (Elijah Newren) [#168812] --- Translation updates: Vladimir Petkov (bg), Jordi Mallach (ca), Kostas -- Papadimas (el), Priit Laes (et), Pauli Virtanen (fi), Christophe -- Merlet (RedFox) (fr), Ankit Patel (gu), Takeshi AIHANA (ja), Young-Ho Cha (ko), -- Žygimantas Beručka (lt), Kjartan Maraas (nb), Rajeev Shrestha (ne), Åsmund -- Skjæveland (nn), Kjartan Maraas (no), Mate PL Team (pl), Gustavo Noronha -- Silva (pt_BR), Duarte Loreto (pt), Leonid Kanter (ru), Marcel Telka (sk), -- Christian Rose (sv), Theppitak Karoonboonyanan (th), Maxim Dziumanenko (uk) -- --2.9.2 --=== --- Correct handling of the clipboard and of the clipboard availability checking. --- Port to the new GTK widgets. --- Support _NET_WM_USER_TIME (Elijah Newren) --- Be more HIGgy in a couple of dialogs (Dennis Cranston) --- Translation updates: Vladimir Petkov (bg), Miloslav Trmac (cs), Martin Willemoes -- Hansen (da), Hendrik Richter (de), Adam Weinberger (en_CA), David Lodge (en_GB), -- es@li.org (es), Laszlo Dvornik (hu), Takeshi AIHANA (ja), Daniel van Eeden (nl), -- Gustavo Noronha Silva (pt_BR), Laurent Dhima (sq), Funda Wang (zh_CN). -- --2.9.1 --=== --- Make all terminal windows be group leaders; this will change the way grouping is -- done by window-managers, closer to what people expect (hopefully). --- Match news: URIs, and recognize more mailto: ones. --- Add --full-screen --- Cleanups and leaks fixed from Alexey Spiridonov, Kjartan Maraas. --- Fixed a couple of hotkey clashes, caught by Damian Keogh. --- Set accessible descriptions correctly on the profile dialog; caught by Frances Keenan. --- Translation updates: Miloslav Trmac (cs), Martin Willemoes Hansen (da), -- Adam Weinberger (en_CA), Christophe Merlet (RedFox) (fr), Mohammad DAMT (id), -- Young-Ho Cha (ko), Kjartan Maraas (nb), Kjartan Maraas (no). -- --2.8.0 --=== --- HIG fixes --- a11y fixes for the encodings menu --- fix georgian encoding --- added and updated translations -- --2.7.3 --=== --- Fix an annoying issue with the pointer getting ‘stuck’. --- Allow translators to set the default contents of the encodings menu. --- Deal with lastlog/utmp/wtmp sanely. --- Updated translations: Rostislav Raykov (bg), Miloslav Trmac (cs), -- Adam Weinberger (en_CA), Gareth Owen (en_GB), Takeshi AIHANA (ja), -- Žygimantas Beručka (lt), Arangel Angov (mk), Mate PL Team (pl), -- Laurent Dhima (sq). -- --2.7.2 --=== --- Be more HIGgy in dialogs. In particular, be more precise in some labels, -- and make a few things (in)sensitive when needed. --- Do not accept repeated shortcuts (Kiran Kumar Immidi) --- Make gcc 3.4.0 like us (Stef van der Made), --- Add a confirmation dialog when closing a window with >1 tabs. --- Use the mate-common scripts. --- Make the xterm color paletter exactly match xterm's. --- Now profiles can implement the analogue of xterm's -hold command line option. -- (Kurt V. Hindenburg) --- Make references into the documentation actually point somewhere. --- Recognize mailto: (with or without the mailto:...) and webdav: uris --- Updated translations: Jordi Mallach (ca), Iñaki Larrañaga Murgoitio (eu), -- Nirav, Ankit, Ankur, Atit, Bhavin, Kartik, Khushbu, Sweta (gu), Laszlo Dvornik (hu), -- Mohammad DAMT (id), Stanislav Visnovsky (sk). -- --2.6.0 --=== --- Make new tabs/windows open in the current directory of the current tab. --- Handle icon and window titles separately when needed. --- Set window roles on all windows, so that window managers can use -- this information. --- Lots of changes so that the interface follows the HIG more closely and -- plays well and consistently with the rest of MATE, becoming in general -- more usable. This includes from wording changes to various rearrangements -- in the interface to behaviour changes.- Updated and enhanced manual. --- Better URL recognition. --- Some accessibility improvements. --- Better handling of session saving. --- Lots of amazing work by translators; since last time, we have added Tamil, -- Norwegian Nynorsk, Croatia/Hrvatska, Thai and Canadian English. --- Moved to the new GTK+ widgets in most places. --- Fixed quite a few bugs and memory leaks. -- --Thanks go to everybody who participated in this: translators, documenters, --bug herders, testers, bug reporters and a big et caetera. -- --2.5.90 --=== -- -- - Fixed an accelerator clash in the popup, caught by Ben Maurer. -- - Code cleanups in accessilibity code, spotted by Padraig O'Briain -- - Updated translations: Mətin Əmirov (az), Miloslav Trmac (cs), -- Ole Laursen (da), Christian Neumair (de), Kostas Papadimas (el), -- Francisco Javier F. Serrador (es), Christophe Merlet (fr), Takeshi -- AIHANA (ja), Žygimantas Beručka (lt), Sanlig Badral (mn), Vincent -- van Adrighem (nl), Kjartan Maraas (no), Artur Flinta (pl), Duarte -- Loreto (pt), Laurent Dhima (sq), Danilo Šegan (sr), Christian Rose (sv). -- - New translations: Adam Weinberger (en_CA), Chatchawarn Hansakunbuntheung -- and Chanchai Junlouchai (th). -- --2.5.5 --=== -- -- - Fixed a crash under IceWM, thanks to Owen, who “spent quite some -- time looking at protocol traces”. -- - Use the new file chooser, now that libmateui allows us to do that. -- - Be better w.r.t. a11y; Muktha Narayan. -- - A couple of minor miscellaneous fixes. -- - Updated translations: Mətin Əmirov (az), Miloslav Trmac (cs), -- Nikos Charonitakis (el), Francisco Javier F. Serrador (es), -- Pauli Virtanen (fi), Christophe Merlet (RedFox) (fr), -- Takeshi AIHANA (ja), Young-Ho Cha (ko), Daniel van Eeden (nl), -- Kjartan Maraas (no), Mate PL Team (pl), Laurent Dhima (sq), -- Слободан Средојевић (sr), Christian Rose (sv), Maxim Dziumanenko (uk). -- --2.5.4 --=== -- -- - Fixed saving the geometry of windows with tabs to the session. -- - Be smarter on Solaris (Robert Basch) -- - Use the new GTK+ API in more places. -- - Make keyboard shortcuts work even when the menubar is hidden. -- - Updated translations: Arafat Medini (ar), Mətin Əmirov (az), Miloslav -- Trmac (cs), Ole Laursen (da), Christian Neumair (de), Francisco Javier -- F. Serrador (es), Christophe Merlet (RedFox) (fr), Alastair McKinstry -- (ga), Robert Sedak (hr), Takeshi AIHANA (ja), Young-Ho Cha (ko), -- Žygimantas Beručka (lt), Sanlig Badral (mn), Daniel van Eeden (nl), -- Åsmund Skjæveland (nn), Kjartan Maraas (no), Mate PL Team (pl), Duarte -- Loreto (pt), Laurent Dhima (sq), Слободан Средојевић (sr). -- --2.5.1 --=== -- -- - Fixed the navigation among notebook tabs. -- - Make sure the profile editor sets mnemonic widgets on things so that we are nice -- to gnopernicus/GOK users. -- - Updates to the manual. -- - Follow the HIG and the GDSG more closely. -- - Make uris go through mate_vfs_make_uri_from_input so that -- things like www.mate.org are properly handled (Behdad Esfahbod). -- --2.5.0 --=== -- -- Thanks to Kjartan Maraas for hunting memleaks, and the translation team. -- -- - Make new windows/tabs open in the current tab's working directory, and -- make factory calls start shells in the directory current at the call. -- - Fixed a couple of crasher bugs. -- - Fixed a couple of ngettext related problems. -- - Various UI enhancements in menus, key navigation et caetera. -- - Make sensible use of xterm's control sequences for setting icon titles. -- - Set roles on all windows, so that window managers can use them. -- - Fix a few memory leaks, found by Kjartan Maraas. -- --2.4.0 --=== -- -- Thanks to Mariano Suarez-Alvarez, Irene Ryan, Pasupath Duraisamy -- for contributions to this release. Thanks as always to the -- translation team. -- -- - fix skey dingus -- - translate default profile title -- - documentation improvements -- - fix some error messages -- - only allow numeric values in spinbutton in profiles dialog -- - actually use system font when requested -- - improve HIG compliance -- --2.3.2 --=== -- -- Thanks to Mariano Suarez-Alvarez, John Fleck, Kjartan Maraas, -- Nalin Dahyabhai, Mark Finlay, Jonathan Blandford, Paul Duran for -- contributions to this release. Thanks also to the tireless -- translators. -- -- - fixups to config key descriptions in .schemas -- - update active widget on tab switching, fixes several -- bugs -- - don't add accelerator for notebook tab 1 if there's -- only one tab -- - add mimetype so you can OpenWith->Terminal in caja -- - open new windows and tabs in same directory as -- the current tab -- - don't show URL-related menu items when no url was -- clicked on -- - handle underscores in profile names -- - fixups to regexp for urls -- - HIG fixes -- - fix up build system for online help -- - fix a memleak -- --2.3.1 --=== -- -- Thanks to Christophe Fergeau, Nalin Dahyabhai, Breda McColgan, -- Mariano Suarez-Alvarez, Shivram Upadhyayula, Mike Lei, Laszlo -- Kovacs, Kjartan Maraas, Pasupathi Duraisamy for help with this -- release. -- -- - fix compilation with old compilers -- - fix some memory corruption screwups in argument parsing, -- and don't mangle post-"-x" options -- - make background shading really work -- - documentation updates -- - translation updates -- - clean up handling of dingus click in combination with -- modifiers -- - dropped libzvt support -- - set application name for window group in window list -- - add --active command line option to preserve -- active tab across sessions -- - add --tab/--window options -- - background scrolling now works -- - tab focus fix -- - honor "menus have icons" pref -- - clean up some duplicate mnemonics in prefs dialog -- --2.1.4 --=== -- -- - filter out duplicate encodings in encoding menu (Nalin) -- - require GTK+ 2.2.0 -- - don't leak GladeXML objects -- - add ISO-8859-2 support to encodings menu -- - fix up about dialog (Christian Neumair) -- - fix save/restore working dir on Solaris (Satyajit Kanungo) --- -2.7.4 - diff --git a/mate-terminal_0001-fix-resize-menu-buttons-122.patch b/mate-terminal_0001-fix-resize-menu-buttons-122.patch deleted file mode 100644 index 29d65bb..0000000 --- a/mate-terminal_0001-fix-resize-menu-buttons-122.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 4b12dda42e1c1b49a14474045c2013cb87e6be58 Mon Sep 17 00:00:00 2001 -From: Alexei Sorokin -Date: Tue, 6 Sep 2016 16:35:11 +0300 -Subject: [PATCH 1/2] fix resize menu buttons (#122) - -based on https://github.com/GNOME/gnome-terminal/commit/88bd325 ---- - src/terminal-window.c | 161 +++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 120 insertions(+), 41 deletions(-) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index e7b53a2..c0e5f1f 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -66,9 +66,24 @@ struct _TerminalWindowPrivate - - GtkWidget *menubar; - GtkWidget *notebook; -+ GtkWidget *main_vbox; - TerminalScreen *active_screen; -+ -+ /* Size of a character cell in pixels */ - int old_char_width; - int old_char_height; -+ -+ /* Width and height added to the actual terminal grid by "chrome" inside -+ * what was traditionally the X11 window: menu bar, title bar, -+ * style-provided padding. This must be included when resizing the window -+ * and also included in geometry hints. */ -+ int old_chrome_width; -+ int old_chrome_height; -+ -+ /* Width and height of the padding around the geometry widget. */ -+ int old_padding_width; -+ int old_padding_height; -+ - void *old_geometry_widget; /* only used for pointer value as it may be freed */ - - GtkWidget *confirm_close_dialog; -@@ -899,7 +914,7 @@ terminal_size_to_cb (GtkAction *action, - - vte_terminal_set_size (VTE_TERMINAL (priv->active_screen), width, height); - -- terminal_window_set_size_force_grid (window, priv->active_screen, TRUE, -1, -1); -+ terminal_window_set_size (window, priv->active_screen, TRUE); - } - - static void -@@ -1074,7 +1089,7 @@ screen_resize_window_cb (TerminalScreen *screen, - if (screen != priv->active_screen) - return; - -- terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1); -+ terminal_window_set_size (window, screen, TRUE); - } - - static void -@@ -1968,7 +1983,6 @@ terminal_window_init (TerminalWindow *window) - GtkActionGroup *action_group; - GtkAction *action; - GtkUIManager *manager; -- GtkWidget *main_vbox; - GError *error; - GtkWindowGroup *window_group; - GtkAccelGroup *accel_group; -@@ -2000,9 +2014,9 @@ terminal_window_init (TerminalWindow *window) - priv->active_screen = NULL; - priv->menubar_visible = FALSE; - -- main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -- gtk_container_add (GTK_CONTAINER (window), main_vbox); -- gtk_widget_show (main_vbox); -+ priv->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -+ gtk_container_add (GTK_CONTAINER (window), priv->main_vbox); -+ gtk_widget_show (priv->main_vbox); - - priv->notebook = gtk_notebook_new (); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); -@@ -2026,11 +2040,17 @@ terminal_window_init (TerminalWindow *window) - g_signal_connect (priv->notebook, "create-window", - G_CALLBACK (handle_tab_droped_on_desktop), window); - -- gtk_box_pack_end (GTK_BOX (main_vbox), priv->notebook, TRUE, TRUE, 0); -+ gtk_box_pack_end (GTK_BOX (priv->main_vbox), priv->notebook, TRUE, TRUE, 0); - gtk_widget_show (priv->notebook); - - priv->old_char_width = -1; - priv->old_char_height = -1; -+ -+ priv->old_chrome_width = -1; -+ priv->old_chrome_height = -1; -+ priv->old_padding_width = -1; -+ priv->old_padding_height = -1; -+ - priv->old_geometry_widget = NULL; - - /* Create the UI manager */ -@@ -2080,7 +2100,7 @@ terminal_window_init (TerminalWindow *window) - } - - priv->menubar = gtk_ui_manager_get_widget (manager, "/menubar"); -- gtk_box_pack_start (GTK_BOX (main_vbox), -+ gtk_box_pack_start (GTK_BOX (priv->main_vbox), - priv->menubar, - FALSE, FALSE, 0); - -@@ -2549,15 +2569,33 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - int force_grid_width, - int force_grid_height) - { -+ TerminalWindowPrivate *priv = window->priv; - GtkWidget *widget; - GtkWidget *app; -- int grid_width; -- int grid_height; -+ int grid_width, grid_height; -+ gint pixel_width, pixel_height; -+ GdkWindow *gdk_window; -+ -+ gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); -+ result = TRUE; -+ -+ if (gdk_window != NULL && -+ (gdk_window_get_state (gdk_window) & -+ (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_TILED))) -+ { -+ /* Don't adjust the size of maximized or tiled (snapped, half-maximized) -+ * windows: if we do, there will be ugly gaps of up to 1 character cell -+ * around otherwise tiled windows. */ -+ return result; -+ } - - /* be sure our geometry is up-to-date */ - terminal_window_update_geometry (window); - -- widget = GTK_WIDGET (screen); -+ if (GTK_IS_WIDGET (screen)) -+ widget = GTK_WIDGET (screen); -+ else -+ widget = GTK_WIDGET (window); - - app = gtk_widget_get_toplevel (widget); - g_assert (app != NULL); -@@ -2568,10 +2606,29 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - grid_width = force_grid_width; - if (force_grid_height >= 0) - grid_height = force_grid_height; -+ -+ /* the "old" struct members were updated by update_geometry */ -+ pixel_width = priv->old_chrome_width + grid_width * priv->old_char_width; -+ pixel_height = priv->old_chrome_height + grid_height * priv->old_char_height; -+ -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, -+ "[window %p] size is %dx%d cells of %dx%d px\n", -+ window, grid_width, grid_height, -+ priv->old_char_width, priv->old_char_height); -+ -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, -+ "[window %p] %dx%d + %dx%d = %dx%d\n", -+ window, grid_width * priv->old_char_width, -+ grid_height * priv->old_char_height, -+ priv->old_chrome_width, priv->old_chrome_height, -+ pixel_width, pixel_height); -+ - if (even_if_mapped && gtk_widget_get_mapped (app)) -- gtk_window_resize_to_geometry (GTK_WINDOW (app), grid_width, grid_height); -+ gtk_window_resize (GTK_WINDOW (app), pixel_width, pixel_height); - else -- gtk_window_set_default_geometry (GTK_WINDOW (app), grid_width, grid_height); -+ gtk_window_set_default_size (GTK_WINDOW (app), pixel_width, pixel_height); -+ -+ return result; - } - - void -@@ -2892,9 +2949,10 @@ terminal_window_update_geometry (TerminalWindow *window) - GtkWidget *widget; - GdkGeometry hints; - GtkBorder padding; -- GtkRequisition toplevel_request, widget_request; -- int base_width, base_height; -+ GtkRequisition toplevel_request, vbox_request, widget_request; -+ int grid_width, grid_height; - int char_width, char_height; -+ int chrome_width, chrome_height; - - if (priv->active_screen == NULL) - return; -@@ -2908,26 +2966,46 @@ terminal_window_update_geometry (TerminalWindow *window) - */ - terminal_screen_get_cell_size (priv->active_screen, &char_width, &char_height); - -- if (char_width != priv->old_char_width || -- char_height != priv->old_char_height || -- widget != (GtkWidget*) priv->old_geometry_widget) -- { -- /* FIXME Since we're using xthickness/ythickness to compute -- * padding we need to change the hints when the theme changes. -- */ -+ terminal_screen_get_size (priv->active_screen, &grid_width, &grid_height); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "%dx%d cells of %dx%d px = %dx%d px\n", -+ grid_width, grid_height, char_width, char_height, -+ char_width * grid_width, char_height * grid_height); -+ -+ gtk_style_context_get_padding(gtk_widget_get_style_context (widget), -+ gtk_widget_get_state_flags (widget), -+ &padding); - -- gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &toplevel_request); -- gtk_widget_get_preferred_size (widget, NULL, &widget_request); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "padding = %dx%d px\n", -+ padding.left + padding.right, -+ padding.top + padding.bottom); - -- base_width = toplevel_request.width - widget_request.width; -- base_height = toplevel_request.height - widget_request.height; -+ gtk_widget_get_preferred_size (priv->main_vbox, NULL, &vbox_request); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "content area requests %dx%d px\n", -+ vbox_request.width, vbox_request.height); - -- gtk_style_context_get_padding (gtk_widget_get_style_context (widget), -- gtk_widget_get_state_flags (widget), -- &padding); -+ gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &toplevel_request); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "window requests %dx%d px\n", -+ toplevel_request.width, toplevel_request.height); - -- hints.base_width = base_width + padding.left + padding.right; -- hints.base_height = base_height + padding.top + padding.bottom; -+ chrome_width = vbox_request.width - (char_width * grid_width); -+ chrome_height = vbox_request.height - (char_height * grid_height); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "chrome: %dx%d px\n", -+ chrome_width, chrome_height); -+ -+ gtk_widget_get_preferred_size (widget, NULL, &widget_request); -+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "terminal widget requests %dx%d px\n", -+ widget_request.width, widget_request.height); -+ -+ if (char_width != priv->old_char_width || -+ char_height != priv->old_char_height || -+ padding.left + padding.right != priv->old_padding_width || -+ padding.top + padding.bottom != priv->old_padding_height || -+ chrome_width != priv->old_chrome_width || -+ chrome_height != priv->old_chrome_height || -+ widget != GTK_WIDGET (priv->old_geometry_widget)) -+ { -+ hints.base_width = chrome_width; -+ hints.base_height = chrome_height; - - #define MIN_WIDTH_CHARS 4 - #define MIN_HEIGHT_CHARS 1 -@@ -2956,8 +3034,6 @@ terminal_window_update_geometry (TerminalWindow *window) - hints.width_inc, - hints.height_inc); - -- priv->old_char_width = hints.width_inc; -- priv->old_char_height = hints.height_inc; - priv->old_geometry_widget = widget; - } - else -@@ -2966,6 +3042,15 @@ terminal_window_update_geometry (TerminalWindow *window) - "[window %p] hints: increment unchanged, not setting\n", - window); - } -+ -+ /* We need these for the size calculation in terminal_window_set_size(), -+ * so we set them unconditionally. */ -+ priv->old_char_width = char_width; -+ priv->old_char_height = char_height; -+ priv->old_chrome_width = chrome_width; -+ priv->old_chrome_height = chrome_height; -+ priv->old_padding_width = padding.left + padding.right; -+ priv->old_padding_height = padding.top + padding.bottom; - } - - static void -@@ -3860,23 +3945,17 @@ tabs_detach_tab_callback (GtkAction *action, - TerminalApp *app; - TerminalWindow *new_window; - TerminalScreen *screen; -- char *geometry; -- int width, height; - - app = terminal_app_get (); - - screen = priv->active_screen; - -- /* FIXME: this seems wrong if tabs are shown in the window */ -- terminal_screen_get_size (screen, &width, &height); -- geometry = g_strdup_printf ("%dx%d", width, height); -- - new_window = terminal_app_new_window (app, gtk_widget_get_screen (GTK_WIDGET (window))); - - terminal_window_move_screen (window, new_window, screen, -1); - -- gtk_window_parse_geometry (GTK_WINDOW (new_window), geometry); -- g_free (geometry); -+ /* FIXME: this seems wrong if tabs are shown in the window */ -+ terminal_window_set_size (new_window, screen, FALSE); - - gtk_window_present_with_time (GTK_WINDOW (new_window), gtk_get_current_event_time ()); - } --- -2.7.4 - diff --git a/mate-terminal_0002-don-t-use-deprecated-gtk_window_parse_geometry.patch b/mate-terminal_0002-don-t-use-deprecated-gtk_window_parse_geometry.patch deleted file mode 100644 index 23d97ad..0000000 --- a/mate-terminal_0002-don-t-use-deprecated-gtk_window_parse_geometry.patch +++ /dev/null @@ -1,282 +0,0 @@ -From d4bcc6614cfd459ad223664fe036f36bddf330c5 Mon Sep 17 00:00:00 2001 -From: Alexei Sorokin -Date: Tue, 6 Sep 2016 16:40:02 +0300 -Subject: [PATCH 2/2] don't use deprecated gtk_window_parse_geometry() - ---- - src/terminal-app.c | 5 +- - src/terminal-window.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++-- - src/terminal-window.h | 10 +-- - 3 files changed, 199 insertions(+), 12 deletions(-) - -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 9839c88..bfec5b5 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -1849,7 +1849,10 @@ terminal_app_handle_options (TerminalApp *app, - "[window %p] applying geometry %s\n", - window, iw->geometry); - -- if (!gtk_window_parse_geometry (GTK_WINDOW (window), iw->geometry)) -+ if (!terminal_window_set_size_force_grid (window, -+ terminal_window_get_active (window), -+ FALSE, -+ iw->geometry)) - g_printerr (_("Invalid geometry string \"%s\"\n"), iw->geometry); - } - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index c0e5f1f..2417650 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -318,6 +318,176 @@ app_setting_notify_destroy_cb (GdkScreen *screen) - - /* utility functions */ - -+/* -+ Derived from XParseGeometry() in X.org -+ -+ Copyright 1985, 1986, 1987, 1998 The Open Group -+ -+ All Rights Reserved. -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ OTHER DEALINGS IN THE SOFTWARE. -+ -+ Except as contained in this notice, the name of The Open Group shall -+ not be used in advertising or otherwise to promote the sale, use or -+ other dealings in this Software without prior written authorization -+ from The Open Group. -+*/ -+ -+/* -+ * XParseGeometry parses strings of the form -+ * "=x{+-}{+-}", where -+ * width, height, xoffset, and yoffset are unsigned integers. -+ * Example: "=80x24+300-49" -+ * The equal sign is optional. -+ * It returns a bitmask that indicates which of the four values -+ * were actually found in the string. For each value found, -+ * the corresponding argument is updated; for each value -+ * not found, the corresponding argument is left unchanged. -+ */ -+ -+/* The following code is from Xlib, and is minimally modified, so we -+ * can track any upstream changes if required. Don’t change this -+ * code. Or if you do, put in a huge comment marking which thing -+ * changed. -+ */ -+ -+static int -+terminal_window_ReadInteger (char *string, -+ char **NextString) -+{ -+ register int Result = 0; -+ int Sign = 1; -+ -+ if (*string == '+') -+ string++; -+ else if (*string == '-') -+ { -+ string++; -+ Sign = -1; -+ } -+ for (; (*string >= '0') && (*string <= '9'); string++) -+ { -+ Result = (Result * 10) + (*string - '0'); -+ } -+ *NextString = string; -+ if (Sign >= 0) -+ return (Result); -+ else -+ return (-Result); -+} -+ -+/* -+ * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding -+ * value (x, y, width, height) was found in the parsed string. -+ */ -+#define NoValue 0x0000 -+#define XValue 0x0001 -+#define YValue 0x0002 -+#define WidthValue 0x0004 -+#define HeightValue 0x0008 -+#define AllValues 0x000F -+#define XNegative 0x0010 -+#define YNegative 0x0020 -+ -+static int -+terminal_window_XParseGeometry (const char *string, -+ int *x, int *y, -+ unsigned int *width, -+ unsigned int *height) -+{ -+ int mask = NoValue; -+ register char *strind; -+ unsigned int tempWidth = 0, tempHeight = 0; -+ int tempX = 0, tempY = 0; -+ char *nextCharacter; -+ -+ if ( (string == NULL) || (*string == '\0')) return(mask); -+ if (*string == '=') -+ string++; /* ignore possible '=' at beg of geometry spec */ -+ -+ strind = (char *)string; -+ if (*strind != '+' && *strind != '-' && *strind != 'x') { -+ tempWidth = terminal_window_ReadInteger(strind, &nextCharacter); -+ if (strind == nextCharacter) -+ return (0); -+ strind = nextCharacter; -+ mask |= WidthValue; -+ } -+ -+ if (*strind == 'x' || *strind == 'X') { -+ strind++; -+ tempHeight = terminal_window_ReadInteger(strind, &nextCharacter); -+ if (strind == nextCharacter) -+ return (0); -+ strind = nextCharacter; -+ mask |= HeightValue; -+ } -+ -+ if ((*strind == '+') || (*strind == '-')) { -+ if (*strind == '-') { -+ strind++; -+ tempX = -terminal_window_ReadInteger(strind, &nextCharacter); -+ if (strind == nextCharacter) -+ return (0); -+ strind = nextCharacter; -+ mask |= XNegative; -+ -+ } -+ else -+ { strind++; -+ tempX = terminal_window_ReadInteger(strind, &nextCharacter); -+ if (strind == nextCharacter) -+ return(0); -+ strind = nextCharacter; -+ } -+ mask |= XValue; -+ if ((*strind == '+') || (*strind == '-')) { -+ if (*strind == '-') { -+ strind++; -+ tempY = -terminal_window_ReadInteger(strind, &nextCharacter); -+ if (strind == nextCharacter) -+ return(0); -+ strind = nextCharacter; -+ mask |= YNegative; -+ -+ } -+ else -+ { -+ strind++; -+ tempY = terminal_window_ReadInteger(strind, &nextCharacter); -+ if (strind == nextCharacter) -+ return(0); -+ strind = nextCharacter; -+ } -+ mask |= YValue; -+ } -+ } -+ -+ /* If strind isn't at the end of the string the it's an invalid -+ geometry specification. */ -+ -+ if (*strind != '\0') return (0); -+ -+ if (x != NULL && mask & XValue) -+ *x = tempX; -+ if (y != NULL && mask & YValue) -+ *y = tempY; -+ if (width != NULL && mask & WidthValue) -+ *width = tempWidth; -+ if (height != NULL && mask & HeightValue) -+ *height = tempHeight; -+ return (mask); -+} -+ - static char * - escape_underscores (const char *name) - { -@@ -2559,19 +2729,21 @@ terminal_window_set_size (TerminalWindow *window, - TerminalScreen *screen, - gboolean even_if_mapped) - { -- terminal_window_set_size_force_grid (window, screen, even_if_mapped, -1, -1); -+ terminal_window_set_size_force_grid (window, screen, even_if_mapped, NULL); - } - --void -+gboolean - terminal_window_set_size_force_grid (TerminalWindow *window, - TerminalScreen *screen, - gboolean even_if_mapped, -- int force_grid_width, -- int force_grid_height) -+ gchar *force_grid_string) - { - TerminalWindowPrivate *priv = window->priv; - GtkWidget *widget; - GtkWidget *app; -+ gboolean result; -+ int parse_result; -+ unsigned int force_grid_width, force_grid_height; - int grid_width, grid_height; - gint pixel_width, pixel_height; - GdkWindow *gdk_window; -@@ -2602,9 +2774,21 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - - terminal_screen_get_size (screen, &grid_width, &grid_height); - -- if (force_grid_width >= 0) -+ if (force_grid_string != NULL) -+ { -+ parse_result = terminal_window_XParseGeometry (force_grid_string, -+ NULL, NULL, -+ &force_grid_width, -+ &force_grid_height); -+ if (parse_result == NoValue) -+ result = FALSE; -+ } -+ else -+ parse_result = NoValue; -+ -+ if (parse_result & WidthValue) - grid_width = force_grid_width; -- if (force_grid_height >= 0) -+ if (parse_result & HeightValue) - grid_height = force_grid_height; - - /* the "old" struct members were updated by update_geometry */ -diff --git a/src/terminal-window.h b/src/terminal-window.h -index 2cdaebd..95ca805 100644 ---- a/src/terminal-window.h -+++ b/src/terminal-window.h -@@ -87,11 +87,11 @@ void terminal_window_update_geometry (TerminalWindow *window); - void terminal_window_set_size (TerminalWindow *window, - TerminalScreen *screen, - gboolean even_if_mapped); --void terminal_window_set_size_force_grid (TerminalWindow *window, -- TerminalScreen *screen, -- gboolean even_if_mapped, -- int force_grid_width, -- int force_grid_height); -+gboolean -+terminal_window_set_size_force_grid (TerminalWindow *window, -+ TerminalScreen *screen, -+ gboolean even_if_mapped, -+ gchar *force_grid_string); - - GtkWidget* terminal_window_get_notebook (TerminalWindow *window); - --- -2.7.4 - diff --git a/mate-terminal_0002-window-react-on-WM-change-only-on-X11.patch b/mate-terminal_0002-window-react-on-WM-change-only-on-X11.patch deleted file mode 100644 index 9d2c45b..0000000 --- a/mate-terminal_0002-window-react-on-WM-change-only-on-X11.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 6a2f8dec695108e86f9988f78ca1e37787daf8a3 Mon Sep 17 00:00:00 2001 -From: monsta -Date: Tue, 12 Jan 2016 13:01:54 +0300 -Subject: [PATCH 2/9] window: react on WM change only on X11 - ---- - src/terminal-window.c | 29 ++++++++++++++++++++++++++--- - 1 file changed, 26 insertions(+), 3 deletions(-) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 7415083..cfbe9d1 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -22,7 +22,9 @@ - #include - #include - #include -+#ifdef GDK_WINDOWING_X11 - #include -+#endif - #include - - #include -@@ -1677,9 +1679,18 @@ terminal_window_screen_update (TerminalWindow *window, - { - TerminalApp *app; - -- terminal_window_window_manager_changed_cb (screen, window); -- g_signal_connect (screen, "window-manager-changed", -- G_CALLBACK (terminal_window_window_manager_changed_cb), window); -+#ifdef GDK_WINDOWING_X11 -+#if GTK_CHECK_VERSION (3, 0, 0) -+ if (screen && GDK_IS_X11_SCREEN (screen)) -+#else -+ if (screen) -+#endif -+ { -+ terminal_window_window_manager_changed_cb (screen, window); -+ g_signal_connect (screen, "window-manager-changed", -+ G_CALLBACK (terminal_window_window_manager_changed_cb), window); -+ } -+#endif - - if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (screen), "GT::HasSettingsConnection"))) - return; -@@ -1712,12 +1723,18 @@ terminal_window_screen_changed (GtkWidget *widget, - if (previous_screen == screen) - return; - -+#ifdef GDK_WINDOWING_X11 -+#if GTK_CHECK_VERSION (3, 0, 0) -+ if (previous_screen && GDK_IS_X11_SCREEN (previous_screen)) -+#else - if (previous_screen) -+#endif - { - g_signal_handlers_disconnect_by_func (previous_screen, - G_CALLBACK (terminal_window_window_manager_changed_cb), - window); - } -+#endif - - if (!screen) - return; -@@ -2266,13 +2283,19 @@ terminal_window_dispose (GObject *object) - G_CALLBACK (update_edit_menu), - window); - -+#ifdef GDK_WINDOWING_X11 - screen = gtk_widget_get_screen (GTK_WIDGET (object)); -+#if GTK_CHECK_VERSION (3, 0, 0) -+ if (screen && GDK_IS_X11_SCREEN (screen)) -+#else - if (screen) -+#endif - { - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (terminal_window_window_manager_changed_cb), - window); - } -+#endif - - G_OBJECT_CLASS (terminal_window_parent_class)->dispose (object); - } --- -2.7.4 - diff --git a/mate-terminal_0003-use-About-dialog-from-GTK-instead-of-forked-one-from.patch b/mate-terminal_0003-use-About-dialog-from-GTK-instead-of-forked-one-from.patch deleted file mode 100644 index 252b934..0000000 --- a/mate-terminal_0003-use-About-dialog-from-GTK-instead-of-forked-one-from.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fd07010c4321d18ba3b183753e89dd70e2b756b9 Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 13:34:43 +0300 -Subject: [PATCH 3/9] use About dialog from GTK+ instead of forked one from - libmate-desktop - ---- - src/terminal-window.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/terminal-window.c b/src/terminal-window.c -index cfbe9d1..69f3063 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -27,8 +27,6 @@ - #endif - #include - --#include -- - #include "terminal-accels.h" - #include "terminal-app.h" - #include "terminal-debug.h" -@@ -4164,7 +4162,7 @@ help_about_callback (GtkAction *action, - - licence_text = terminal_util_get_licence_text (); - -- mate_show_about_dialog (GTK_WINDOW (window), -+ gtk_show_about_dialog (GTK_WINDOW (window), - "program-name", _("MATE Terminal"), - "copyright", copyright, - "comments", _("A terminal emulator for the MATE desktop"), --- -2.7.4 - diff --git a/mate-terminal_0004-use-dconf-directly-instead-of-wrapper-functions-from.patch b/mate-terminal_0004-use-dconf-directly-instead-of-wrapper-functions-from.patch deleted file mode 100644 index 96f76b7..0000000 --- a/mate-terminal_0004-use-dconf-directly-instead-of-wrapper-functions-from.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 072da32f99166bcaf932c4401826825e8155d0d8 Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 14:19:40 +0300 -Subject: [PATCH 4/9] use dconf directly instead of wrapper functions from - libmate-desktop - ---- - configure.ac | 2 ++ - src/terminal-app.c | 6 ++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9bf8cb3..d1c0316 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,6 +46,7 @@ AM_GLIB_GNU_GETTEXT - - GLIB_REQUIRED=2.36.0 - GIO_REQUIRED=2.25.12 -+DCONF_REQUIRED=0.13.4 - MATE_DESKTOP_REQUIRED=1.9.0 - - AC_MSG_CHECKING([which gtk+ version to compile against]) -@@ -79,6 +80,7 @@ PKG_CHECK_MODULES([TERM], - gthread-2.0 - gio-2.0 >= $GIO_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED -+ dconf >= $DCONF_REQUIRED - mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED - x11]) - -diff --git a/src/terminal-app.c b/src/terminal-app.c -index e3e23d0..495405d 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -24,6 +24,7 @@ - #include - - #include -+#include - - #include "terminal-intl.h" - -@@ -36,7 +37,6 @@ - #include "terminal-util.h" - #include "profile-editor.h" - #include "terminal-encoding.h" --#include - #include - #include - #include -@@ -327,12 +327,14 @@ terminal_app_delete_profile (TerminalApp *app, - mate_gsettings_remove_all_from_strv (app->settings_global, PROFILE_LIST_KEY, profile_name); - - /* And remove the profile directory */ -- if (!mate_dconf_recursive_reset (profile_dir, &error)) -+ DConfClient *client = dconf_client_new (); -+ if (!dconf_client_write_sync (client, profile_dir, NULL, NULL, NULL, &error)) - { - g_warning ("Failed to recursively unset %s: %s\n", profile_dir, error->message); - g_error_free (error); - } - -+ g_object_unref (client); - g_free (profile_dir); - } - --- -2.7.4 - diff --git a/mate-terminal_0005-copy-gsettings-helpers-from-libmate-desktop-see-also.patch b/mate-terminal_0005-copy-gsettings-helpers-from-libmate-desktop-see-also.patch deleted file mode 100644 index 35ba52b..0000000 --- a/mate-terminal_0005-copy-gsettings-helpers-from-libmate-desktop-see-also.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 8bb732366213934278401bf245f5ba265348b310 Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 15:38:59 +0300 -Subject: [PATCH 5/9] copy gsettings helpers from libmate-desktop (see also - FIXME there) - ---- - src/terminal-app.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 66 insertions(+), 3 deletions(-) - -diff --git a/src/terminal-app.c b/src/terminal-app.c -index 495405d..af9ac39 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -37,7 +37,6 @@ - #include "terminal-util.h" - #include "profile-editor.h" - #include "terminal-encoding.h" --#include - #include - #include - #include -@@ -155,6 +154,70 @@ static TerminalApp *global_app = NULL; - - #define ENCODING_LIST_KEY "active-encodings" - -+ -+/* two following functions were copied from libmate-desktop to get rid -+ * of dependency on it -+ * -+ * FIXME: I suspect there's no need for excessive copies, we might use -+ * existing profile list to form GVariant's and write them to GSettings -+ */ -+static gboolean -+gsettings_append_strv (GSettings *settings, -+ const gchar *key, -+ const gchar *value) -+{ -+ gchar **old; -+ gchar **new; -+ gint size; -+ gboolean retval; -+ -+ old = g_settings_get_strv (settings, key); -+ -+ for (size = 0; old[size] != NULL; size++); -+ -+ size += 1; /* appended value */ -+ size += 1; /* NULL */ -+ -+ new = g_realloc_n (old, size, sizeof (gchar *)); -+ -+ new[size - 2] = g_strdup (value); -+ new[size - 1] = NULL; -+ -+ retval = g_settings_set_strv (settings, key, -+ (const gchar **) new); -+ -+ g_strfreev (new); -+ -+ return retval; -+} -+ -+static gboolean -+gsettings_remove_all_from_strv (GSettings *settings, -+ const gchar *key, -+ const gchar *value) -+{ -+ GArray *array; -+ gchar **old; -+ gint i; -+ gboolean retval; -+ -+ old = g_settings_get_strv (settings, key); -+ array = g_array_new (TRUE, TRUE, sizeof (gchar *)); -+ -+ for (i = 0; old[i] != NULL; i++) { -+ if (g_strcmp0 (old[i], value) != 0) -+ array = g_array_append_val (array, old[i]); -+ } -+ -+ retval = g_settings_set_strv (settings, key, -+ (const gchar **) array->data); -+ -+ g_strfreev (old); -+ g_array_free (array, TRUE); -+ -+ return retval; -+} -+ - /* Helper functions */ - - static GdkScreen* -@@ -324,7 +387,7 @@ terminal_app_delete_profile (TerminalApp *app, - profile_name = terminal_profile_get_property_string (profile, TERMINAL_PROFILE_NAME); - profile_dir = g_strconcat (CONF_PROFILE_PREFIX, profile_name, "/", NULL); - -- mate_gsettings_remove_all_from_strv (app->settings_global, PROFILE_LIST_KEY, profile_name); -+ gsettings_remove_all_from_strv (app->settings_global, PROFILE_LIST_KEY, profile_name); - - /* And remove the profile directory */ - DConfClient *client = dconf_client_new (); -@@ -1101,7 +1164,7 @@ new_profile_response_cb (GtkWidget *new_profile_dialog, - new_profile /* adopts the refcount */); - - /* And now save the new profile name to GSettings */ -- mate_gsettings_append_strv (app->settings_global, -+ gsettings_append_strv (app->settings_global, - PROFILE_LIST_KEY, - new_profile_name); - --- -2.7.4 - diff --git a/mate-terminal_0006-drop-build-dep-on-libmate-desktop-it-s-not-needed-an.patch b/mate-terminal_0006-drop-build-dep-on-libmate-desktop-it-s-not-needed-an.patch deleted file mode 100644 index 0e91754..0000000 --- a/mate-terminal_0006-drop-build-dep-on-libmate-desktop-it-s-not-needed-an.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2d2dab52b25b32ad0fb8efc1d2e279fbd5e1955b Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 15:55:18 +0300 -Subject: [PATCH 6/9] drop build-dep on libmate-desktop, it's not needed - anymore - ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d1c0316..690d538 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -47,7 +47,6 @@ AM_GLIB_GNU_GETTEXT - GLIB_REQUIRED=2.36.0 - GIO_REQUIRED=2.25.12 - DCONF_REQUIRED=0.13.4 --MATE_DESKTOP_REQUIRED=1.9.0 - - AC_MSG_CHECKING([which gtk+ version to compile against]) - AC_ARG_WITH([gtk], -@@ -81,7 +80,6 @@ PKG_CHECK_MODULES([TERM], - gio-2.0 >= $GIO_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED - dconf >= $DCONF_REQUIRED -- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED - x11]) - - # ******** --- -2.7.4 - diff --git a/mate-terminal_0007-require-GTK-3.14-and-VTE-0.38-API-2.91-drop-with-gtk.patch b/mate-terminal_0007-require-GTK-3.14-and-VTE-0.38-API-2.91-drop-with-gtk.patch deleted file mode 100644 index 3f3cef3..0000000 --- a/mate-terminal_0007-require-GTK-3.14-and-VTE-0.38-API-2.91-drop-with-gtk.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8195dc9b0e609733ae76d2da7201fe1bd73c7d2d Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 16:53:00 +0300 -Subject: [PATCH 7/9] require GTK+ 3.14 and VTE 0.38 (API 2.91), drop - --with-gtk option - ---- - configure.ac | 31 ++++--------------------------- - 1 file changed, 4 insertions(+), 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 690d538..085c08e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,39 +46,16 @@ AM_GLIB_GNU_GETTEXT - - GLIB_REQUIRED=2.36.0 - GIO_REQUIRED=2.25.12 -+GTK_REQUIRED=3.14.0 -+VTE_REQUIRED=0.38 - DCONF_REQUIRED=0.13.4 - --AC_MSG_CHECKING([which gtk+ version to compile against]) --AC_ARG_WITH([gtk], -- [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], -- [case "$with_gtk" in -- 2.0|3.0) ;; -- *) AC_MSG_ERROR([invalid gtk version specified]) ;; -- esac], -- [with_gtk=2.0]) --AC_MSG_RESULT([$with_gtk]) -- --case "$with_gtk" in -- 2.0) GTK_API_VERSION=2.0 -- GTK_REQUIRED=2.24.0 -- GDK_TARGETS="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" -- VTE_REQUIRED=0.28 -- VTE_PC_VERSION= -- ;; -- 3.0) GTK_API_VERSION=3.0 -- GTK_REQUIRED=3.0.0 -- GDK_TARGETS="$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)" -- VTE_REQUIRED=0.38 -- VTE_PC_VERSION=-2.91 -- ;; --esac -- - PKG_CHECK_MODULES([TERM], -- [vte$VTE_PC_VERSION >= $VTE_REQUIRED -+ [vte-2.91 >= $VTE_REQUIRED - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-2.0 >= $GIO_REQUIRED -- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED -+ gtk+-3.0 >= $GTK_REQUIRED - dconf >= $DCONF_REQUIRED - x11]) - --- -2.7.4 - diff --git a/mate-terminal_0008-drop-old-GTK-2-code.patch b/mate-terminal_0008-drop-old-GTK-2-code.patch deleted file mode 100644 index f8b6f00..0000000 --- a/mate-terminal_0008-drop-old-GTK-2-code.patch +++ /dev/null @@ -1,459 +0,0 @@ -From ea302a83da329d7f182724fb0c9d1a4d22aa9362 Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 16:14:26 +0300 -Subject: [PATCH 8/9] drop old GTK+2 code - ---- - src/eggsmclient-private.h | 4 -- - src/eggsmclient-xsmp.c | 21 ------ - src/profile-editor.c | 15 ---- - src/terminal-info-bar.c | 4 -- - src/terminal-screen-container.c | 4 -- - src/terminal-util.c | 4 -- - src/terminal-window.c | 147 ++++------------------------------------ - 7 files changed, 14 insertions(+), 185 deletions(-) - -diff --git a/src/eggsmclient-private.h b/src/eggsmclient-private.h -index ed47397..0beca30 100644 ---- a/src/eggsmclient-private.h -+++ b/src/eggsmclient-private.h -@@ -20,10 +20,6 @@ - #ifndef __EGG_SM_CLIENT_PRIVATE_H__ - #define __EGG_SM_CLIENT_PRIVATE_H__ - --#include --#if !GTK_CHECK_VERSION (3, 0, 0) --#include --#endif - #include "eggsmclient.h" - - G_BEGIN_DECLS -diff --git a/src/eggsmclient-xsmp.c b/src/eggsmclient-xsmp.c -index f278ded..0b0b960 100644 ---- a/src/eggsmclient-xsmp.c -+++ b/src/eggsmclient-xsmp.c -@@ -36,9 +36,7 @@ - #include - - #include --#if GTK_CHECK_VERSION (3, 0, 0) - #include --#endif - - #define EGG_TYPE_SM_CLIENT_XSMP (egg_sm_client_xsmp_get_type ()) - #define EGG_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP)) -@@ -376,13 +374,7 @@ sm_client_xsmp_startup (EggSMClient *client, - xsmp->client_id = g_strdup (ret_client_id); - free (ret_client_id); - --#if GTK_CHECK_VERSION (3, 0, 0) - gdk_x11_set_sm_client_id (xsmp->client_id); --#else -- gdk_threads_enter (); -- gdk_set_sm_client_id (xsmp->client_id); -- gdk_threads_leave (); --#endif - - g_debug ("Got client ID \"%s\"", xsmp->client_id); - } -@@ -568,10 +560,6 @@ idle_do_pending_events (gpointer data) - EggSMClientXSMP *xsmp = data; - EggSMClient *client = data; - --#if !GTK_CHECK_VERSION (3, 0, 0) -- gdk_threads_enter (); --#endif -- - xsmp->idle = 0; - - if (xsmp->waiting_to_emit_quit) -@@ -595,9 +583,6 @@ idle_do_pending_events (gpointer data) - } - - out: --#if !GTK_CHECK_VERSION (3, 0, 0) -- gdk_threads_leave (); --#endif - return FALSE; - } - -@@ -1330,13 +1315,7 @@ process_ice_messages (IceConn ice_conn) - { - IceProcessMessagesStatus status; - --#if GTK_CHECK_VERSION (3, 0, 0) -- status = IceProcessMessages (ice_conn, NULL, NULL); --#else -- gdk_threads_enter (); - status = IceProcessMessages (ice_conn, NULL, NULL); -- gdk_threads_leave (); --#endif - - switch (status) - { -diff --git a/src/profile-editor.c b/src/profile-editor.c -index 873dd11..f20afe7 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -546,8 +546,6 @@ reset_compat_defaults_cb (GtkWidget *button, - static void - init_color_scheme_menu (GtkWidget *combo_box) - { -- #if GTK_CHECK_VERSION(3, 0, 0) -- - GtkCellRenderer *renderer; - GtkTreeIter iter; - GtkListStore *store; -@@ -569,19 +567,6 @@ init_color_scheme_menu (GtkWidget *combo_box) - /*FIXME, avoid double loading of color schemes names from UI file */ - /* gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, "text", 0, NULL);*/ -- -- #else -- -- int i; -- -- i = G_N_ELEMENTS (color_schemes); -- while (i > 0) -- { -- gtk_combo_box_prepend_text (GTK_COMBO_BOX (combo_box), -- _(color_schemes[--i].name)); -- } -- -- #endif - } - - static char* -diff --git a/src/terminal-info-bar.c b/src/terminal-info-bar.c -index e382783..40a6e72 100644 ---- a/src/terminal-info-bar.c -+++ b/src/terminal-info-bar.c -@@ -41,11 +41,7 @@ terminal_info_bar_init (TerminalInfoBar *bar) - - priv = bar->priv = TERMINAL_INFO_BAR_GET_PRIVATE (bar); - --#if GTK_CHECK_VERSION (3, 0, 0) - priv->content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); --#else -- priv->content_box = gtk_vbox_new (FALSE, 6); --#endif - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (info_bar)), - priv->content_box, TRUE, TRUE, 0); - } -diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c -index 290685c..52432e5 100644 ---- a/src/terminal-screen-container.c -+++ b/src/terminal-screen-container.c -@@ -167,11 +167,7 @@ terminal_screen_container_constructor (GType type, - - #else - --#if GTK_CHECK_VERSION (3, 0, 0) - priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); --#else -- priv->hbox = gtk_hbox_new (FALSE, 0); --#endif - - #if VTE_CHECK_VERSION (0, 38, 0) - priv->vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); -diff --git a/src/terminal-util.c b/src/terminal-util.c -index cc14584..f8c5254 100644 ---- a/src/terminal-util.c -+++ b/src/terminal-util.c -@@ -43,10 +43,6 @@ - #include "terminal-util.h" - #include "terminal-window.h" - --#if !GTK_CHECK_VERSION(3, 0, 0) -- #define gdk_error_trap_pop_ignored gdk_error_trap_pop --#endif -- - void - terminal_util_set_unique_role (GtkWindow *window, const char *prefix) - { -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 69f3063..89566b6 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #ifdef GDK_WINDOWING_X11 - #include - #endif -@@ -43,10 +44,6 @@ - #include "skey-popup.h" - #endif - --#if GTK_CHECK_VERSION(3, 0, 0) --#include --#endif -- - struct _TerminalWindowPrivate - { - GtkActionGroup *action_group; -@@ -395,13 +392,8 @@ position_menu_under_widget (GtkMenu *menu, - gtk_widget_get_allocation (widget, &widget_allocation); - container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER); - --#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_get_preferred_size (widget, &req, NULL); - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL); --#else -- gtk_widget_size_request (widget, &req); -- gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); --#endif - - screen = gtk_widget_get_screen (GTK_WIDGET (menu)); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window); -@@ -1542,42 +1534,23 @@ terminal_window_realize (GtkWidget *widget) - #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND) - GdkScreen *screen; - GtkAllocation widget_allocation; -- #if GTK_CHECK_VERSION (3, 0, 0) -- GdkVisual *visual; -- #else -- GdkColormap *colormap; -- #endif -+ GdkVisual *visual; -+ - gtk_widget_get_allocation (widget, &widget_allocation); - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - -- #if GTK_CHECK_VERSION (3, 0, 0) -- if (gdk_screen_is_composited (screen) && -- (visual = gdk_screen_get_rgba_visual (screen)) != NULL) -- { -+ if (gdk_screen_is_composited (screen) && -+ (visual = gdk_screen_get_rgba_visual (screen)) != NULL) -+ { - /* Set RGBA visual if possible so VTE can use real transparency */ -- gtk_widget_set_visual (GTK_WIDGET (widget), visual); -- priv->have_argb_visual = TRUE; -- } -- else -- { -- gtk_widget_set_visual (GTK_WIDGET (window), gdk_screen_get_system_visual (screen)); -- priv->have_argb_visual = FALSE; -- } -- #else -- if (gdk_screen_is_composited (screen) && -- (colormap = gdk_screen_get_rgba_colormap (screen)) != NULL) -- { -- /* Set RGBA colormap if possible so VTE can use real transparency */ -- gtk_widget_set_colormap (widget, colormap); -- priv->have_argb_visual = TRUE; -- } -- else -- { -- gtk_widget_set_colormap (widget, gdk_screen_get_default_colormap (screen)); -- priv->have_argb_visual = FALSE; -- } -- #endif -- -+ gtk_widget_set_visual (GTK_WIDGET (widget), visual); -+ priv->have_argb_visual = TRUE; -+ } -+ else -+ { -+ gtk_widget_set_visual (GTK_WIDGET (window), gdk_screen_get_system_visual (screen)); -+ priv->have_argb_visual = FALSE; -+ } - #endif - - _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, -@@ -1678,11 +1651,7 @@ terminal_window_screen_update (TerminalWindow *window, - TerminalApp *app; - - #ifdef GDK_WINDOWING_X11 --#if GTK_CHECK_VERSION (3, 0, 0) - if (screen && GDK_IS_X11_SCREEN (screen)) --#else -- if (screen) --#endif - { - terminal_window_window_manager_changed_cb (screen, window); - g_signal_connect (screen, "window-manager-changed", -@@ -1722,11 +1691,7 @@ terminal_window_screen_changed (GtkWidget *widget, - return; - - #ifdef GDK_WINDOWING_X11 --#if GTK_CHECK_VERSION (3, 0, 0) - if (previous_screen && GDK_IS_X11_SCREEN (previous_screen)) --#else -- if (previous_screen) --#endif - { - g_signal_handlers_disconnect_by_func (previous_screen, - G_CALLBACK (terminal_window_window_manager_changed_cb), -@@ -2086,23 +2051,17 @@ terminal_window_init (TerminalWindow *window) - } - #endif - --#if GTK_CHECK_VERSION(3, 0, 0) - GtkStyleContext *context; - - context = gtk_widget_get_style_context (GTK_WIDGET (window)); - gtk_style_context_add_class (context, "mate-terminal"); --#endif - - gtk_window_set_title (GTK_WINDOW (window), _("Terminal")); - - priv->active_screen = NULL; - priv->menubar_visible = FALSE; - --#if GTK_CHECK_VERSION (3, 0, 0) - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); --#else -- main_vbox = gtk_vbox_new (FALSE, 0); --#endif - gtk_container_add (GTK_CONTAINER (window), main_vbox); - gtk_widget_show (main_vbox); - -@@ -2283,11 +2242,7 @@ terminal_window_dispose (GObject *object) - - #ifdef GDK_WINDOWING_X11 - screen = gtk_widget_get_screen (GTK_WIDGET (object)); --#if GTK_CHECK_VERSION (3, 0, 0) - if (screen && GDK_IS_X11_SCREEN (screen)) --#else -- if (screen) --#endif - { - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (terminal_window_window_manager_changed_cb), -@@ -2671,15 +2626,6 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - GtkWidget *app; - int grid_width; - int grid_height; --#if !GTK_CHECK_VERSION (3, 0, 0) -- /* Owen's hack from gnome-terminal */ -- GtkRequisition toplevel_request; -- GtkRequisition widget_request; -- int w, h; -- int char_width; -- int char_height; -- GtkBorder *inner_border = NULL; --#endif - - /* be sure our geometry is up-to-date */ - terminal_window_update_geometry (window); -@@ -2689,7 +2635,6 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - app = gtk_widget_get_toplevel (widget); - g_assert (app != NULL); - --#if GTK_CHECK_VERSION (3, 0, 0) - terminal_screen_get_size (screen, &grid_width, &grid_height); - - if (force_grid_width >= 0) -@@ -2700,47 +2645,6 @@ terminal_window_set_size_force_grid (TerminalWindow *window, - gtk_window_resize_to_geometry (GTK_WINDOW (app), grid_width, grid_height); - else - gtk_window_set_default_geometry (GTK_WINDOW (app), grid_width, grid_height); --#else -- gtk_widget_size_request (app, &toplevel_request); -- gtk_widget_size_request (widget, &widget_request); -- -- terminal_screen_get_cell_size (screen, &char_width, &char_height); -- terminal_screen_get_size (screen, &grid_width, &grid_height); -- -- _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, -- "[window %p] set size: toplevel %dx%d widget %dx%d grid %dx%d char-cell %dx%d\n", -- window, -- toplevel_request.width, toplevel_request.height, -- widget_request.width, widget_request.height, -- grid_width, grid_height, char_width, char_height); -- -- w = toplevel_request.width - widget_request.width; -- h = toplevel_request.height - widget_request.height; -- -- if (force_grid_width >= 0) -- grid_width = force_grid_width; -- if (force_grid_height >= 0) -- grid_height = force_grid_height; -- -- gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); -- w += (inner_border ? (inner_border->left + inner_border->right) : 0) + char_width * grid_width; -- h += (inner_border ? (inner_border->top + inner_border->bottom) : 0) + char_height * grid_height; -- gtk_border_free (inner_border); -- -- _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, -- "[window %p] set size: grid %dx%d force %dx%d setting %dx%d pixels\n", -- window, -- grid_width, grid_height, force_grid_width, force_grid_height, w, h); -- -- if (even_if_mapped && gtk_widget_get_mapped (app)) -- { -- gtk_window_resize (GTK_WINDOW (app), w, h); -- } -- else -- { -- gtk_window_set_default_size (GTK_WINDOW (app), w, h); -- } --#endif - } - - void -@@ -3060,11 +2964,7 @@ terminal_window_update_geometry (TerminalWindow *window) - TerminalWindowPrivate *priv = window->priv; - GtkWidget *widget; - GdkGeometry hints; --#if GTK_CHECK_VERSION (3, 0, 0) - GtkBorder padding; --#else -- GtkBorder *inner_border = NULL; --#endif - GtkRequisition toplevel_request, widget_request; - int base_width, base_height; - int char_width, char_height; -@@ -3089,33 +2989,18 @@ terminal_window_update_geometry (TerminalWindow *window) - * padding we need to change the hints when the theme changes. - */ - --#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &toplevel_request); - gtk_widget_get_preferred_size (widget, NULL, &widget_request); --#else -- gtk_widget_size_request (GTK_WIDGET (window), &toplevel_request); -- gtk_widget_size_request (widget, &widget_request); --#endif - - base_width = toplevel_request.width - widget_request.width; - base_height = toplevel_request.height - widget_request.height; - --#if GTK_CHECK_VERSION (3, 0, 0) - gtk_style_context_get_padding (gtk_widget_get_style_context (widget), - gtk_widget_get_state_flags (widget), - &padding); - - hints.base_width = base_width + padding.left + padding.right; - hints.base_height = base_height + padding.top + padding.bottom; --#else -- gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); -- -- hints.base_width = base_width + (inner_border ? (inner_border->left + inner_border->right) : 0); -- hints.base_height = base_height + (inner_border ? (inner_border->top + inner_border->bottom) : 0); -- -- gtk_border_free (inner_border); -- inner_border = NULL; --#endif - - #define MIN_WIDTH_CHARS 4 - #define MIN_HEIGHT_CHARS 1 -@@ -3944,11 +3829,7 @@ terminal_set_title_callback (GtkAction *action, - message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); - gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL); - --#if GTK_CHECK_VERSION (3, 0, 0) - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); --#else -- hbox = gtk_hbox_new (FALSE, 12); --#endif - gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); - - label = gtk_label_new_with_mnemonic (_("_Title:")); --- -2.7.4 - diff --git a/mate-terminal_0009-drop-old-code-for-VTE-0.38-it-was-used-in-GTK-2-buil.patch b/mate-terminal_0009-drop-old-code-for-VTE-0.38-it-was-used-in-GTK-2-buil.patch deleted file mode 100644 index 0245502..0000000 --- a/mate-terminal_0009-drop-old-code-for-VTE-0.38-it-was-used-in-GTK-2-buil.patch +++ /dev/null @@ -1,612 +0,0 @@ -From b2919d25fa7e8a6b09e1502ed35b10e3fb27ec08 Mon Sep 17 00:00:00 2001 -From: monsta -Date: Thu, 26 May 2016 17:33:01 +0300 -Subject: [PATCH 9/9] drop old code for VTE < 0.38 (it was used in GTK+2 build) - ---- - src/profile-editor.c | 30 ------- - src/terminal-profile.c | 7 -- - src/terminal-screen-container.c | 8 -- - src/terminal-screen.c | 177 ++++------------------------------------ - src/terminal-window.c | 81 +----------------- - src/terminal-window.h | 4 - - 6 files changed, 19 insertions(+), 288 deletions(-) - -diff --git a/src/profile-editor.c b/src/profile-editor.c -index f20afe7..cd7f07a 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -141,7 +141,6 @@ profile_notify_sensitivity_cb (TerminalProfile *profile, - !terminal_profile_property_locked (profile, TERMINAL_PROFILE_CUSTOM_COMMAND)); - } - --#if VTE_CHECK_VERSION (0, 38, 0) - gtk_widget_hide (profile_editor_get_widget (editor, "background-image")); - gtk_widget_hide (profile_editor_get_widget (editor, "darken-background-transparent-or-image-scale-label")); - gtk_widget_show (profile_editor_get_widget (editor, "darken-background-transparent-scale-label")); -@@ -161,35 +160,6 @@ profile_notify_sensitivity_cb (TerminalProfile *profile, - SET_SENSITIVE ("darken-background-vbox", FALSE); - } - } --#else -- if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE)) -- { -- gboolean bg_type_locked = terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_TYPE); -- SET_SENSITIVE ("solid-radiobutton", !bg_type_locked); -- SET_SENSITIVE ("image-radiobutton", !bg_type_locked); -- SET_SENSITIVE ("transparent-radiobutton", !bg_type_locked); -- -- bg_type = terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKGROUND_TYPE); -- if (bg_type == TERMINAL_BACKGROUND_IMAGE) -- { -- SET_SENSITIVE ("background-image-filechooser", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_IMAGE_FILE)); -- SET_SENSITIVE ("scroll-background-checkbutton", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SCROLL_BACKGROUND)); -- SET_SENSITIVE ("darken-background-vbox", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS)); -- } -- else if (bg_type == TERMINAL_BACKGROUND_TRANSPARENT) -- { -- SET_SENSITIVE ("background-image-filechooser", FALSE); -- SET_SENSITIVE ("scroll-background-checkbutton", FALSE); -- SET_SENSITIVE ("darken-background-vbox", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS)); -- } -- else -- { -- SET_SENSITIVE ("background-image-filechooser", FALSE); -- SET_SENSITIVE ("scroll-background-checkbutton", FALSE); -- SET_SENSITIVE ("darken-background-vbox", FALSE); -- } -- } --#endif - - if (!prop_name || - prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT) || -diff --git a/src/terminal-profile.c b/src/terminal-profile.c -index fec496e..8109338 100644 ---- a/src/terminal-profile.c -+++ b/src/terminal-profile.c -@@ -1271,17 +1271,10 @@ terminal_profile_class_init (TerminalProfileClass *klass) - TERMINAL_PROFILE_PROPERTY_DOUBLE (BACKGROUND_DARKNESS, 0.0, 1.0, DEFAULT_BACKGROUND_DARKNESS, KEY_BACKGROUND_DARKNESS); - - TERMINAL_PROFILE_PROPERTY_ENUM (BACKGROUND_TYPE, TERMINAL_TYPE_BACKGROUND_TYPE, DEFAULT_BACKGROUND_TYPE, KEY_BACKGROUND_TYPE); --#if VTE_CHECK_VERSION (0, 38, 0) - TERMINAL_PROFILE_PROPERTY_ENUM (BACKSPACE_BINDING, VTE_TYPE_ERASE_BINDING, DEFAULT_BACKSPACE_BINDING, KEY_BACKSPACE_BINDING); - TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_BLINK_MODE, VTE_TYPE_CURSOR_BLINK_MODE, DEFAULT_CURSOR_BLINK_MODE, KEY_CURSOR_BLINK_MODE); - TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_SHAPE, VTE_TYPE_CURSOR_SHAPE, DEFAULT_CURSOR_SHAPE, KEY_CURSOR_SHAPE); - TERMINAL_PROFILE_PROPERTY_ENUM (DELETE_BINDING, VTE_TYPE_ERASE_BINDING, DEFAULT_DELETE_BINDING, KEY_DELETE_BINDING); --#else -- TERMINAL_PROFILE_PROPERTY_ENUM (BACKSPACE_BINDING, VTE_TYPE_TERMINAL_ERASE_BINDING, DEFAULT_BACKSPACE_BINDING, KEY_BACKSPACE_BINDING); -- TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_BLINK_MODE, VTE_TYPE_TERMINAL_CURSOR_BLINK_MODE, DEFAULT_CURSOR_BLINK_MODE, KEY_CURSOR_BLINK_MODE); -- TERMINAL_PROFILE_PROPERTY_ENUM (CURSOR_SHAPE, VTE_TYPE_TERMINAL_CURSOR_SHAPE, DEFAULT_CURSOR_SHAPE, KEY_CURSOR_SHAPE); -- TERMINAL_PROFILE_PROPERTY_ENUM (DELETE_BINDING, VTE_TYPE_TERMINAL_ERASE_BINDING, DEFAULT_DELETE_BINDING, KEY_DELETE_BINDING); --#endif - TERMINAL_PROFILE_PROPERTY_ENUM (EXIT_ACTION, TERMINAL_TYPE_EXIT_ACTION, DEFAULT_EXIT_ACTION, KEY_EXIT_ACTION); - TERMINAL_PROFILE_PROPERTY_ENUM (SCROLLBAR_POSITION, TERMINAL_TYPE_SCROLLBAR_POSITION, DEFAULT_SCROLLBAR_POSITION, KEY_SCROLLBAR_POSITION); - TERMINAL_PROFILE_PROPERTY_ENUM (TITLE_MODE, TERMINAL_TYPE_TITLE_MODE, DEFAULT_TITLE_MODE, KEY_TITLE_MODE); -diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c -index 52432e5..67c6bbf 100644 ---- a/src/terminal-screen-container.c -+++ b/src/terminal-screen-container.c -@@ -145,11 +145,7 @@ terminal_screen_container_constructor (GType type, - g_assert (priv->screen != NULL); - - #ifdef USE_SCROLLED_WINDOW --#if VTE_CHECK_VERSION (0, 38, 0) - priv->scrolled_window = gtk_scrolled_window_new (NULL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); --#else -- priv->scrolled_window = gtk_scrolled_window_new (NULL, vte_terminal_get_adjustment (VTE_TERMINAL (priv->screen))); --#endif - - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), - priv->hscrollbar_policy, -@@ -169,11 +165,7 @@ terminal_screen_container_constructor (GType type, - - priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - --#if VTE_CHECK_VERSION (0, 38, 0) - priv->vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); --#else -- priv->vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (priv->screen))); --#endif - - gtk_box_pack_start (GTK_BOX (priv->hbox), GTK_WIDGET (priv->screen), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (priv->hbox), priv->vscrollbar, FALSE, FALSE, 0); -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 3bf57b1..6bb338d 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -119,11 +119,7 @@ static gboolean terminal_screen_popup_menu (GtkWidget *widget); - static gboolean terminal_screen_button_press (GtkWidget *widget, - GdkEventButton *event); - static void terminal_screen_launch_child_on_idle (TerminalScreen *screen); --#if VTE_CHECK_VERSION (0, 38, 0) - static void terminal_screen_child_exited (VteTerminal *terminal, int status); --#else --static void terminal_screen_child_exited (VteTerminal *terminal); --#endif - - static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, - TerminalScreen *screen); -@@ -138,12 +134,7 @@ static void terminal_screen_cook_title (TerminalScreen *screen); - static void terminal_screen_cook_icon_title (TerminalScreen *screen); - - static char* terminal_screen_check_match (TerminalScreen *screen, --#if VTE_CHECK_VERSION (0, 38, 0) - GdkEvent *event, --#else -- int column, -- int row, --#endif - int *flavor); - - static guint signals[LAST_SIGNAL] = { 0 }; -@@ -292,38 +283,10 @@ terminal_screen_get_window (TerminalScreen *screen) - return TERMINAL_WINDOW (toplevel); - } - --#if !VTE_CHECK_VERSION (0, 38, 0) --static gboolean --window_uses_argb_visual (TerminalScreen *screen) --{ -- TerminalWindow *window; -- -- window = terminal_screen_get_window (screen); -- if (window == NULL || !gtk_widget_get_realized (GTK_WIDGET (window))) -- return FALSE; -- -- return terminal_window_uses_argb_visual (window); --} --#endif -- - static void - terminal_screen_realize (GtkWidget *widget) - { --#if !VTE_CHECK_VERSION (0, 38, 0) -- TerminalScreen *screen = TERMINAL_SCREEN (widget); -- TerminalScreenPrivate *priv = screen->priv; -- TerminalBackgroundType bg_type; --#endif -- - GTK_WIDGET_CLASS (terminal_screen_parent_class)->realize (widget); -- --#if !VTE_CHECK_VERSION (0, 38, 0) -- /* FIXME: Don't enable this if we have a compmgr. */ -- bg_type = terminal_profile_get_property_enum (priv->profile, TERMINAL_PROFILE_BACKGROUND_TYPE); -- vte_terminal_set_background_transparent (VTE_TERMINAL (screen), -- bg_type == TERMINAL_BACKGROUND_TRANSPARENT && -- !window_uses_argb_visual (screen)); --#endif - } - - static void -@@ -923,9 +886,6 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile, - GObject *object = G_OBJECT (screen); - VteTerminal *vte_terminal = VTE_TERMINAL (screen); - const char *prop_name; --#if !VTE_CHECK_VERSION (0, 38, 0) -- TerminalBackgroundType bg_type; --#endif - TerminalWindow *window; - - if (pspec) -@@ -969,10 +929,8 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile, - prop_name == I_(TERMINAL_PROFILE_USE_THEME_COLORS) || - prop_name == I_(TERMINAL_PROFILE_FOREGROUND_COLOR) || - prop_name == I_(TERMINAL_PROFILE_BACKGROUND_COLOR) || --#if VTE_CHECK_VERSION (0, 38, 0) - prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE) || - prop_name == I_(TERMINAL_PROFILE_BACKGROUND_DARKNESS) || --#endif - prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG) || - prop_name == I_(TERMINAL_PROFILE_BOLD_COLOR) || - prop_name == I_(TERMINAL_PROFILE_PALETTE)) -@@ -981,15 +939,10 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile, - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SILENT_BELL)) - vte_terminal_set_audible_bell (vte_terminal, !terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SILENT_BELL)); - -- if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS)) - #if VTE_CHECK_VERSION (0, 40, 0) -+ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS)) - vte_terminal_set_word_char_exceptions (vte_terminal, - terminal_profile_get_property_string (profile, TERMINAL_PROFILE_WORD_CHARS)); --#elif !VTE_CHECK_VERSION (0, 38, 0) -- vte_terminal_set_word_chars (vte_terminal, -- terminal_profile_get_property_string (profile, TERMINAL_PROFILE_WORD_CHARS)); --#else -- {} - #endif - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE)) - vte_terminal_set_scroll_on_keystroke (vte_terminal, -@@ -1032,51 +985,6 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile, - } - #endif /* ENABLE_SKEY */ - --/* Background image support was removed in vte 0.38. -- * Transparency for 0.38+ is handled above next to TERMINAL_PROFILE_BACKGROUND_COLOR. */ --#if !VTE_CHECK_VERSION (0, 38, 0) -- if (!prop_name || -- prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TYPE) || -- prop_name == I_(TERMINAL_PROFILE_BACKGROUND_IMAGE) || -- prop_name == I_(TERMINAL_PROFILE_BACKGROUND_DARKNESS) || -- prop_name == I_(TERMINAL_PROFILE_SCROLL_BACKGROUND)) -- { -- bg_type = terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKGROUND_TYPE); -- -- if (bg_type == TERMINAL_BACKGROUND_IMAGE) -- { -- vte_terminal_set_background_image (vte_terminal, -- terminal_profile_get_property_object (profile, TERMINAL_PROFILE_BACKGROUND_IMAGE)); -- vte_terminal_set_scroll_background (vte_terminal, -- terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SCROLL_BACKGROUND)); -- } -- else -- { -- vte_terminal_set_background_image (vte_terminal, NULL); -- vte_terminal_set_scroll_background (vte_terminal, FALSE); -- } -- -- if (bg_type == TERMINAL_BACKGROUND_IMAGE || -- bg_type == TERMINAL_BACKGROUND_TRANSPARENT) -- { -- vte_terminal_set_background_saturation (vte_terminal, -- 1.0 - terminal_profile_get_property_double (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS)); -- vte_terminal_set_opacity (vte_terminal, -- 0xffff * terminal_profile_get_property_double (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS)); -- } -- else -- { -- vte_terminal_set_background_saturation (vte_terminal, 1.0); /* normal color */ -- vte_terminal_set_opacity (vte_terminal, 0xffff); -- } -- -- /* FIXME: Don't enable this if we have a compmgr. */ -- vte_terminal_set_background_transparent (vte_terminal, -- bg_type == TERMINAL_BACKGROUND_TRANSPARENT && -- !window_uses_argb_visual (screen)); -- } --#endif -- - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_BACKSPACE_BINDING)) - vte_terminal_set_backspace_binding (vte_terminal, - terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKSPACE_BINDING)); -@@ -1101,7 +1009,6 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile, - } - - /* TODO: Once Gtk2 support is dropped, mate-terminal should be converted to use GdkRGBA everywhere instead of GdkColor. */ --#if VTE_CHECK_VERSION (0, 38, 0) - static GdkRGBA * - gdk_color_to_rgba (const GdkColor *color, - double alpha, -@@ -1115,7 +1022,6 @@ gdk_color_to_rgba (const GdkColor *color, - rgba->alpha = alpha; - return rgba; - } --#endif - - static void - update_color_scheme (TerminalScreen *screen) -@@ -1152,33 +1058,23 @@ update_color_scheme (TerminalScreen *screen) - - n_colors = G_N_ELEMENTS (colors); - terminal_profile_get_palette (priv->profile, colors, &n_colors); --#if VTE_CHECK_VERSION (0, 38, 0) -- { -- GdkRGBA colors_rgba[TERMINAL_PALETTE_SIZE]; -- GdkRGBA fg_rgba, bg_rgba, bold_rgba; -- double alpha = 1.0; -- int i; -- -- for (i = 0; i < n_colors; i++) -- gdk_color_to_rgba (&colors[i], 1.0, &colors_rgba[i]); -- -- if (terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKGROUND_TYPE) == TERMINAL_BACKGROUND_TRANSPARENT) -- alpha = terminal_profile_get_property_double (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS); -- vte_terminal_set_colors (VTE_TERMINAL (screen), -- gdk_color_to_rgba (&fg, 1.0, &fg_rgba), -- gdk_color_to_rgba (&bg, alpha, &bg_rgba), -- colors_rgba, n_colors); -- if (bold_color) -- vte_terminal_set_color_bold (VTE_TERMINAL (screen), -- gdk_color_to_rgba (bold_color, 1.0, &bold_rgba)); -- } --#else -- vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, -- colors, n_colors); -+ GdkRGBA colors_rgba[TERMINAL_PALETTE_SIZE]; -+ GdkRGBA fg_rgba, bg_rgba, bold_rgba; -+ double alpha = 1.0; -+ int i; -+ -+ for (i = 0; i < n_colors; i++) -+ gdk_color_to_rgba (&colors[i], 1.0, &colors_rgba[i]); -+ -+ if (terminal_profile_get_property_enum (profile, TERMINAL_PROFILE_BACKGROUND_TYPE) == TERMINAL_BACKGROUND_TRANSPARENT) -+ alpha = terminal_profile_get_property_double (profile, TERMINAL_PROFILE_BACKGROUND_DARKNESS); -+ vte_terminal_set_colors (VTE_TERMINAL (screen), -+ gdk_color_to_rgba (&fg, 1.0, &fg_rgba), -+ gdk_color_to_rgba (&bg, alpha, &bg_rgba), -+ colors_rgba, n_colors); - if (bold_color) -- vte_terminal_set_color_bold (VTE_TERMINAL (screen), bold_color); -- vte_terminal_set_background_tint_color (VTE_TERMINAL (screen), &bg); --#endif -+ vte_terminal_set_color_bold (VTE_TERMINAL (screen), -+ gdk_color_to_rgba (bold_color, 1.0, &bold_rgba)); - } - - void -@@ -1564,11 +1460,7 @@ terminal_screen_launch_child_cb (TerminalScreen *screen) - pty_flags |= VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP; - - if (!get_child_command (screen, shell, &spawn_flags, &argv, &err) || --#if VTE_CHECK_VERSION (0, 38, 0) - !vte_terminal_spawn_sync ( --#else -- !vte_terminal_fork_command_full ( --#endif - terminal, - pty_flags, - working_dir, -@@ -1577,9 +1469,7 @@ terminal_screen_launch_child_cb (TerminalScreen *screen) - spawn_flags, - NULL, NULL, - &pid, --#if VTE_CHECK_VERSION (0, 38, 0) - NULL, --#endif - &err)) - { - GtkWidget *info_bar; -@@ -1693,25 +1583,10 @@ terminal_screen_button_press (GtkWidget *widget, - char *matched_string; - int matched_flavor = 0; - guint state; --#if !VTE_CHECK_VERSION (0, 38, 0) -- int char_width, char_height, row, col; -- GtkBorder *inner_border = NULL; --#endif - - state = event->state & gtk_accelerator_get_default_mod_mask (); - --#if VTE_CHECK_VERSION (0, 38, 0) - matched_string = terminal_screen_check_match (screen, event, &matched_flavor); --#else -- terminal_screen_get_cell_size (screen, &char_width, &char_height); -- -- gtk_widget_style_get (widget, "inner-border", &inner_border, NULL); -- row = (event->x - (inner_border ? inner_border->left : 0)) / char_width; -- col = (event->y - (inner_border ? inner_border->top : 0)) / char_height; -- gtk_border_free (inner_border); -- -- matched_string = terminal_screen_check_match (screen, row, col, &matched_flavor); --#endif - - if (matched_string != NULL && - (event->button == 1 || event->button == 2) && -@@ -1947,11 +1822,7 @@ terminal_screen_icon_title_changed (VteTerminal *vte_terminal, - } - - static void --#if VTE_CHECK_VERSION (0, 38, 0) - terminal_screen_child_exited (VteTerminal *terminal, int status) --#else --terminal_screen_child_exited (VteTerminal *terminal) --#endif - { - TerminalScreen *screen = TERMINAL_SCREEN (terminal); - TerminalScreenPrivate *priv = screen->priv; -@@ -1979,11 +1850,6 @@ terminal_screen_child_exited (VteTerminal *terminal) - case TERMINAL_EXIT_HOLD: - { - GtkWidget *info_bar; --#if !VTE_CHECK_VERSION (0, 38, 0) -- int status; -- -- status = vte_terminal_get_child_exit_status (terminal); --#endif - - info_bar = terminal_info_bar_new (GTK_MESSAGE_INFO, - _("_Relaunch"), RESPONSE_RELAUNCH, -@@ -2350,12 +2216,7 @@ terminal_screen_skey_match_remove (TerminalScreen *screen) - - static char* - terminal_screen_check_match (TerminalScreen *screen, --#if VTE_CHECK_VERSION (0, 38, 0) - GdkEvent *event, --#else -- int column, -- int row, --#endif - int *flavor) - { - TerminalScreenPrivate *priv = screen->priv; -@@ -2363,11 +2224,7 @@ terminal_screen_check_match (TerminalScreen *screen, - int tag; - char *match; - --#if VTE_CHECK_VERSION (0, 38, 0) - match = vte_terminal_match_check_event (VTE_TERMINAL (screen), event, &tag); --#else -- match = vte_terminal_match_check (VTE_TERMINAL (screen), column, row, &tag); --#endif - for (tags = priv->match_tags; tags != NULL; tags = tags->next) - { - TagData *tag_data = (TagData*) tags->data; -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 89566b6..b26face 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -763,11 +763,7 @@ terminal_set_encoding_callback (GtkToggleAction *action, - g_assert (encoding); - - vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen), --#if VTE_CHECK_VERSION (0, 38, 0) - terminal_encoding_get_charset (encoding), NULL); --#else -- terminal_encoding_get_charset (encoding)); --#endif - } - - static void -@@ -1057,7 +1053,6 @@ update_edit_menu(TerminalWindow *window) - g_object_ref (window)); - } - --/* width and height are character-based in vte 0.38, pixel-based in previous versions */ - static void - screen_resize_window_cb (TerminalScreen *screen, - guint width, -@@ -1067,12 +1062,6 @@ screen_resize_window_cb (TerminalScreen *screen, - TerminalWindowPrivate *priv = window->priv; - VteTerminal *terminal = VTE_TERMINAL (screen); - GtkWidget *widget = GTK_WIDGET (screen); --#if !VTE_CHECK_VERSION (0, 38, 0) -- guint grid_width, grid_height; -- int char_width, char_height; -- GtkBorder *inner_border = NULL; -- GtkAllocation widget_allocation; --#endif - - /* Don't do anything if we're maximised or fullscreened */ - // FIXME: realized && ... instead? -@@ -1080,35 +1069,12 @@ screen_resize_window_cb (TerminalScreen *screen, - (gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0) - return; - -- /* NOTE: width and height already include the VteTerminal's padding! */ -- --#if VTE_CHECK_VERSION (0, 38, 0) - vte_terminal_set_size (terminal, width, height); --#else -- gtk_widget_get_allocation (widget, &widget_allocation); -- -- /* Short-circuit */ -- if (((int) width) == widget_allocation.width && -- ((int) height) == widget_allocation.height) -- return; -- -- /* The resize-window signal sucks. Re-compute grid widths */ -- -- char_width = vte_terminal_get_char_width (terminal); -- char_height = vte_terminal_get_char_height (terminal); -- -- gtk_widget_style_get (GTK_WIDGET (terminal), "inner-border", &inner_border, NULL); -- grid_width = (width - (inner_border ? (inner_border->left + inner_border->right) : 0)) / char_width; -- grid_height = (height - (inner_border ? (inner_border->top + inner_border->bottom) : 0)) / char_height; -- gtk_border_free (inner_border); -- -- vte_terminal_set_size (terminal, grid_width, grid_height); --#endif - - if (screen != priv->active_screen) - return; - -- terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1); //grid_width, grid_height); -+ terminal_window_set_size_force_grid (window, screen, TRUE, -1, -1); - } - - static void -@@ -1162,15 +1128,6 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window) - gtk_action_set_sensitive (action, num_pages > 1); - } - --#if !VTE_CHECK_VERSION (0, 38, 0) --gboolean --terminal_window_uses_argb_visual (TerminalWindow *window) --{ -- TerminalWindowPrivate *priv = window->priv; -- return priv->have_argb_visual; --} --#endif -- - static void - update_tab_visibility (TerminalWindow *window, - int change) -@@ -1377,24 +1334,6 @@ popup_clipboard_targets_received_cb (GtkClipboard *clipboard, - action = gtk_action_group_get_action (priv->action_group, "PopupInputMethods"); - gtk_action_set_visible (action, show_input_method_menu); - --#if !VTE_CHECK_VERSION (0, 38, 0) -- im_menu_item = gtk_ui_manager_get_widget (priv->ui_manager, -- "/Popup/PopupInputMethods"); -- /* FIXME: fix this when gtk+ bug #500065 is done, use vte_terminal_im_merge_ui */ -- if (show_input_method_menu) -- { -- im_menu = gtk_menu_new (); -- vte_terminal_im_append_menuitems (VTE_TERMINAL (screen), -- GTK_MENU_SHELL (im_menu)); -- gtk_widget_show (im_menu); -- gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), im_menu); -- } -- else -- { -- gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menu_item), NULL); -- } --#endif -- - popup_menu = gtk_ui_manager_get_widget (priv->ui_manager, "/Popup"); - g_signal_connect (popup_menu, "deactivate", - G_CALLBACK (popup_menu_deactivate_callback), window); -@@ -3261,20 +3200,12 @@ save_contents_dialog_on_response (GtkDialog *dialog, gint response_id, gpointer - - if (stream) - { -- /* XXX -- * FIXME -- * This is a sync operation. -+ /* FIXME - * Should be replaced with the async version when vte implements that. - */ --#if VTE_CHECK_VERSION (0, 38, 0) - vte_terminal_write_contents_sync (terminal, stream, - VTE_WRITE_DEFAULT, - NULL, &error); --#else -- vte_terminal_write_contents (terminal, stream, -- VTE_TERMINAL_WRITE_DEFAULT, -- NULL, &error); --#endif - g_object_unref (stream); - } - -@@ -3642,11 +3573,7 @@ search_find_response_callback (GtkWidget *dialog, - - flags = terminal_search_dialog_get_search_flags (dialog); - --#if VTE_CHECK_VERSION (0, 38, 0) - vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex, 0); --#else -- vte_terminal_search_set_gregex (VTE_TERMINAL (priv->active_screen), regex); --#endif - vte_terminal_search_set_wrap_around (VTE_TERMINAL (priv->active_screen), - (flags & TERMINAL_SEARCH_FLAG_WRAP_AROUND)); - -@@ -3717,11 +3644,7 @@ search_clear_highlight_callback (GtkAction *action, - if (G_UNLIKELY (!window->priv->active_screen)) - return; - --#if VTE_CHECK_VERSION (0, 38, 0) - vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL, 0); --#else -- vte_terminal_search_set_gregex (VTE_TERMINAL (window->priv->active_screen), NULL); --#endif - } - - static void -diff --git a/src/terminal-window.h b/src/terminal-window.h -index c07dbda..2cdaebd 100644 ---- a/src/terminal-window.h -+++ b/src/terminal-window.h -@@ -95,10 +95,6 @@ void terminal_window_set_size_force_grid (TerminalWindow *window, - - GtkWidget* terminal_window_get_notebook (TerminalWindow *window); - --#if !VTE_CHECK_VERSION (0, 38, 0) --gboolean terminal_window_uses_argb_visual (TerminalWindow *window); --#endif -- - void terminal_window_save_state (TerminalWindow *window, - GKeyFile *key_file, - const char *group); --- -2.7.4 - diff --git a/mate-terminal_better_defaults-1.15.1.patch b/mate-terminal_better_defaults-1.15.1.patch new file mode 100644 index 0000000..32afdb0 --- /dev/null +++ b/mate-terminal_better_defaults-1.15.1.patch @@ -0,0 +1,116 @@ +diff -upr mate-terminal-1.14.0-orig/src/org.mate.terminal.gschema.xml.in mate-terminal-1.14.0/src/org.mate.terminal.gschema.xml.in +--- mate-terminal-1.14.0-orig/src/org.mate.terminal.gschema.xml.in 2016-02-19 14:58:44.000000000 +0100 ++++ mate-terminal-1.14.0/src/org.mate.terminal.gschema.xml.in 2016-06-11 13:33:01.816773151 +0200 +@@ -89,22 +89,22 @@ + True if the menubar should be shown in new windows, for windows/tabs with this profile. + + +- '#000000' ++ '#E6E6E6' + Default color of text in the terminal + Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). + + +- '#FFFFDD' ++ '#000000' + Default color of terminal background + Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red"). + + +- '#000000' ++ '#FFFFFF' + Default color of bold text in the terminal + Default color of bold text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is ignored if bold_color_same_as_fg is true. + + +- true ++ false + Whether bold text should use the same color as normal text + If true, boldface text will be rendered using the same color as normal text. + +@@ -164,7 +164,7 @@ + Number of scrollback lines to keep around. You can scroll back in the terminal by this number of lines; lines that don't fit in the scrollback are discarded. If scrollback_unlimited is true, this value is ignored. + + +- false ++ true + Whether an unlimited number of lines should be kept in scrollback + If true, scrollback lines will never be discarded. The scrollback history is stored on disk temporarily, so this may cause the system to run out of disk space if there is a lot of output to the terminal. + +@@ -259,7 +259,7 @@ + Sets what code the delete key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "escape-sequence" is normally considered the correct setting for the Delete key. + + +- true ++ false + Whether to use the colors from the theme for the terminal widget + If true, the theme color scheme used for text entry boxes will be used for the terminal, instead of colors provided by the user. + +diff -upr mate-terminal-1.14.0-orig/src/profile-editor.c mate-terminal-1.14.0/src/profile-editor.c +--- mate-terminal-1.14.0-orig/src/profile-editor.c 2016-06-11 13:30:03.428945000 +0200 ++++ mate-terminal-1.14.0/src/profile-editor.c 2016-06-11 13:35:37.438367863 +0200 +@@ -41,6 +41,11 @@ struct _TerminalColorScheme + static const TerminalColorScheme color_schemes[] = + { + { ++ N_("White on black"), ++ { 1, 1, 1, 1 }, ++ { 0, 0, 0, 1 } ++ }, ++ { + N_("Black on light yellow"), + { 0, 0, 0, 1 }, + { 1, 1, 0.866667, 1 } +@@ -59,11 +64,6 @@ static const TerminalColorScheme color_s + N_("Green on black"), + { 0, 1, 0, 1 }, + { 0, 0, 0, 1 } +- }, +- { +- N_("White on black"), +- { 1, 1, 1, 1 }, +- { 0, 0, 0, 1 } + } + }; + +diff -upr mate-terminal-1.14.0-orig/src/terminal-profile.c mate-terminal-1.14.0/src/terminal-profile.c +--- mate-terminal-1.14.0-orig/src/terminal-profile.c 2016-06-11 13:30:03.431945000 +0200 ++++ mate-terminal-1.14.0/src/terminal-profile.c 2016-06-11 13:33:01.817773162 +0200 +@@ -129,8 +129,9 @@ enum + + /* Keep these in sync with the GSettings schema! */ + #define DEFAULT_ALLOW_BOLD (TRUE) +-#define DEFAULT_BACKGROUND_COLOR ("#FFFFDD") +-#define DEFAULT_BOLD_COLOR_SAME_AS_FG (TRUE) ++#define DEFAULT_BACKGROUND_COLOR ("#000000") ++#define DEFAULT_BOLD_COLOR ("#FFFFFF") ++#define DEFAULT_BOLD_COLOR_SAME_AS_FG (FALSE) + #define DEFAULT_BACKGROUND_DARKNESS (0.5) + #define DEFAULT_BACKGROUND_IMAGE_FILE ("") + #define DEFAULT_BACKGROUND_IMAGE (NULL) +@@ -145,13 +146,13 @@ enum + #define DEFAULT_DELETE_BINDING (VTE_ERASE_DELETE_SEQUENCE) + #define DEFAULT_EXIT_ACTION (TERMINAL_EXIT_CLOSE) + #define DEFAULT_FONT ("Monospace 12") +-#define DEFAULT_FOREGROUND_COLOR ("#000000") ++#define DEFAULT_FOREGROUND_COLOR ("#E6E6E6") + #define DEFAULT_LOGIN_SHELL (FALSE) + #define DEFAULT_NAME (NULL) + #define DEFAULT_PALETTE (terminal_palettes[TERMINAL_PALETTE_TANGO]) + #define DEFAULT_SCROLL_BACKGROUND (TRUE) + #define DEFAULT_SCROLLBACK_LINES (512) +-#define DEFAULT_SCROLLBACK_UNLIMITED (FALSE) ++#define DEFAULT_SCROLLBACK_UNLIMITED (TRUE) + #define DEFAULT_SCROLLBAR_POSITION (TERMINAL_SCROLLBAR_RIGHT) + #define DEFAULT_SCROLL_ON_KEYSTROKE (TRUE) + #define DEFAULT_SCROLL_ON_OUTPUT (FALSE) +@@ -164,7 +165,7 @@ enum + #define DEFAULT_USE_CUSTOM_DEFAULT_SIZE (FALSE) + #define DEFAULT_USE_SKEY (TRUE) + #define DEFAULT_USE_SYSTEM_FONT (TRUE) +-#define DEFAULT_USE_THEME_COLORS (TRUE) ++#define DEFAULT_USE_THEME_COLORS (FALSE) + #define DEFAULT_VISIBLE_NAME (N_("Unnamed")) + #define DEFAULT_WORD_CHARS ("-A-Za-z0-9,./?%&#:_=+@~") + +Nur in mate-terminal-1.14.0/src: terminal-profile.c.orig. diff --git a/mate-terminal_better_defaults.patch b/mate-terminal_better_defaults.patch deleted file mode 100644 index 715414b..0000000 --- a/mate-terminal_better_defaults.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -upr mate-terminal-1.6.1-orig/src/org.mate.terminal.gschema.xml.in mate-terminal-1.6.1/src/org.mate.terminal.gschema.xml.in ---- mate-terminal-1.6.1-orig/src/org.mate.terminal.gschema.xml.in 2013-04-09 15:54:21.000000000 +0200 -+++ mate-terminal-1.6.1/src/org.mate.terminal.gschema.xml.in 2013-07-15 18:35:06.848204558 +0200 -@@ -89,22 +89,22 @@ - True if the menubar should be shown in new windows, for windows/tabs with this profile. - - -- '#000000' -+ '#E6E6E6' - Default color of text in the terminal - Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). - - -- '#FFFFDD' -+ '#000000' - Default color of terminal background - Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red"). - - -- '#000000' -+ '#FFFFFF' - Default color of bold text in the terminal - Default color of bold text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is ignored if bold_color_same_as_fg is true. - - -- true -+ false - Whether bold text should use the same color as normal text - If true, boldface text will be rendered using the same color as normal text. - -@@ -159,7 +159,7 @@ - Number of scrollback lines to keep around. You can scroll back in the terminal by this number of lines; lines that don't fit in the scrollback are discarded. If scrollback_unlimited is true, this value is ignored. - - -- false -+ true - Whether an unlimited number of lines should be kept in scrollback - If true, scrollback lines will never be discarded. The scrollback history is stored on disk temporarily, so this may cause the system to run out of disk space if there is a lot of output to the terminal. - -@@ -254,7 +254,7 @@ - Sets what code the delete key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "escape-sequence" is normally considered the correct setting for the Delete key. - - -- true -+ false - Whether to use the colors from the theme for the terminal widget - If true, the theme color scheme used for text entry boxes will be used for the terminal, instead of colors provided by the user. - -diff -upr mate-terminal-1.6.1-orig/src/profile-editor.c mate-terminal-1.6.1/src/profile-editor.c ---- mate-terminal-1.6.1-orig/src/profile-editor.c 2013-04-09 15:54:21.000000000 +0200 -+++ mate-terminal-1.6.1/src/profile-editor.c 2013-07-15 18:37:06.863464463 +0200 -@@ -41,6 +41,10 @@ struct _TerminalColorScheme - static const TerminalColorScheme color_schemes[] = - { - { -+ N_("White on black"), -+ { 0, 0xE6E6, 0xE6E6, 0xE6E6 }, { 0, 0x0000, 0x0000, 0x0000 } -+ }, -+ { - N_("Black on light yellow"), - { 0, 0x0000, 0x0000, 0x0000 }, { 0, 0xFFFF, 0xFFFF, 0xDDDD } - }, -@@ -55,10 +59,6 @@ static const TerminalColorScheme color_s - { - N_("Green on black"), - { 0, 0x0000, 0xFFFF, 0x0000 }, { 0, 0x0000, 0x0000, 0x0000 } -- }, -- { -- N_("White on black"), -- { 0, 0xFFFF, 0xFFFF, 0xFFFF }, { 0, 0x0000, 0x0000, 0x0000 } - } - }; - -diff -upr mate-terminal-1.6.1-orig/src/terminal-profile.c mate-terminal-1.6.1/src/terminal-profile.c ---- mate-terminal-1.6.1-orig/src/terminal-profile.c 2013-04-09 15:54:21.000000000 +0200 -+++ mate-terminal-1.6.1/src/terminal-profile.c 2013-07-15 18:39:54.448223930 +0200 -@@ -127,8 +127,9 @@ enum - - /* Keep these in sync with the GSettings schema! */ - #define DEFAULT_ALLOW_BOLD (TRUE) --#define DEFAULT_BACKGROUND_COLOR ("#FFFFDD") --#define DEFAULT_BOLD_COLOR_SAME_AS_FG (TRUE) -+#define DEFAULT_BACKGROUND_COLOR ("#000000") -+#define DEFAULT_BOLD_COLOR ("#FFFFFF") -+#define DEFAULT_BOLD_COLOR_SAME_AS_FG (FALSE) - #define DEFAULT_BACKGROUND_DARKNESS (0.5) - #define DEFAULT_BACKGROUND_IMAGE_FILE ("") - #define DEFAULT_BACKGROUND_IMAGE (NULL) -@@ -143,13 +144,13 @@ enum - #define DEFAULT_DELETE_BINDING (VTE_ERASE_DELETE_SEQUENCE) - #define DEFAULT_EXIT_ACTION (TERMINAL_EXIT_CLOSE) - #define DEFAULT_FONT ("Monospace 12") --#define DEFAULT_FOREGROUND_COLOR ("#000000") -+#define DEFAULT_FOREGROUND_COLOR ("#E6E6E6") - #define DEFAULT_LOGIN_SHELL (FALSE) - #define DEFAULT_NAME (NULL) - #define DEFAULT_PALETTE (terminal_palettes[TERMINAL_PALETTE_TANGO]) - #define DEFAULT_SCROLL_BACKGROUND (TRUE) - #define DEFAULT_SCROLLBACK_LINES (512) --#define DEFAULT_SCROLLBACK_UNLIMITED (FALSE) -+#define DEFAULT_SCROLLBACK_UNLIMITED (TRUE) - #define DEFAULT_SCROLLBAR_POSITION (TERMINAL_SCROLLBAR_RIGHT) - #define DEFAULT_SCROLL_ON_KEYSTROKE (TRUE) - #define DEFAULT_SCROLL_ON_OUTPUT (FALSE) -@@ -161,7 +162,7 @@ enum - #define DEFAULT_USE_CUSTOM_DEFAULT_SIZE (FALSE) - #define DEFAULT_USE_SKEY (TRUE) - #define DEFAULT_USE_SYSTEM_FONT (TRUE) --#define DEFAULT_USE_THEME_COLORS (TRUE) -+#define DEFAULT_USE_THEME_COLORS (FALSE) - #define DEFAULT_VISIBLE_NAME (N_("Unnamed")) - #define DEFAULT_WORD_CHARS ("-A-Za-z0-9,./?%&#:_=+@~") - diff --git a/sources b/sources index 2ab767f..39e6016 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8b08949637f11a02dc399ee24ed283f mate-terminal-1.14.1.tar.xz +e0204f202839a6226300036b7e91db8f mate-terminal-1.16.0.tar.xz