--- xfce4-terminal-0.2.8.3.orig/debian/changelog +++ xfce4-terminal-0.2.8.3/debian/changelog @@ -0,0 +1,433 @@ +xfce4-terminal (0.2.8.3-0ubuntu1) jaunty; urgency=low + + * Merge with Debian XFCE SVN, remaining Ubuntu Changes: + - debian/patches/xubuntu-change-desktop-category.patch: + - Place terminal under Accessories, not System + + -- Michael Casadevall Tue, 04 Nov 2008 19:43:14 -0500 + +xfce4-terminal (0.2.8.3-1) UNRELEASED; urgency=low + + * new upstream bugfix release. + * debian/control: + - replace dbus by dbus-x11 in Recommends:, to make sure people using dbus + have a session bus available. + - update standards version to 3.8.0. + - add build-dep on intltool. + + -- Yves-Alexis Perez Tue, 28 Oct 2008 14:24:48 +0100 + +xfce4-terminal (0.2.8-5ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: adhere to DebianMaintainerField + - debian/patches/xubuntu-change-desktop-category.patch: show under the + Accessories not the System menu. + + -- Lionel Le Folgoc Fri, 23 May 2008 21:18:25 +0200 + +xfce4-terminal (0.2.8-5) unstable; urgency=low + + * debian/patch: 03_background-activity added. closes: #353482 + + -- Yves-Alexis Perez Mon, 21 Apr 2008 22:26:53 +0200 + +xfce4-terminal (0.2.8-4ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: adhere to DebianMaintainerField + - debian/patches/xubuntu-change-desktop-category.patch (formerly + 01_desktop_category.patch): show under the Accessories not the System + menu. + * debian/control: do not depend on exo-utils (not in hardy). + + -- Lionel Le Folgoc Sun, 02 Mar 2008 19:38:43 +0100 + +xfce4-terminal (0.2.8-4) unstable; urgency=low + + [ David Paleino ] + * Removed myself from Uploaders. + + [ Yves-Alexis Perez ] + * debian/README.Debian: add a note about --disable-server. closes: #434863 + * debian/control: + - updated standard versions to 3.7.3. + - updated my email address. + * debian/copyright: + - use © sign. + - remove GFDL text, and link to text in common-license. + - add precision that xfce4-terminal is GPLv2 or later. + + + -- Yves-Alexis Perez Thu, 28 Feb 2008 20:56:21 +0100 + +xfce4-terminal (0.2.8-3) unstable; urgency=low + + * Add dependency on new exo-utils for exo-open + + -- Simon Huggins Mon, 28 Jan 2008 11:32:30 +0000 + +xfce4-terminal (0.2.8-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: Keep using xfce.mk + - debian/patches/01_desktop_category.patch: + .show under the Accessories not the System menu. + - debian/compat: bump to 5. + - debian/control: + . bump debhelper b-d to (>= 5), add autotools-dev, drop chrpath. + . Adhere to DebianMaintainerField + + -- Cody A.W. Somerville Tue, 11 Dec 2007 21:46:07 +0000 + +xfce4-terminal (0.2.8-2) unstable; urgency=low + + * Bump build-dep on exo, as it requires 0.3.4. + + -- Yves-Alexis Perez Tue, 11 Dec 2007 20:15:38 +0100 + +xfce4-terminal (0.2.8-1ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + - Adhere to DebianMaintainerField + - Keep using xfce.mk + - debian/patches/01_desktop_category.patch: show under the Accessories not + the System menu. + * debian/compat: bump to 5. + * debian/control: bump debhelper b-d to (>= 5), add autotools-dev, drop chrpath. + + -- Lionel Le Folgoc Sat, 08 Dec 2007 14:51:31 +0100 + +xfce4-terminal (0.2.8-1) unstable; urgency=low + + [ Simon Huggins ] + * Add Vcs-* headers to debian/control + + [ Yves-Alexis Perez ] + * new upstream release. + * debian/patches: + - dropped 01_CVE-2007-3770, merged upstream. + + -- Yves-Alexis Perez Sun, 02 Dec 2007 22:40:32 +0100 + +xfce4-terminal (0.2.6-5ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + - Adhere to DebianMaintainerField + - Keep using xfce.mk + - debian/patches/02_desktop_category.patch: show under the Accessories not + the System menu. + + -- Lionel Le Folgoc Sun, 28 Oct 2007 18:05:16 +0100 + +xfce4-terminal (0.2.6-5) unstable; urgency=low + + [ Yves-Alexis Perez ] + * debian/rules: + - transform program name to xfce4-terminal at configure time + - rename Terminal.desktop to xfce4-terminal to avoid conflict with + Terminal.app. closes: #446329 + * debian/patches: + - added 02_dont-refresh-prefs-too-much: dont poll preferences once per + second. + + [ Simon Huggins ] + * debian/control: Move fake Homepage field to a real one now dpkg + supports it. + * debian/rules: Fix up rename so that help works again. + + -- Yves-Alexis Perez Mon, 05 Nov 2007 15:31:26 +0100 + +xfce4-terminal (0.2.6-4) unstable; urgency=low + + (David Paleino) + * debian/menu fixed: switch to new debian menu policy closes: #442386 + + (Emanuele Rocca) + * debian/README.Debian: documented the BindingBackspace config option, + interesting for screen users closes: #384526 + + -- David Paleino Sun, 16 Sep 2007 22:58:54 +0200 + +xfce4-terminal (0.2.6-3ubuntu1) gutsy; urgency=low + + * Merge with Debian Unstable, Ubuntu changes: + - Adhere to DebianMaintainerField + - Keep using xfce.mk + - debian/patches/02_desktop_category.patch: show under the Accessories not + the System menu. + + -- Lionel Le Folgoc Sun, 12 Aug 2007 20:28:03 +0200 + +xfce4-terminal (0.2.6-3) unstable; urgency=high + + (Yves-Alexis Perez) + * debian/menu: switch to new menu policy. + (Simon Huggins) + * Fix security problem in URL handling code (CVE-2007-3770) thanks to Darren + Salt closes: #437454 + * urgency high for the above. + + -- Yves-Alexis Perez Sun, 12 Aug 2007 18:00:09 +0100 + +xfce4-terminal (0.2.6-2ubuntu2) gutsy; urgency=low + + * debian/control: drop terminal.app conflict, since this package no longer + ships /usr/bin/Terminal. (LP: #119934) + + -- Lionel Le Folgoc Fri, 27 Jul 2007 22:46:53 +0200 + +xfce4-terminal (0.2.6-2ubuntu1) gutsy; urgency=low + + * Merge with Debian Unstable, Ubuntu changes: + - Adhere to DebianMaintainerField + - Conflicts terminal.app + - Keep using xfce.mk + - debian/patches/01_desktop_category.patch: show under the Accessories not + the System menu. + + -- Lionel Le Folgoc Wed, 06 Jun 2007 14:43:55 +0200 + +xfce4-terminal (0.2.6-2) unstable; urgency=low + + * Use install instead of mv for installing terminal.xpm so that the clean + target works correctly. closes: #424117 + + -- Yves-Alexis Perez Tue, 15 May 2007 22:48:49 +0200 + +xfce4-terminal (0.2.6-1ubuntu1) gutsy; urgency=low + + * Merge with Debian Unstable, Ubuntu changes: + - Adhere to DebianMaintainerField + - Conflicts terminal.app + - Keep using xfce.mk + - debian/patches/01_desktop_category.patch: show under the Accessories not + the System menu. + + -- Lionel Le Folgoc Thu, 03 May 2007 00:30:23 +0200 + +xfce4-terminal (0.2.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: recommend dbus instead of dbus-1-utils. + * debian/control: update libvte build dep against 1:0.14. + * README.Debian: change newlines so it fits in a 80x24 terminal window. + * debian/rules: use sed instead of perl. + * debian/copyright: + - correct copyright dates + - add copyright notices about gnome-terminal and redhat code. + - add documentation copyright statement (GFDL without invariant sections) + + -- Yves-Alexis Perez Tue, 24 Apr 2007 17:35:00 +0100 + +xfce4-terminal (0.2.6-0ubuntu3) feisty; urgency=low + + * debian/patches/01_desktop_category.patch: + show under the Accessories not the System menu + + -- Jani Monoses Thu, 5 Apr 2007 09:19:35 +0300 + +xfce4-terminal (0.2.6-0ubuntu2) feisty; urgency=low + + * debian/control: + - Adhere to DebianMaintainerField, + - Conflicts terminal.app. + + -- Daniel T Chen Fri, 9 Mar 2007 01:15:38 -0500 + +xfce4-terminal (0.2.6-0ubuntu1) feisty; urgency=low + + * New upstream release, part of Xfce 4.4 + * debian/control: Tighten libexo-0.3-dev version + + -- Gauvain Pocentek Wed, 24 Jan 2007 11:11:28 +0100 + +xfce4-terminal (0.2.5.8rc2-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Keep using xfce.mk + + -- Gauvain Pocentek Tue, 19 Dec 2006 11:06:59 +0100 + +xfce4-terminal (0.2.5.8rc2-1) unstable; urgency=low + + * New upstream release. + * debian/control: bumped exo build-dep to 4.4rc2. + + -- Yves-Alexis Perez Thu, 16 Nov 2006 18:36:17 +0100 + +xfce4-terminal (0.2.5.6rc1-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable: + - Keep using xfce.mk + + -- Gauvain Pocentek Wed, 15 Nov 2006 15:19:58 +0100 + +xfce4-terminal (0.2.5.6rc1-2) unstable; urgency=low + + * debian/control: bumped exo build-dep to 4.4rc1 to fix FTBFS. + + -- Yves-Alexis Perez Fri, 29 Sep 2006 12:13:14 +0100 + +xfce4-terminal (0.2.5.6rc1-1) unstable; urgency=low + + * New upstream release. + * Cancel button is now called Close. Closes: #380166 + + -- Yves-Alexis Perez Sat, 23 Sep 2006 15:41:32 +0100 + +xfce4-terminal (0.2.5.4beta2-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream release + * debian/control: updated standards version to 3.7.2. + (Simon Huggins) + * Remove phony rpath + + -- Yves-Alexis Perez Mon, 10 Jul 2006 19:41:08 +0200 + +xfce4-terminal (0.2.5.4-0ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Thu, 24 Aug 2006 18:22:31 +0200 + +xfce4-terminal (0.2.5.4-0ubuntu1) edgy; urgency=low + + * New upstream release, part of Xfce4.4 beta2 + + -- Jani Monoses Tue, 11 Jul 2006 09:33:26 +0300 + +xfce4-terminal (0.2.5.1beta1-1) unstable; urgency=low + + * New upstream release + + -- Yves-Alexis Perez Wed, 03 May 2006 19:17:15 +0100 + +xfce4-terminal (0.2.5+r21674-0ubuntu2) dapper; urgency=low + + * Patch from upstream svn (settings not always saved, LP #41791) + + -- Jani Monoses Sat, 20 May 2006 20:13:49 +0300 + +xfce4-terminal (0.2.5+r21674-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (update translations, fix a possible crash + when removing all terminal screens at once) + + -- Jani Monoses Mon, 15 May 2006 20:28:05 +0300 + +xfce4-terminal (0.2.5+r21256-0ubuntu2) dapper; urgency=low + + * Make /usr/bin/Terminal a symlink to /usr/bin/xfce4-terminal + to keep compatibility with upstream naming + + -- Jani Monoses Sun, 30 Apr 2006 22:37:06 +0300 + +xfce4-terminal (0.2.5+r21256-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (new translations) + * Do not explicitely depend on libstartup-notification + + -- Jani Monoses Wed, 26 Apr 2006 15:55:01 +0300 + +xfce4-terminal (0.2.5+r21186-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (bugfixes and new translations) + * Depend on newer exo + + -- Jani Monoses Sun, 23 Apr 2006 23:49:42 +0300 + +xfce4-terminal (0.2.5+r20521-0ubuntu2) dapper; urgency=low + + * Use xfce CDBS class + * Generate POT file for langpack support + + -- Jani Monoses Tue, 28 Mar 2006 09:47:28 +0300 + +xfce4-terminal (0.2.5+r20521-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot with new translations + * Build depend on xml-parser-perl not xml-perl + + -- Jani Monoses Thu, 23 Mar 2006 15:55:18 +0200 + +xfce4-terminal (0.2.5+r20145-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Remove two obsoleted patches from debian/patches/ + * Add gettext domain to .desktop files for langpack support + + -- Jani Monoses Thu, 2 Mar 2006 19:46:08 +0200 + +xfce4-terminal (0.2.4svn+r19908-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + + -- Jani Monoses Fri, 17 Feb 2006 17:03:05 +0200 + +xfce4-terminal (0.2.4-7) unstable; urgency=low + + * Build-Depend on the correct version of exo. + + -- Simon Huggins Tue, 14 Mar 2006 22:46:24 +0000 + +xfce4-terminal (0.2.4-6) unstable; urgency=low + + * debian/patches + - removed patches which fixed build with exo 0.3.1.2alpha-r19548 + - added upstream patch to fix build with exo 0.3.1.4alpha2-r20235 + + -- Yves-Alexis Perez Mon, 06 Mar 2006 17:53:29 +0100 + +xfce4-terminal (0.2.4-5) unstable; urgency=low + + * (Yves-Alexis Perez) + * Build depend on dbus 0.60 Closes: #346358 + * (Simon Huggins) + * Add patch from Dann Frazier to include libxfcegui4.h explicitly to + prevent problems with pointers on ia64 Closes: #345840 + + -- Yves-Alexis Perez Sun, 08 Jan 2006 21:05:20 +0000 + +xfce4-terminal (0.2.4-4) unstable; urgency=low + + * (Yves-Alexis Perez) + * Changed default behaviour for the cycle tabs options + * Changed dependance on libexo-0.3 + * Added a patch to fix FTBS with libexo-0.3 svn + * (Rudy Godoy) + * Fixed binary name on .desktop file call since we rename it to + xfce4-terminal. + + -- Yves-Alexis Perez Mon, 19 Dec 2005 23:42:03 +0100 + +xfce4-terminal (0.2.4-3) unstable; urgency=low + + * Yves-Alexis Perez + - Updated standards in rules file to match new debian-policy + - Binary name is xfce4-terminal to avoid name conflicts + * Emanuele Rocca + - Fixed x-terminal-emulator and x-terminal-emulator.1.gz alternatives + (Closes: #316164) + - s/Terminal/xfce4-terminal in xfce4-terminal(1) and other minor things + (Closes: #316168) + - Thanks to Y Giridhar Appaji Nag + + -- Yves-Alexis Perez Wed, 22 Jun 2005 15:53:19 +0200 + +xfce4-terminal (0.2.4-2) unstable; urgency=low + + * Changed email address in copyright file + * Reverted binary name from xfce4-terminal to Terminal (as in the upstream + package) and added links to xfce4-terminal + * Moving to unstable + + -- Yves-Alexis Perez Tue, 17 May 2005 10:52:08 +0200 + +xfce4-terminal (0.2.4-1) experimental; urgency=low + + * Initial Release (Closes: #302999). + + -- Yves-Alexis Perez Sat, 23 Apr 2005 00:02:36 +0200 + --- xfce4-terminal-0.2.8.3.orig/debian/README.Debian +++ xfce4-terminal-0.2.8.3/debian/README.Debian @@ -0,0 +1,28 @@ +* Tabs + +In Terminal when you cycle through tabs, the default behaviour is to stop at +theend and at the beginning. + +For xfce4-terminal, we have set an hidden option in +~/.config/Terminal/terminalrc, called MiscCycleTabs, and set to true by +default, so the prev/next tab command will cycle. You can change this by adding +a line with MiscCycleTabs=FALSE in the terminalrc file. + +* dbus + +If you want to use dbus support with xfce4-terminal, you should install the +package dbus-1-utils, then make sure that your session runs it. (if you run a +plain xfce4, the init script launch it, so just log out and log back in) + +When using dbus, if there's already a xfce4-terminal running, calling +xfce4-terminal will return instantly (it's just a call to the running instance +to open another window). If you use xfce4-terminal from a script (for example +to display something from mutt, see +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=434863) you may want to call +xfce4-terminal with --disable-server. + +* backspace using screen + +To delete text with backspace under screen you need to set +BindingBackspace=TERMINAL_ERASE_BINDING_ASCII_DELETE in +~/.config/Terminal/terminalrc --- xfce4-terminal-0.2.8.3.orig/debian/prerm +++ xfce4-terminal-0.2.8.3/debian/prerm @@ -0,0 +1,11 @@ +#!/bin/sh -e + +# remove alternatives links + +if [ "$1" = "remove" ]; then + update-alternatives --remove x-terminal-emulator /usr/bin/xfce4-terminal.wrapper +fi + +#DEBHELPER# + +exit 0 --- xfce4-terminal-0.2.8.3.orig/debian/compat +++ xfce4-terminal-0.2.8.3/debian/compat @@ -0,0 +1 @@ +4 --- xfce4-terminal-0.2.8.3.orig/debian/xfce4-terminal.wrapper +++ xfce4-terminal-0.2.8.3/debian/xfce4-terminal.wrapper @@ -0,0 +1,57 @@ +#! /usr/bin/perl -w +# +# Terminal.wrapper - Debian terminal wrapper script +# +# Copyright (c) 2004-2005 os-cillation +# + +while ($opt = shift(@ARGV)) +{ + if ($opt eq '-display') + { + $arg = shift(@ARGV); + push(@args, '--default-display', $arg); + } + elsif ($opt eq '-name') + { + $arg = shift(@ARGV); + } + elsif ($opt eq '-n') + { + $arg = shift(@ARGV); + } + elsif ($opt eq '-T' || $opt eq '-title') + { + push(@args, '--title', shift(@ARGV)); + } + elsif ($opt eq '-geometry') + { + $arg = shift(@ARGV); + push(@args, "--geometry=$arg"); + } + elsif ($opt eq '-fn') + { + $arg = shift(@ARGV); + } + elsif ($opt eq '-fg') + { + $arg = shift(@ARGV); + } + elsif ($opt eq '-bg') + { + $arg = shift(@ARGV); + } + elsif ($opt eq '-tn') + { + $arg = shift(@ARGV); + } + elsif ($opt eq '-e') + { + push(@args, '-x', @ARGV); + } + elsif ($opt eq '-h' || $opt eq '--help') + { + push(@args, '--help'); + } +} +exec('xfce4-terminal',@args); --- xfce4-terminal-0.2.8.3.orig/debian/control +++ xfce4-terminal-0.2.8.3/debian/control @@ -0,0 +1,27 @@ +Source: xfce4-terminal +Section: x11 +Priority: optional +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers +Uploaders: Emanuele Rocca , Simon Huggins , Rudy Godoy , Martin Loschwitz , Yves-Alexis Perez +Build-Depends: debhelper (>= 4.1.0), libdbus-glib-1-dev, + libexo-0.3-dev (>= 0.3.4), libvte-dev (>= 1:0.14), libxml-perl, + libstartup-notification0-dev, cdbs, chrpath, intltool +Standards-Version: 3.8.0 +Homepage: http://terminal.os-cillation.com/ +Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-terminal/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-terminal/ + +Package: xfce4-terminal +Architecture: any +Conflicts: terminal +Depends: ${shlibs:Depends}, exo-utils +Provides: x-terminal-emulator +Recommends: dbus-x11 +Description: Xfce terminal emulator + This package contains Terminal, which is a lightweight and easy to use + terminal emulator for X11. It was created to fit nicely into the Xfce + desktop environment, but it also fits nice with other environments. + . + For people that already know GNOME 2 terminal and are searching for a + lighter but comparable replacement, Terminal might be the answer. --- xfce4-terminal-0.2.8.3.orig/debian/docs +++ xfce4-terminal-0.2.8.3/debian/docs @@ -0,0 +1,5 @@ +AUTHORS +HACKING +NEWS +README +THANKS --- xfce4-terminal-0.2.8.3.orig/debian/watch +++ xfce4-terminal-0.2.8.3/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + Terminal-(.*)\.tar\.bz2 --- xfce4-terminal-0.2.8.3.orig/debian/menu +++ xfce4-terminal-0.2.8.3/debian/menu @@ -0,0 +1,6 @@ +?package(xfce4-terminal):needs="X11"\ + section="Applications/Terminal Emulators"\ + command="/usr/bin/xfce4-terminal"\ + title="Terminal"\ + longtitle="Xfce Terminal Emulator"\ + icon="/usr/share/pixmaps/terminal.xpm" --- xfce4-terminal-0.2.8.3.orig/debian/rules +++ xfce4-terminal-0.2.8.3/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f +#DEB_AUTO_UPDATE_LIBTOOL := pre +#DEB_AUTO_UPDATE_ACLOCAL := 1.8 +#DEB_AUTO_UPDATE_AUTOCONF := yes + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-final --enable-startup-notification --program-transform-name='s/Terminal/xfce4-terminal/' + +binary-post-install/xfce4-terminal:: + mkdir debian/xfce4-terminal/usr/share/doc/xfce4-terminal/html/ + mv debian/xfce4-terminal/usr/share/doc/Terminal/* debian/xfce4-terminal/usr/share/doc/xfce4-terminal/html/ + rmdir debian/xfce4-terminal/usr/share/doc/Terminal/ +# mv debian/xfce4-terminal/usr/share/man/man1/Terminal.1 debian/xfce4-terminal/usr/share/man/man1/xfce4-terminal.1 + cd debian/xfce4-terminal/usr/share/man/man1/ && ln -s xfce4-terminal.1 xfce4-terminal.wrapper.1 +# mv debian/xfce4-terminal/usr/bin/Terminal debian/xfce4-terminal/usr/bin/xfce4-terminal + rm debian/xfce4-terminal/usr/bin/terminal + install -c -m 0755 debian/xfce4-terminal.wrapper debian/xfce4-terminal/usr/bin/xfce4-terminal.wrapper +# sed -i 's/for browser in mozilla/for browser in sensible-browser mozilla/' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp + # .desktop file call to the right binary + mv debian/xfce4-terminal/usr/share/applications/Terminal.desktop debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop + sed -i 's#Exec=Terminal#Exec=xfce4-terminal#' debian/xfce4-terminal/usr/share/applications/xfce4-terminal.desktop + install -m 0644 debian/terminal.xpm debian/xfce4-terminal/usr/share/pixmaps/ + mv debian/xfce4-terminal/usr/lib/xfce4-terminal/xfce4-terminalHelp \ + debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp + sed -i 's#doc/Terminal/#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp + chrpath -d -k debian/xfce4-terminal/usr/bin/xfce4-terminal + --- xfce4-terminal-0.2.8.3.orig/debian/postinst +++ xfce4-terminal-0.2.8.3/debian/postinst @@ -0,0 +1,14 @@ +#!/bin/sh -e + +# install alternatives links + +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/bin/xfce4-terminal.wrapper 40 \ + --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ + x-terminal-emulator.1.gz /usr/share/man/man1/xfce4-terminal.wrapper.1.gz +fi + +#DEBHELPER# + +exit 0 --- xfce4-terminal-0.2.8.3.orig/debian/copyright +++ xfce4-terminal-0.2.8.3/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Yves-Alexis Perez on +Sat, 23 Apr 2005 00:02:36 +0200. + +It was downloaded from http://terminal.os-cillation.com/ + +Upstream Author are: +Benedikt Meurer +Francois Le Clainche + +This software is copyright © 2004-2006 by Benedikt Meurer, os-cillation. + +Some parts are taken from gnome-terminal. Copyrights for gnome-terminal are: +Havoc Pennington +Mariano Suárez-Alvarez + +Some code is © Owen Taylor in: +terminal/terminal-toolbars-model.h +terminal/terminal-toolbars-model.c +terminal/terminal-window.c +aclocal.m4 + +Documentation is under GNU Free Documentation License v1.1 or later without +invariant sections, with the following statement: + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with no Front-Cover Texts, and with no Back-Cover + Texts. +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/LGPL'. + +You are free to distribute this software under the terms of +the GNU General Public License (version 2 or later). +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL'. --- xfce4-terminal-0.2.8.3.orig/debian/terminal.xpm +++ xfce4-terminal-0.2.8.3/debian/terminal.xpm @@ -0,0 +1,190 @@ +/* XPM */ +static char *terminal2[] = { +/* columns rows colors chars-per-pixel */ +"32 26 158 2", +" c #056205620562", +". c #061F061F061F", +"X c #088908890889", +"o c #09D209D209D2", +"O c #14D214D214D2", +"+ c #164416441644", +"@ c #188A188A188A", +"# c #192219221922", +"$ c #1FC21FC21FC2", +"% c #214F214F214F", +"& c #241824182418", +"* c #244C244C244C", +"= c #305830583058", +"- c #31B631B631B6", +"; c #33C233C233C2", +": c #34C734C734C7", +"> c #35CF35CF35CF", +", c #363736373637", +"< c #37A137A137A1", +"1 c #39A339A339A3", +"2 c #3AAF3AAF3AAF", +"3 c #3CD53CD53CD5", +"4 c #3F2E3F2E3F2E", +"5 c #3FDF3FDF3FDF", +"6 c #40A640A640A6", +"7 c #42F842F842F8", +"8 c #43B343B343B3", +"9 c #451945194519", +"0 c #45A145A145A1", +"q c #46C346C346C3", +"w c #4AD84AD84AD8", +"e c #4B504B504B50", +"r c #4C684C684C68", +"t c #4DC54DC54DC5", +"y c #4F124F124F12", +"u c #4F534F534F53", +"i c #519351935193", +"p c #541154115411", +"a c #57E357E357E3", +"s c #59E959E959E9", +"d c #5BDE5BDE5BDE", +"f c #5D795D795D79", +"g c #600D600D600D", +"h c #607560756075", +"j c #63B963B963B9", +"k c #66E566E566E5", +"l c #696269626962", +"z c #6CAB6CAB6CAB", +"x c #722F722F722F", +"c c #76C376C376C3", +"v c #79C379C379C3", +"b c #7B1A7B1A7B1A", +"n c #7E537E537E53", +"m c #7F007F007F00", +"M c #800780078007", +"N c #80DC80DC80DC", +"B c #824D824D824D", +"V c #82A482A482A4", +"C c #83A183A183A1", +"Z c #851585158515", +"A c #85F285F285F2", +"S c #86D386D386D3", +"D c #88B588B588B5", +"F c #899689968996", +"G c #8C318C318C31", +"H c #906690669066", +"J c #921192119211", +"K c #936B936B936B", +"L c #93AE93AE93AE", +"P c #971397139713", +"I c #990D990D990D", +"U c #9ACD9ACD9ACD", +"Y c #9C189C189C18", +"T c #9D7D9D7D9D7D", +"R c #9E4A9E4A9E4A", +"E c #9FC89FC89FC8", +"W c #A0F8A0F8A0F8", +"Q c #A3B3A3B3A3B3", +"! c #A51AA51AA51A", +"~ c #A5D1A5D1A5D1", +"^ c #A70EA70EA70E", +"/ c #A814A814A814", +"( c #A95EA95EA95E", +") c #AAFEAAFEAAFE", +"_ c #AC84AC84AC84", +"` c #AE41AE41AE41", +"' c #AF9AAF9AAF9A", +"] c #B136B136B136", +"[ c #B27FB27FB27F", +"{ c #B31AB31AB31A", +"} c #B413B413B413", +"| c #B4F4B4F4B4F4", +" . c #B7D4B7D4B7D4", +".. c #B9C6B9C6B9C6", +"X. c #BB58BB58BB58", +"o. c #BBC7BBC7BBC7", +"O. c #BD2CBD2CBD2C", +"+. c #BDFABDFABDFA", +"@. c #BF7FBF7FBF7F", +"#. c #C047C047C047", +"$. c #C0FEC0FEC0FE", +"%. c #C237C237C237", +"&. c #C30AC30AC30A", +"*. c #C41DC41DC41D", +"=. c #C561C561C561", +"-. c #C661C661C661", +";. c #C7AAC7AAC7AA", +":. c #C8A6C8A6C8A6", +">. c #CA59CA59CA59", +",. c #CB45CB45CB45", +"<. c #CBF5CBF5CBF5", +"1. c #CDA2CDA2CDA2", +"2. c #CE3DCE3DCE3D", +"3. c #D061D061D061", +"4. c #D144D144D144", +"5. c #D2BED2BED2BE", +"6. c #D3B2D3B2D3B2", +"7. c #D46DD46DD46D", +"8. c #D59ED59ED59E", +"9. c #D63ED63ED63E", +"0. c #D77DD77DD77D", +"q. c #D83ED83ED83E", +"w. c #D964D964D964", +"e. c #DA0EDA0EDA0E", +"r. c #DDA0DDA0DDA0", +"t. c #DEB8DEB8DEB8", +"y. c #DFC1DFC1DFC1", +"u. c #E181E181E181", +"i. c #E28CE28CE28C", +"p. c #E340E340E340", +"a. c #E40AE40AE40A", +"s. c #E552E552E552", +"d. c #E691E691E691", +"f. c #E743E743E743", +"g. c #E869E869E869", +"h. c #E969E969E969", +"j. c #EA81EA81EA81", +"k. c #EB55EB55EB55", +"l. c #EC8CEC8CEC8C", +"z. c #ED84ED84ED84", +"x. c #EE6EEE6EEE6E", +"c. c #EF49EF49EF49", +"v. c #F08FF08FF08F", +"b. c #F185F185F185", +"n. c #F38CF38CF38C", +"m. c #F4BBF4BBF4BB", +"M. c #F588F588F588", +"N. c #F67CF67CF67C", +"B. c #F71BF71BF71B", +"V. c #F853F853F853", +"C. c #F96EF96EF96E", +"Z. c #FA53FA53FA53", +"A. c #FB8BFB8BFB8B", +"S. c #FC83FC83FC83", +"D. c #FD7DFD7DFD7D", +"F. c #FE1FFE1FFE1F", +"G. c #FFB0FFB0FFB0", +"H. c gray100", +/* pixels */ +"o % * * * * * * * % * * * * * % * * * * * * * * * * * * * * % o ", +"2 X.#.#.#.#.#.#.#.#.#.#.#.#.#.O.#.#.#.#.#.O.#.#.#.#.#.#.#.#.' ; ", +"y m.=.6.7.6.7.7.7.7.7.6.7.6.7.6.7.7.7.7.6.6.7.6.7.7.6.7.>.( k.q ", +"y c.7.A.G.G.G.G.A.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.7.N j i.q ", +"e n.3.A.A.G.A.A.G.A.G.A.G.G.G.G.G.G.G.G.G.G.G.G.G.k.R p ; s i.q ", +"y c.>.m.A.m.A.A.A.A.A.A.A.A.G.A.G.G.G.G.G.G.G.m.O.k < ; ; s i.8 ", +"y c.=.n.m.m.n.m.m.m.A.m.m.A.A.A.A.A.A.G.G.G.7.Z q < < ; ; s f.q ", +"y c.O.f.k.k.k.c.c.c.c.c.n.n.m.m.n.n.n.m.f.! p < ; < < < ; s i.8 ", +"e k.' e.r.r.i.i.f.f.f.f.k.k.f.k.f.k.k.3.b 3 ; ; ; < ; < ; s i.q ", +"y c.! >.3.6.6.6.7.e.e.e.e.r.r.r.f.r.! a < ; < < ; < < < ; a i.q ", +"y c.R #.=.>.>.3.>.3.6.6.6.7.7.e.=.M 3 < < < ; < < < < ; ; s i.8 ", +"y c.Y O.#.#.#.=.=.>.>.>.3.6.7.( f < ; < ; < < ; < ; ; < ; s i.q ", +"e c.P } X.X.O.#.#.=.=.>.>.=.J q < < ; < ; < < < ; < < < ; s i.8 ", +"y k.J ! ' ' } O.O.O.#.=.X.M 3 < < ; ; < < < ; < < < ; ; ; s i.q ", +"y k.G R ! ( ( ' ' } O.( l 2 ; ; < < < < < ; ; < ; < ; < ; s i.8 ", +"e c.S Y R W ! ! ( ' Y a < < < < ; ; < ; ; < < < ; < < < ; s i.q ", +"y c.Z G J Y Y R R N e < < ; ; < < < ; < < < ; ; < ; < ; ; s i.q ", +"e k.M N S S J J c 8 ; ; < < < < < ; ; < ; < < < < < < ; ; s i.8 ", +"y c.b c N Z N z 8 < < < ; < < ; < ; < < ; < < ; ; ; < < ; s i.q ", +"y k.l j z x j 2 ; < ; < < ; ; < ; < < ; < ; < < < < < ; ; s i.8 ", +"y c.j e p e 2 ; < ; < < < ; < < < < < ; < < ; < ; < < ; ; s i.q ", +"e k.j 3 3 < < < ; < < ; ; < < ; < ; < < < ; < < < < ; < ; s i.q ", +"y c.s < < < < < < < ; < < < < < ; < < < ; < < < ; < < < ; s i.q ", +"y m.R Z Z Z N Z Z Z Z N Z Z Z Z Z Z N Z Z Z N Z Z Z Z Z N Y k.q ", +"< ( ' } } ' } } ' } } ' } } ' } } ' } } ' } } ' ' } ' } ' } ( ; ", +" + # # # # # # # # # # # # # # # # # # # # # + # # # # # # O " +}; --- xfce4-terminal-0.2.8.3.orig/debian/patches/xubuntu-change-desktop-category.patch +++ xfce4-terminal-0.2.8.3/debian/patches/xubuntu-change-desktop-category.patch @@ -0,0 +1,12 @@ +diff -Nur xfce4-terminal-0.2.6/Terminal.desktop.in xfce4-terminal-0.2.6.new/Terminal.desktop.in +--- xfce4-terminal-0.2.6/Terminal.desktop.in 2007-01-20 16:30:53.000000000 +0200 ++++ xfce4-terminal-0.2.6.new/Terminal.desktop.in 2007-04-05 09:18:02.000000000 +0300 +@@ -8,7 +8,7 @@ + Icon=Terminal + Terminal=false + Type=Application +-Categories=System;TerminalEmulator;Utility; ++Categories=TerminalEmulator;Utility; + StartupNotify=true + + # vi:set encoding=UTF-8: --- xfce4-terminal-0.2.8.3.orig/debian/patches/02_dont-refresh-prefs-too-much.patch +++ xfce4-terminal-0.2.8.3/debian/patches/02_dont-refresh-prefs-too-much.patch @@ -0,0 +1,12 @@ +diff -ur Terminal-0.2.6.orig/terminal/terminal-monitor.c Terminal-0.2.6/terminal/terminal-monitor.c +--- Terminal-0.2.6.orig/terminal/terminal-monitor.c 2007-01-20 15:30:51.000000000 +0100 ++++ Terminal-0.2.6/terminal/terminal-monitor.c 2007-11-05 15:15:49.000000000 +0100 +@@ -339,7 +339,7 @@ + + if (G_UNLIKELY (monitor->idle_id == 0)) + { +- monitor->idle_id = g_timeout_add_full (G_PRIORITY_LOW, 1000, terminal_monitor_idle, ++ monitor->idle_id = g_timeout_add_full (G_PRIORITY_LOW, 60*1000, terminal_monitor_idle, + monitor, terminal_monitor_idle_destroy); + } + } --- xfce4-terminal-0.2.8.3.orig/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch +++ xfce4-terminal-0.2.8.3/debian/patches/00_binary-name-fix-xfce4-terminal.1.patch @@ -0,0 +1,71 @@ +--- Terminal.1.old 2005-07-02 13:18:06.000000000 +0200 ++++ Terminal.1 2005-07-02 13:33:21.000000000 +0200 +@@ -1,29 +1,29 @@ +-.TH Terminal 1 "Mar 19, 2005" ++.TH xfce4-terminal 1 "Mar 19, 2005" + .SH NAME +-Terminal \- A Terminal emulator for X ++xfce4-terminal \- A Terminal emulator for X + .SH SYNOPSIS +-.B Terminal ++.B xfce4-terminal + .br + .SH DESCRIPTION + This manual page documents briefly the +-.B Terminal ++.B xfce4-terminal + application. + .PP +-\fBTerminal\fP is what is known as an X terminal emulator, often referred ++\fBxfce4-terminal\fP is what is known as an X terminal emulator, often referred + to as terminal or shell. It provides an equivalent to the old fashioned text +-screen on your desktop, but on which can easily the screen with other ++screen on your desktop, but on which can easily share the screen with other + graphical applications. + +-\fBTerminal\fP emulates the xterm application developed by the X Consortium. ++\fBxfce4-terminal\fP emulates the xterm application developed by the X Consortium. + In turn, the xterm applications emulates the DEC VT102 terminal and also + supports the DEC VT220 escape sequences. An escape sequence is a series of +-characters that with the Esc character. Terminal accepts all of the escape ++characters that with the Esc character. \fBxfce4-terminal\fP accepts all of the escape + sequences that the VT102 and VT220 terminals use for functions such as to + position the cursor and to clear the screen. + + + .SH OPTIONS +-\fBTerminal\fP takes the following command line options: ++\fBxfce4-terminal\fP takes the following command line options: + .TP + .B \-\-help + Print a help screen and exit. +@@ -33,7 +33,7 @@ + + + .SH ENVIRONMENT +-\fBTerminal\fP's behaviour is affected by the following environment ++\fBxfce4-terminal\fP's behaviour is affected by the following environment + variables. + .PP + .TP +@@ -61,9 +61,9 @@ + + + .SH FILES +-\fBTerminal\fP reads its configuration from the files ++\fBxfce4-terminal\fP reads its configuration from the files + .IR $XDG_CONFIG_DIRS/Terminal/terminalrc . +-\fBTerminal\fP creates the main menubar and the popup ++\fBxfce4-terminal\fP creates the main menubar and the popup + menu from the files + .IR $XDG_DATA_DIRS/Terminal/Terminal.ui + and the toolbars layout from the files +@@ -74,7 +74,7 @@ + + + .SH AUTHOR +-The \fBTerminal\fP software and this manual page was written ++The \fBxfce4-terminal\fP software and this manual page was written + for os-cillation by Benedikt Meurer . + + --- xfce4-terminal-0.2.8.3.orig/debian/patches/03_background-activity.patch +++ xfce4-terminal-0.2.8.3/debian/patches/03_background-activity.patch @@ -0,0 +1,498 @@ +diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c +index bccf1a1..51422f9 100644 +--- a/terminal/terminal-preferences-dialog.c ++++ b/terminal/terminal-preferences-dialog.c +@@ -768,6 +768,52 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog) + g_free (name); + } + ++ frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL); ++ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE, 0); ++ gtk_widget_show (frame); ++ ++ label = g_object_new (GTK_TYPE_LABEL, "label", _("Tab activity"), "use-markup", TRUE, NULL); ++ gtk_frame_set_label_widget (GTK_FRAME (frame), label); ++ gtk_widget_show (label); ++ ++ table = gtk_table_new (2, 1, FALSE); ++ gtk_table_set_row_spacings (GTK_TABLE (table), 6); ++ gtk_table_set_col_spacings (GTK_TABLE (table), 12); ++ gtk_container_set_border_width (GTK_CONTAINER (table), 12); ++ gtk_container_add (GTK_CONTAINER (frame), table); ++ gtk_widget_show (table); ++ ++ label = g_object_new (GTK_TYPE_LABEL, ++ "label", _("T_ab activity color:"), ++ "use-underline", TRUE, ++ "xalign", 0.0, ++ NULL); ++ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); ++ gtk_widget_show (label); ++ ++ align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0); ++ gtk_table_attach (GTK_TABLE (table), align, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); ++ gtk_widget_show (align); ++ ++ hbox = gtk_hbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (align), hbox); ++ gtk_widget_show (hbox); ++ ++ button = g_object_new (GTK_TYPE_COLOR_BUTTON, "title", _("Choose tab activity color"), NULL); ++ exo_mutual_binding_new (G_OBJECT (dialog->preferences), "tab-activity-color", G_OBJECT (button), "color"); ++ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); ++ gtk_widget_show (button); ++ ++ /* set Atk name/description and label relation for the button */ ++ object = gtk_widget_get_accessible (button); ++ atk_object_set_name (object, _("Color Selector")); ++ atk_object_set_description (object, _("Open a dialog to specify the color")); ++ relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label)); ++ relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR); ++ atk_relation_set_add (relations, relation); ++ g_object_unref (G_OBJECT (relation)); ++ + icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar), + TERMINAL_STOCK_COLORS, + GTK_ICON_SIZE_DIALOG, +@@ -982,6 +1028,46 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog) + /* set Atk label relation for the entry */ + terminal_gtk_label_set_a11y_relation (GTK_LABEL (label), entry); + ++/* start */ ++ frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL); ++ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE, 0); ++ gtk_widget_show (frame); ++ ++ label = g_object_new (GTK_TYPE_LABEL, "label", _("Tab activity indicator"), "use-markup", TRUE, NULL); ++ gtk_frame_set_label_widget (GTK_FRAME (frame), label); ++ gtk_widget_show (label); ++ ++ vbox = gtk_vbox_new (FALSE, 6); ++ gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); ++ gtk_container_add (GTK_CONTAINER (frame), vbox); ++ gtk_widget_show (vbox); ++ ++ hbox = gtk_hbox_new (FALSE, 6); ++ gtk_container_set_border_width (GTK_CONTAINER (hbox), 0); ++ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); ++ gtk_widget_show (hbox); ++ ++ label = gtk_label_new (_("Reset tab activity indicator after")); ++ g_object_set (G_OBJECT (label), "wrap", TRUE, "xalign", 0.0, NULL); ++ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ button = gtk_spin_button_new_with_range (0.0, 30.0, 1.0); ++ gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); ++ exo_mutual_binding_new (G_OBJECT (dialog->preferences), "tab-activity-timeout", G_OBJECT (button), "value"); ++ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); ++ gtk_widget_show (button); ++ ++ /* set Atk label relation for the button */ ++ terminal_gtk_label_set_a11y_relation (GTK_LABEL (label), button); ++ ++ label = gtk_label_new (_("seconds")); ++ g_object_set (G_OBJECT (label), "wrap", TRUE, "xalign", 0.0, NULL); ++ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++/*end */ + icon = gtk_widget_render_icon (GTK_WIDGET (dialog->icon_bar), + TERMINAL_STOCK_ADVANCED, + GTK_ICON_SIZE_DIALOG, +diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c +index bb6f6c0..311efe0 100644 +--- a/terminal/terminal-preferences.c ++++ b/terminal/terminal-preferences.c +@@ -130,6 +130,8 @@ enum + PROP_TERM, + PROP_VTE_WORKAROUND_TITLE_BUG, + PROP_WORD_CHARS, ++ PROP_TAB_ACTIVITY_COLOR, ++ PROP_TAB_ACTIVITY_TIMEOUT, + N_PROPERTIES, + }; + +@@ -910,6 +912,27 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass) + EXO_PARAM_READWRITE)); + + /** ++ * TerminalPreferences:tab-activity-color: ++ **/ ++ g_object_class_install_property (gobject_class, ++ PROP_TAB_ACTIVITY_COLOR, ++ g_param_spec_string ("tab-activity-color", ++ "tab-activity-color", ++ "tab-activity-color", ++ "#afff00000000", ++ EXO_PARAM_READWRITE)); ++ /** ++ * TerminalPreferences:tab-activity-timeout: ++ **/ ++ g_object_class_install_property (gobject_class, ++ PROP_TAB_ACTIVITY_TIMEOUT, ++ g_param_spec_double ("tab-activity-timeout", ++ "tab-activity-timeout", ++ "tab-activity-timeout", ++ 0.0, 30.0, 2.0, ++ EXO_PARAM_READWRITE)); ++ ++ /** + * TerminalPreferences:command-update-records: + **/ + g_object_class_install_property (gobject_class, +@@ -1640,5 +1663,16 @@ terminal_preferences_get (void) + return preferences; + } + ++void ++query_color (TerminalPreferences *preferences, ++ const gchar *property, ++ GdkColor *color_return) ++{ ++ gchar *spec; ++ ++ g_object_get (G_OBJECT (preferences), property, &spec, NULL); ++ gdk_color_parse (spec, color_return); ++ g_free (spec); ++} + + +diff --git a/terminal/terminal-preferences.h b/terminal/terminal-preferences.h +index f053a78..f102718 100644 +--- a/terminal/terminal-preferences.h ++++ b/terminal/terminal-preferences.h +@@ -83,6 +83,11 @@ GType terminal_preferences_get_type (void) G_GNUC_CONST; + + TerminalPreferences *terminal_preferences_get (void); + ++void query_color (TerminalPreferences *preferences, ++ const gchar *property, ++ GdkColor *color_return); ++ ++ + G_END_DECLS; + + #endif /* !__TERMINAL_PREFERENCES_H__ */ +diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c +index 886b8d7..dc17195 100644 +--- a/terminal/terminal-screen.c ++++ b/terminal/terminal-screen.c +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + #if defined(GDK_WINDOWING_X11) + #include +@@ -56,6 +57,7 @@ enum + PROP_0, + PROP_CUSTOM_TITLE, + PROP_TITLE, ++ PROP_ACTIVITY, + }; + + enum +@@ -107,6 +109,8 @@ static void terminal_screen_vte_selection_changed (VteTerminal + TerminalScreen *screen); + static void terminal_screen_vte_window_title_changed (VteTerminal *terminal, + TerminalScreen *screen); ++static void terminal_screen_vte_window_contents_changed (VteTerminal *terminal, ++ TerminalScreen *screen); + static gboolean terminal_screen_timer_background (gpointer user_data); + static void terminal_screen_timer_background_destroy (gpointer user_data); + +@@ -138,6 +142,9 @@ struct _TerminalScreen + + guint background_timer_id; + guint launch_idle_id; ++ ++ gboolean activity; ++ guint reset_activity_cb; + }; + + +@@ -188,6 +195,17 @@ terminal_screen_class_init (TerminalScreenClass *klass) + G_PARAM_READABLE)); + + /** ++ * TerminalScreen:activity: ++ **/ ++ g_object_class_install_property (gobject_class, ++ PROP_ACTIVITY, ++ g_param_spec_boolean ("activity", ++ "activity", ++ "activity", ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ /** + * TerminalScreen::get-context-menu + **/ + screen_signals[GET_CONTEXT_MENU] = +@@ -227,6 +245,7 @@ terminal_screen_init (TerminalScreen *screen) + "signal::context-menu", G_CALLBACK (terminal_screen_vte_get_context_menu), screen, + "signal::selection-changed", G_CALLBACK (terminal_screen_vte_selection_changed), screen, + "signal::window-title-changed", G_CALLBACK (terminal_screen_vte_window_title_changed), screen, ++ "signal::contents-changed", G_CALLBACK (terminal_screen_vte_window_contents_changed), screen, + "swapped-signal::size-allocate", G_CALLBACK (terminal_screen_timer_background), screen, + "swapped-signal::style-set", G_CALLBACK (terminal_screen_update_colors), screen, + NULL); +@@ -340,6 +359,10 @@ terminal_screen_get_property (GObject *object, + g_value_take_string (value, terminal_screen_get_title (screen)); + break; + ++ case PROP_ACTIVITY: ++ g_value_set_boolean (value, screen->activity); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -362,6 +385,10 @@ terminal_screen_set_property (GObject *object, + terminal_screen_set_custom_title (screen, g_value_get_string (value)); + break; + ++ case PROP_ACTIVITY: ++ screen->activity = g_value_get_boolean (value); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -597,22 +624,6 @@ terminal_screen_update_binding_delete (TerminalScreen *screen) + } + } + +- +- +-static void +-query_color (TerminalPreferences *preferences, +- const gchar *property, +- GdkColor *color_return) +-{ +- gchar *spec; +- +- g_object_get (G_OBJECT (preferences), property, &spec, NULL); +- gdk_color_parse (spec, color_return); +- g_free (spec); +-} +- +- +- + static void + terminal_screen_update_colors (TerminalScreen *screen) + { +@@ -843,7 +854,38 @@ terminal_screen_vte_window_title_changed (VteTerminal *terminal, + g_object_notify (G_OBJECT (screen), "title"); + } + ++static gboolean terminal_screen_reset_activity(TerminalScreen *screen) ++{ ++ screen->activity = FALSE; ++ screen->reset_activity_cb = 0; ++ g_object_notify (G_OBJECT (screen), "activity"); ++ return FALSE; ++} ++ ++static void ++terminal_screen_vte_window_contents_changed (VteTerminal *terminal, ++ TerminalScreen *screen) ++{ ++ gdouble timeout_seconds = 2.0; ++ ++ _terminal_return_if_fail (VTE_IS_TERMINAL (terminal)); ++ _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen)); ++ ++ if (terminal_window_is_screen_active (screen)) ++ return; + ++ g_object_get (G_OBJECT (screen->preferences), "tab-activity-timeout", &timeout_seconds, NULL); ++ if (timeout_seconds < 1.0) ++ return; ++ ++ screen->activity = TRUE; ++ g_object_notify (G_OBJECT (screen), "activity"); ++ if (screen->reset_activity_cb != 0) { ++ g_source_remove(screen->reset_activity_cb); ++ } ++ screen->reset_activity_cb = g_timeout_add_seconds ((gint)timeout_seconds, ++ (GSourceFunc)terminal_screen_reset_activity, screen); ++} + + static gboolean + terminal_screen_timer_background (gpointer user_data) +@@ -1226,8 +1268,6 @@ terminal_screen_get_title (TerminalScreen *screen) + return title; + } + +- +- + /** + * terminal_screen_get_working_directory: + * @screen : A #TerminalScreen. +diff --git a/terminal/terminal-tab-header.c b/terminal/terminal-tab-header.c +index aebe338..9ddd5b7 100644 +--- a/terminal/terminal-tab-header.c ++++ b/terminal/terminal-tab-header.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + +@@ -35,6 +36,7 @@ enum + PROP_0, + PROP_TAB_POS, + PROP_TITLE, ++ PROP_ACTIVITY, + }; + + enum +@@ -135,6 +137,17 @@ terminal_tab_header_class_init (TerminalTabHeaderClass *klass) + G_PARAM_READWRITE)); + + /** ++ * TerminalTabHeader:activity: ++ **/ ++ g_object_class_install_property (gobject_class, ++ PROP_ACTIVITY, ++ g_param_spec_boolean ("activity", ++ "activity", ++ "activity", ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ /** + * TerminalTabHeader::close-tab: + **/ + header_signals[CLOSE_TAB] = +@@ -248,6 +261,10 @@ terminal_tab_header_get_property (GObject *object, + g_object_get_property (G_OBJECT (header->label), "label", value); + break; + ++ case PROP_ACTIVITY: ++ g_object_get_property (G_OBJECT (header), "activity", value); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -265,7 +282,9 @@ terminal_tab_header_set_property (GObject *object, + TerminalTabHeader *header = TERMINAL_TAB_HEADER (object); + GtkPositionType position; + const gchar *title; +- ++ gboolean act = FALSE; ++ GdkColor act_color; ++ + switch (prop_id) + { + case PROP_TAB_POS: +@@ -296,6 +315,13 @@ terminal_tab_header_set_property (GObject *object, + gtk_label_set_text (GTK_LABEL (header->label), title); + break; + ++ case PROP_ACTIVITY: ++ act = g_value_get_boolean(value); ++ query_color (header->preferences, "tab-activity-color", &act_color); ++ /* strangely, inactive tab are in state ACTIVE */ ++ gtk_widget_modify_fg(header->label, GTK_STATE_ACTIVE, act ? &act_color:NULL); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c +index d62632f..69d58b2 100644 +--- a/terminal/terminal-window.c ++++ b/terminal/terminal-window.c +@@ -845,8 +845,8 @@ terminal_window_page_notified (GtkNotebook *notebook, + title = terminal_screen_get_title (terminal); + gtk_window_set_title (GTK_WINDOW (window), title); + g_free (title); +- + terminal_window_update_actions (window); ++ g_object_set (G_OBJECT (terminal), "activity", FALSE, NULL); + } + } + +@@ -1022,8 +1022,6 @@ terminal_window_screen_removed (GtkNotebook *notebook, + } + } + +- +- + static void + terminal_window_action_new_tab (GtkAction *action, + TerminalWindow *window) +@@ -1512,11 +1510,13 @@ terminal_window_add (TerminalWindow *window, + + header = terminal_tab_header_new (); + exo_binding_new (G_OBJECT (screen), "title", G_OBJECT (header), "title"); ++ exo_binding_new (G_OBJECT (screen), "activity", G_OBJECT (header), "activity"); + exo_binding_new (G_OBJECT (window->notebook), "tab-pos", G_OBJECT (header), "tab-pos"); + g_signal_connect_swapped (G_OBJECT (header), "close-tab", G_CALLBACK (gtk_widget_destroy), screen); + g_signal_connect_swapped (G_OBJECT (header), "detach-tab", G_CALLBACK (terminal_window_detach_screen), window); + g_signal_connect_swapped (G_OBJECT (header), "set-title", G_CALLBACK (gtk_action_activate), action); + g_object_set_data_full (G_OBJECT (header), I_("terminal-window-screen"), g_object_ref (G_OBJECT (screen)), (GDestroyNotify) g_object_unref); ++ g_object_set_data_full (G_OBJECT (screen), I_("terminal-window"), g_object_ref (G_OBJECT (window)), (GDestroyNotify) g_object_unref); + gtk_widget_show (header); + + page = gtk_notebook_append_page (GTK_NOTEBOOK (window->notebook), +@@ -1603,6 +1603,29 @@ terminal_window_get_active (TerminalWindow *window) + return NULL; + } + ++/** ++ * terminal_window_is_screen_active: ++ * @screen : a #TerminalScreen. ++ * ++ * Return value: TRUE if @screen is active. ++ **/ ++gboolean ++terminal_window_is_screen_active (TerminalScreen *screen) ++{ ++ TerminalWindow *window = NULL; ++ GtkNotebook *notebook; ++ gint page_num; ++ ++ window = g_object_get_data (G_OBJECT (screen), I_("terminal-window")); ++ _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), FALSE); ++ notebook = GTK_NOTEBOOK (window->notebook); ++ page_num = gtk_notebook_get_current_page (notebook); ++ if (G_LIKELY (page_num >= 0)) ++ return (TERMINAL_SCREEN (gtk_notebook_get_nth_page (notebook, page_num)) == screen); ++ else ++ return FALSE; ++} ++ + + + /** +diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h +index 8546bfa..7923524 100644 +--- a/terminal/terminal-window.h ++++ b/terminal/terminal-window.h +@@ -23,6 +23,7 @@ + #define __TERMINAL_WINDOW_H__ + + #include ++#include + + G_BEGIN_DECLS; + +@@ -67,6 +68,8 @@ void terminal_window_set_startup_id (TerminalWindow *window + + GList *terminal_window_get_restart_command (TerminalWindow *window); + ++gboolean terminal_window_is_screen_active (TerminalScreen *screen); ++ + G_END_DECLS; + + #endif /* !__TERMINAL_WINDOW_H__ */