Bug#771358: unblock: roxterm/2.9.5-1
tags 771358 - moreinfo
thanks
On 28/11/14 19:46, Jonathan Wiltshire wrote:
Control: tag -1 moreinfo
On Fri, Nov 28, 2014 at 07:27:21PM +0000, Tony Houghton wrote:
Please unblock package roxterm; I have uploaded version 2.9.5-1 to
mentors.debian.net for sponsorship.
I can't unblock anything that's not in sid.
OK. I did things in the wrong order, but it's turned out to have a
positive outcome because a potential sponsor would like to see your
decision before accepting it into unstable (#771361).
I'm certainly willing to consider new upstream releases case-by-case, but
the debdiff output you sent is for the binary packages, not the source.
Please attach a source debdiff (i.e. against the .dscs, not the .changes)
and remove the moreinfo tag, and I'll happily take a look.
Sorry about that. Correct debdiff attached.
diff -Nru roxterm-2.9.4/AppInfo.xml roxterm-2.9.5/AppInfo.xml
--- roxterm-2.9.4/AppInfo.xml 2014-09-17 15:33:31.000000000 +0100
+++ roxterm-2.9.5/AppInfo.xml 2014-11-28 18:27:26.000000000 +0000
@@ -3,7 +3,7 @@
<Summary>Run text-based programs (command prompt)</Summary>
<About>
<Purpose>A medium-weight terminal emulator with a flexible GUI</Purpose>
- <Version>2.9.4 (2014-09-17)</Version>
+ <Version>2.9.5 (2014-11-28)</Version>
<Authors>Tony Houghton <h@realh.co.uk></Authors>
<License>GNU General Public License</License>
<Homepage>http://roxterm.sourceforge.net</Homepage>
diff -Nru roxterm-2.9.4/ChangeLog roxterm-2.9.5/ChangeLog
--- roxterm-2.9.4/ChangeLog 2014-09-17 15:48:42.000000000 +0100
+++ roxterm-2.9.5/ChangeLog 2014-11-28 18:21:48.000000000 +0000
@@ -1,6 +1,12 @@
+Version 2.9.5
+Author: Tony Houghton <h@realh.co.uk>
+Date: Fri, 28 Nov 2014 18:21:07 +0000
+ * Recognise _NET_WM_DESKTOP value 0xffffffff
+ * Check for unset $EDITOR when editing shortcuts
+
Version 2.9.4
Author: Tony Houghton <h@realh.co.uk>
-Date: Wed, 17 Sep 2014 15:47:06 +0100
+Date: Wed, 17 Sep 2014 17:17:35 +0100
* Fixed metadata_license and screenshot in appdata
* Defer writing AppInfo.xml to mscript.py dist
* Output translation files correctly
diff -Nru roxterm-2.9.4/debian/changelog roxterm-2.9.5/debian/changelog
--- roxterm-2.9.4/debian/changelog 2014-09-17 17:17:14.000000000 +0100
+++ roxterm-2.9.5/debian/changelog 2014-11-28 18:29:10.000000000 +0000
@@ -1,3 +1,11 @@
+roxterm (2.9.5-1) unstable; urgency=medium
+
+ * Recognise _NET_WM_DESKTOP special value 0xffffffff correctly.
+ * Don't crash if EDITOR env variable is unset when editing shortcuts
+ (Closes: #771022).
+
+ -- Tony Houghton <h@realh.co.uk> Fri, 28 Nov 2014 18:20:06 +0000
+
roxterm (2.9.4-1) unstable; urgency=low
* Fixed metadata_license and non-default screenshot in appdata.
diff -Nru roxterm-2.9.4/Help/Changes roxterm-2.9.5/Help/Changes
--- roxterm-2.9.4/Help/Changes 2014-09-17 15:48:42.000000000 +0100
+++ roxterm-2.9.5/Help/Changes 2014-11-28 18:21:48.000000000 +0000
@@ -1,6 +1,12 @@
+Version 2.9.5
+Author: Tony Houghton <h@realh.co.uk>
+Date: Fri, 28 Nov 2014 18:21:07 +0000
+ * Recognise _NET_WM_DESKTOP value 0xffffffff
+ * Check for unset $EDITOR when editing shortcuts
+
Version 2.9.4
Author: Tony Houghton <h@realh.co.uk>
-Date: Wed, 17 Sep 2014 15:47:06 +0100
+Date: Wed, 17 Sep 2014 17:17:35 +0100
* Fixed metadata_license and screenshot in appdata
* Defer writing AppInfo.xml to mscript.py dist
* Output translation files correctly
diff -Nru roxterm-2.9.4/po/es.po roxterm-2.9.5/po/es.po
--- roxterm-2.9.4/po/es.po 2014-09-17 15:48:46.000000000 +0100
+++ roxterm-2.9.5/po/es.po 2014-11-28 18:21:58.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: roxterm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 19:48+0100\n"
+"POT-Creation-Date: 2014-09-29 16:59+0100\n"
"PO-Revision-Date: 2013-05-23 15:18+0000\n"
"Last-Translator: Tony Houghton <h@realh.co.uk>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/roxterm/language/";
@@ -1132,154 +1132,154 @@
msgid "Invalid geometry specification"
msgstr ""
-#: ../src/roxterm.c:4705
+#: ../src/roxterm.c:4706
msgid ""
"Closing this ROXTerm tab may cause loss of data. Are you sure you want to "
"continue?"
msgstr ""
-#: ../src/roxterm.c:4709
+#: ../src/roxterm.c:4710
msgid ""
"You are about to close a ROXTerm window; this may cause loss of data. Are "
"you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4713
+#: ../src/roxterm.c:4714
msgid ""
"You are about to close a window containing multiple ROXTerm tabs; this may "
"cause loss of data. Are you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4722
+#: ../src/roxterm.c:4723
msgid "ROXTerm: Confirm close"
msgstr ""
-#: ../src/roxterm.c:4726
+#: ../src/roxterm.c:4727
msgid "_Don't show this again"
msgstr ""
-#: ../src/roxterm.c:4734
+#: ../src/roxterm.c:4735
msgid "Only warn if tasks are still _running"
msgstr ""
-#: ../src/roxterm.c:4849
+#: ../src/roxterm.c:4850
#, c-format
msgid "Unable to spawn command %s: %s"
msgstr ""
-#: ../src/roxterm.c:5017
+#: ../src/roxterm.c:5018
#, c-format
msgid "Unknown <window> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5068
+#: ../src/roxterm.c:5069
msgid "Session contains window with no valid tabs"
msgstr ""
-#: ../src/roxterm.c:5172
+#: ../src/roxterm.c:5173
#, c-format
msgid "Unknown <tab> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5205
+#: ../src/roxterm.c:5206
msgid "<command> with no arguments"
msgstr ""
-#: ../src/roxterm.c:5255
+#: ../src/roxterm.c:5256
#, c-format
msgid "Unknown <command> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5267
+#: ../src/roxterm.c:5268
msgid "<command> missing argc attribute"
msgstr ""
-#: ../src/roxterm.c:5281
+#: ../src/roxterm.c:5282
#, c-format
msgid "Too many <arg> elements for <command argc='%d>"
msgstr ""
-#: ../src/roxterm.c:5298
+#: ../src/roxterm.c:5299
#, c-format
msgid "Unknown <arg> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5310
+#: ../src/roxterm.c:5311
msgid "<arg> missing s attribute"
msgstr ""
-#: ../src/roxterm.c:5330
+#: ../src/roxterm.c:5331
#, c-format
msgid "Unknown <roxterm_session> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5349
+#: ../src/roxterm.c:5350
msgid "<roxterm_session> tag nested within <window>"
msgstr ""
-#: ../src/roxterm.c:5363
+#: ../src/roxterm.c:5364
msgid "<window> tag not within <roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5368
+#: ../src/roxterm.c:5369
msgid "<window> tag nested within another <window>"
msgstr ""
-#: ../src/roxterm.c:5380
+#: ../src/roxterm.c:5381
msgid "<tab> tag not within <window>"
msgstr ""
-#: ../src/roxterm.c:5385
+#: ../src/roxterm.c:5386
msgid "<tab> tag nested within another <tab>"
msgstr ""
-#: ../src/roxterm.c:5397
+#: ../src/roxterm.c:5398
msgid "<command> tag not within <tab>"
msgstr ""
-#: ../src/roxterm.c:5402
+#: ../src/roxterm.c:5403
msgid "<command> tag nested within another <command>"
msgstr ""
-#: ../src/roxterm.c:5414
+#: ../src/roxterm.c:5415
msgid "<arg> tag not within <command>"
msgstr ""
-#: ../src/roxterm.c:5424
+#: ../src/roxterm.c:5425
#, c-format
msgid "Unknown element <%s>"
msgstr ""
-#: ../src/roxterm.c:5440
+#: ../src/roxterm.c:5441
msgid "Unmatched </roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5445
+#: ../src/roxterm.c:5446
msgid "Attempt to close <roxterm_session> without closing <window>"
msgstr ""
-#: ../src/roxterm.c:5458
+#: ../src/roxterm.c:5459
msgid "Unmatched </window>"
msgstr ""
-#: ../src/roxterm.c:5463
+#: ../src/roxterm.c:5464
msgid "Attempt to close <window> without closing <tab>"
msgstr ""
-#: ../src/roxterm.c:5475
+#: ../src/roxterm.c:5476
msgid "Unmatched </tab>"
msgstr ""
-#: ../src/roxterm.c:5489
+#: ../src/roxterm.c:5490
msgid "Unmatched </command>"
msgstr ""
-#: ../src/roxterm.c:5495
+#: ../src/roxterm.c:5496
#, c-format
msgid "Unknown closing element </%s>"
msgstr ""
-#: ../src/roxterm.c:5505
+#: ../src/roxterm.c:5506
#, c-format
msgid "Unable to parse data for session '%s': %s"
msgstr ""
@@ -1495,12 +1495,12 @@
msgid "Shortcut '%s' in '%s' has invalid value"
msgstr ""
-#: ../src/shortcuts.c:478
+#: ../src/shortcuts.c:481
msgid ""
"Unable to find a text editor. Please install gedit, gvim, kate or emacs."
msgstr ""
-#: ../src/shortcuts.c:502
+#: ../src/shortcuts.c:505
#, c-format
msgid "Error trying to edit or monitor Shortcuts file '%s': %s"
msgstr ""
diff -Nru roxterm-2.9.4/po/fr.po roxterm-2.9.5/po/fr.po
--- roxterm-2.9.4/po/fr.po 2014-09-17 15:48:46.000000000 +0100
+++ roxterm-2.9.5/po/fr.po 2014-11-28 18:21:58.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: roxterm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 19:48+0100\n"
+"POT-Creation-Date: 2014-09-29 16:59+0100\n"
"PO-Revision-Date: 2013-05-23 15:18+0000\n"
"Last-Translator: Tony Houghton <h@realh.co.uk>\n"
"Language-Team: French (http://www.transifex.com/projects/p/roxterm/language/";
@@ -1127,154 +1127,154 @@
msgid "Invalid geometry specification"
msgstr ""
-#: ../src/roxterm.c:4705
+#: ../src/roxterm.c:4706
msgid ""
"Closing this ROXTerm tab may cause loss of data. Are you sure you want to "
"continue?"
msgstr ""
-#: ../src/roxterm.c:4709
+#: ../src/roxterm.c:4710
msgid ""
"You are about to close a ROXTerm window; this may cause loss of data. Are "
"you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4713
+#: ../src/roxterm.c:4714
msgid ""
"You are about to close a window containing multiple ROXTerm tabs; this may "
"cause loss of data. Are you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4722
+#: ../src/roxterm.c:4723
msgid "ROXTerm: Confirm close"
msgstr ""
-#: ../src/roxterm.c:4726
+#: ../src/roxterm.c:4727
msgid "_Don't show this again"
msgstr ""
-#: ../src/roxterm.c:4734
+#: ../src/roxterm.c:4735
msgid "Only warn if tasks are still _running"
msgstr ""
-#: ../src/roxterm.c:4849
+#: ../src/roxterm.c:4850
#, c-format
msgid "Unable to spawn command %s: %s"
msgstr ""
-#: ../src/roxterm.c:5017
+#: ../src/roxterm.c:5018
#, c-format
msgid "Unknown <window> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5068
+#: ../src/roxterm.c:5069
msgid "Session contains window with no valid tabs"
msgstr ""
-#: ../src/roxterm.c:5172
+#: ../src/roxterm.c:5173
#, c-format
msgid "Unknown <tab> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5205
+#: ../src/roxterm.c:5206
msgid "<command> with no arguments"
msgstr ""
-#: ../src/roxterm.c:5255
+#: ../src/roxterm.c:5256
#, c-format
msgid "Unknown <command> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5267
+#: ../src/roxterm.c:5268
msgid "<command> missing argc attribute"
msgstr ""
-#: ../src/roxterm.c:5281
+#: ../src/roxterm.c:5282
#, c-format
msgid "Too many <arg> elements for <command argc='%d>"
msgstr ""
-#: ../src/roxterm.c:5298
+#: ../src/roxterm.c:5299
#, c-format
msgid "Unknown <arg> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5310
+#: ../src/roxterm.c:5311
msgid "<arg> missing s attribute"
msgstr ""
-#: ../src/roxterm.c:5330
+#: ../src/roxterm.c:5331
#, c-format
msgid "Unknown <roxterm_session> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5349
+#: ../src/roxterm.c:5350
msgid "<roxterm_session> tag nested within <window>"
msgstr ""
-#: ../src/roxterm.c:5363
+#: ../src/roxterm.c:5364
msgid "<window> tag not within <roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5368
+#: ../src/roxterm.c:5369
msgid "<window> tag nested within another <window>"
msgstr ""
-#: ../src/roxterm.c:5380
+#: ../src/roxterm.c:5381
msgid "<tab> tag not within <window>"
msgstr ""
-#: ../src/roxterm.c:5385
+#: ../src/roxterm.c:5386
msgid "<tab> tag nested within another <tab>"
msgstr ""
-#: ../src/roxterm.c:5397
+#: ../src/roxterm.c:5398
msgid "<command> tag not within <tab>"
msgstr ""
-#: ../src/roxterm.c:5402
+#: ../src/roxterm.c:5403
msgid "<command> tag nested within another <command>"
msgstr ""
-#: ../src/roxterm.c:5414
+#: ../src/roxterm.c:5415
msgid "<arg> tag not within <command>"
msgstr ""
-#: ../src/roxterm.c:5424
+#: ../src/roxterm.c:5425
#, c-format
msgid "Unknown element <%s>"
msgstr ""
-#: ../src/roxterm.c:5440
+#: ../src/roxterm.c:5441
msgid "Unmatched </roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5445
+#: ../src/roxterm.c:5446
msgid "Attempt to close <roxterm_session> without closing <window>"
msgstr ""
-#: ../src/roxterm.c:5458
+#: ../src/roxterm.c:5459
msgid "Unmatched </window>"
msgstr ""
-#: ../src/roxterm.c:5463
+#: ../src/roxterm.c:5464
msgid "Attempt to close <window> without closing <tab>"
msgstr ""
-#: ../src/roxterm.c:5475
+#: ../src/roxterm.c:5476
msgid "Unmatched </tab>"
msgstr ""
-#: ../src/roxterm.c:5489
+#: ../src/roxterm.c:5490
msgid "Unmatched </command>"
msgstr ""
-#: ../src/roxterm.c:5495
+#: ../src/roxterm.c:5496
#, c-format
msgid "Unknown closing element </%s>"
msgstr ""
-#: ../src/roxterm.c:5505
+#: ../src/roxterm.c:5506
#, c-format
msgid "Unable to parse data for session '%s': %s"
msgstr ""
@@ -1490,12 +1490,12 @@
msgid "Shortcut '%s' in '%s' has invalid value"
msgstr ""
-#: ../src/shortcuts.c:478
+#: ../src/shortcuts.c:481
msgid ""
"Unable to find a text editor. Please install gedit, gvim, kate or emacs."
msgstr ""
-#: ../src/shortcuts.c:502
+#: ../src/shortcuts.c:505
#, c-format
msgid "Error trying to edit or monitor Shortcuts file '%s': %s"
msgstr ""
diff -Nru roxterm-2.9.4/po/pt_BR.po roxterm-2.9.5/po/pt_BR.po
--- roxterm-2.9.4/po/pt_BR.po 2014-09-17 15:48:46.000000000 +0100
+++ roxterm-2.9.5/po/pt_BR.po 2014-11-28 18:21:58.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: roxterm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 19:48+0100\n"
+"POT-Creation-Date: 2014-09-29 16:59+0100\n"
"PO-Revision-Date: 2013-05-26 04:27+0000\n"
"Last-Translator: salmora8 <shorterfire@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/";
@@ -1170,7 +1170,7 @@
msgid "Invalid geometry specification"
msgstr "Especificação geométrica inválida"
-#: ../src/roxterm.c:4705
+#: ../src/roxterm.c:4706
msgid ""
"Closing this ROXTerm tab may cause loss of data. Are you sure you want to "
"continue?"
@@ -1178,7 +1178,7 @@
"Fechando essa aba ROXTerm, pode causar a perda de dados. Tem que certeza que "
"deseja continuar?"
-#: ../src/roxterm.c:4709
+#: ../src/roxterm.c:4710
msgid ""
"You are about to close a ROXTerm window; this may cause loss of data. Are "
"you sure you want to continue?"
@@ -1186,7 +1186,7 @@
"Você está prestes a fechar uma janela ROXTerm, o que pode causar perda de "
"dados. Tem certeza de que deseja continuar?"
-#: ../src/roxterm.c:4713
+#: ../src/roxterm.c:4714
msgid ""
"You are about to close a window containing multiple ROXTerm tabs; this may "
"cause loss of data. Are you sure you want to continue?"
@@ -1194,136 +1194,136 @@
"Você esta prestes a fechar uma janela contendo múltiplas abas ROXTerm, o que "
"pode causar perda de dados. Tem certeza que deseja continuar?"
-#: ../src/roxterm.c:4722
+#: ../src/roxterm.c:4723
msgid "ROXTerm: Confirm close"
msgstr "ROXTerm: Confirme ao fechar"
-#: ../src/roxterm.c:4726
+#: ../src/roxterm.c:4727
msgid "_Don't show this again"
msgstr "_Não exibir isto novamente"
-#: ../src/roxterm.c:4734
+#: ../src/roxterm.c:4735
msgid "Only warn if tasks are still _running"
msgstr "Somente avisar se tarefas estiverem em _execução"
-#: ../src/roxterm.c:4849
+#: ../src/roxterm.c:4850
#, c-format
msgid "Unable to spawn command %s: %s"
msgstr "Não foi possível criar comando %s: %s"
-#: ../src/roxterm.c:5017
+#: ../src/roxterm.c:5018
#, c-format
msgid "Unknown <window> attribute '%s'"
msgstr "Desconhecido <janela> atributo '%s'"
-#: ../src/roxterm.c:5068
+#: ../src/roxterm.c:5069
msgid "Session contains window with no valid tabs"
msgstr "Sessão contém janelas com nenhuma abas válidas"
-#: ../src/roxterm.c:5172
+#: ../src/roxterm.c:5173
#, c-format
msgid "Unknown <tab> attribute '%s'"
msgstr "Desconhecido <aba> atributo '%s'"
-#: ../src/roxterm.c:5205
+#: ../src/roxterm.c:5206
msgid "<command> with no arguments"
msgstr "<comando> com nenhum argumento"
-#: ../src/roxterm.c:5255
+#: ../src/roxterm.c:5256
#, c-format
msgid "Unknown <command> attribute '%s'"
msgstr "Desconhecido <comando> atributo '%s'"
-#: ../src/roxterm.c:5267
+#: ../src/roxterm.c:5268
msgid "<command> missing argc attribute"
msgstr "<comando> faltando atributo argc"
-#: ../src/roxterm.c:5281
+#: ../src/roxterm.c:5282
#, c-format
msgid "Too many <arg> elements for <command argc='%d>"
msgstr "Muitos <argumentos> elementos para <comando argc=%d>"
-#: ../src/roxterm.c:5298
+#: ../src/roxterm.c:5299
#, c-format
msgid "Unknown <arg> attribute '%s'"
msgstr "Desconhecido <argumento> atributo '%s'"
-#: ../src/roxterm.c:5310
+#: ../src/roxterm.c:5311
msgid "<arg> missing s attribute"
msgstr "<argumento> faltando atributo"
-#: ../src/roxterm.c:5330
+#: ../src/roxterm.c:5331
#, c-format
msgid "Unknown <roxterm_session> attribute '%s'"
msgstr "Desconhecido <roxterm _sessão> atributo '%s'"
-#: ../src/roxterm.c:5349
+#: ../src/roxterm.c:5350
msgid "<roxterm_session> tag nested within <window>"
msgstr "<roxterm _sessão> tag aninhada dentro <janela>"
-#: ../src/roxterm.c:5363
+#: ../src/roxterm.c:5364
msgid "<window> tag not within <roxterm_session>"
msgstr "<janela> tag não dentro <roxterm _sessão>"
-#: ../src/roxterm.c:5368
+#: ../src/roxterm.c:5369
msgid "<window> tag nested within another <window>"
msgstr "<janela> tag aninhada dentro de outro <janela> "
-#: ../src/roxterm.c:5380
+#: ../src/roxterm.c:5381
msgid "<tab> tag not within <window>"
msgstr "<aba> tag não dentro <janela>"
-#: ../src/roxterm.c:5385
+#: ../src/roxterm.c:5386
msgid "<tab> tag nested within another <tab>"
msgstr "<aba> tag aninhada dentro de outro <aba>"
-#: ../src/roxterm.c:5397
+#: ../src/roxterm.c:5398
msgid "<command> tag not within <tab>"
msgstr "<comando> tag não dentro <aba>"
-#: ../src/roxterm.c:5402
+#: ../src/roxterm.c:5403
msgid "<command> tag nested within another <command>"
msgstr "<comando> tag aninhada dentro de outro <comando>"
-#: ../src/roxterm.c:5414
+#: ../src/roxterm.c:5415
msgid "<arg> tag not within <command>"
msgstr "<argumento> tag não dentro <comando>"
-#: ../src/roxterm.c:5424
+#: ../src/roxterm.c:5425
#, c-format
msgid "Unknown element <%s>"
msgstr "Elemento desconhecido <%s>"
-#: ../src/roxterm.c:5440
+#: ../src/roxterm.c:5441
msgid "Unmatched </roxterm_session>"
msgstr "Incomparável </roxterm_sessão>"
-#: ../src/roxterm.c:5445
+#: ../src/roxterm.c:5446
msgid "Attempt to close <roxterm_session> without closing <window>"
msgstr "A tentar fechar <roxterm _sessão> sem fechar <janela>"
-#: ../src/roxterm.c:5458
+#: ../src/roxterm.c:5459
msgid "Unmatched </window>"
msgstr "Incomparável </janela>"
-#: ../src/roxterm.c:5463
+#: ../src/roxterm.c:5464
msgid "Attempt to close <window> without closing <tab>"
msgstr "A tentar fechar <janela> sem fechar <aba>"
-#: ../src/roxterm.c:5475
+#: ../src/roxterm.c:5476
msgid "Unmatched </tab>"
msgstr "Incomparável </aba>"
-#: ../src/roxterm.c:5489
+#: ../src/roxterm.c:5490
msgid "Unmatched </command>"
msgstr "Incomparável </comando>"
-#: ../src/roxterm.c:5495
+#: ../src/roxterm.c:5496
#, c-format
msgid "Unknown closing element </%s>"
msgstr "Fechando elemento desconhecido </%s>"
-#: ../src/roxterm.c:5505
+#: ../src/roxterm.c:5506
#, c-format
msgid "Unable to parse data for session '%s': %s"
msgstr "Não foi possível analisar dados para sessão '%s: %s"
@@ -1553,12 +1553,12 @@
msgid "Shortcut '%s' in '%s' has invalid value"
msgstr "Atalho '%s' em '%s' tem um valor inválido"
-#: ../src/shortcuts.c:478
+#: ../src/shortcuts.c:481
msgid ""
"Unable to find a text editor. Please install gedit, gvim, kate or emacs."
msgstr ""
-#: ../src/shortcuts.c:502
+#: ../src/shortcuts.c:505
#, fuzzy, c-format
msgid "Error trying to edit or monitor Shortcuts file '%s': %s"
msgstr "Não foi possível ler as teclas de atalhos de arquivo %s: %s"
diff -Nru roxterm-2.9.4/po/roxterm.pot roxterm-2.9.5/po/roxterm.pot
--- roxterm-2.9.4/po/roxterm.pot 2014-09-17 15:48:46.000000000 +0100
+++ roxterm-2.9.5/po/roxterm.pot 2014-11-28 18:21:58.000000000 +0000
@@ -6,9 +6,21 @@
#, fuzzy
msgid ""
msgstr ""
+"#-#-#-#-# code.pot (roxterm) #-#-#-#-#\n"
"Project-Id-Version: roxterm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 15:33+0100\n"
+"POT-Creation-Date: 2014-09-29 16:59+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-# glade.pot (roxterm) #-#-#-#-#\n"
+"Project-Id-Version: roxterm\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-17 15:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1122,154 +1134,154 @@
msgid "Invalid geometry specification"
msgstr ""
-#: ../src/roxterm.c:4705
+#: ../src/roxterm.c:4706
msgid ""
"Closing this ROXTerm tab may cause loss of data. Are you sure you want to "
"continue?"
msgstr ""
-#: ../src/roxterm.c:4709
+#: ../src/roxterm.c:4710
msgid ""
"You are about to close a ROXTerm window; this may cause loss of data. Are "
"you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4713
+#: ../src/roxterm.c:4714
msgid ""
"You are about to close a window containing multiple ROXTerm tabs; this may "
"cause loss of data. Are you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4722
+#: ../src/roxterm.c:4723
msgid "ROXTerm: Confirm close"
msgstr ""
-#: ../src/roxterm.c:4726
+#: ../src/roxterm.c:4727
msgid "_Don't show this again"
msgstr ""
-#: ../src/roxterm.c:4734
+#: ../src/roxterm.c:4735
msgid "Only warn if tasks are still _running"
msgstr ""
-#: ../src/roxterm.c:4849
+#: ../src/roxterm.c:4850
#, c-format
msgid "Unable to spawn command %s: %s"
msgstr ""
-#: ../src/roxterm.c:5017
+#: ../src/roxterm.c:5018
#, c-format
msgid "Unknown <window> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5068
+#: ../src/roxterm.c:5069
msgid "Session contains window with no valid tabs"
msgstr ""
-#: ../src/roxterm.c:5172
+#: ../src/roxterm.c:5173
#, c-format
msgid "Unknown <tab> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5205
+#: ../src/roxterm.c:5206
msgid "<command> with no arguments"
msgstr ""
-#: ../src/roxterm.c:5255
+#: ../src/roxterm.c:5256
#, c-format
msgid "Unknown <command> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5267
+#: ../src/roxterm.c:5268
msgid "<command> missing argc attribute"
msgstr ""
-#: ../src/roxterm.c:5281
+#: ../src/roxterm.c:5282
#, c-format
msgid "Too many <arg> elements for <command argc='%d>"
msgstr ""
-#: ../src/roxterm.c:5298
+#: ../src/roxterm.c:5299
#, c-format
msgid "Unknown <arg> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5310
+#: ../src/roxterm.c:5311
msgid "<arg> missing s attribute"
msgstr ""
-#: ../src/roxterm.c:5330
+#: ../src/roxterm.c:5331
#, c-format
msgid "Unknown <roxterm_session> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5349
+#: ../src/roxterm.c:5350
msgid "<roxterm_session> tag nested within <window>"
msgstr ""
-#: ../src/roxterm.c:5363
+#: ../src/roxterm.c:5364
msgid "<window> tag not within <roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5368
+#: ../src/roxterm.c:5369
msgid "<window> tag nested within another <window>"
msgstr ""
-#: ../src/roxterm.c:5380
+#: ../src/roxterm.c:5381
msgid "<tab> tag not within <window>"
msgstr ""
-#: ../src/roxterm.c:5385
+#: ../src/roxterm.c:5386
msgid "<tab> tag nested within another <tab>"
msgstr ""
-#: ../src/roxterm.c:5397
+#: ../src/roxterm.c:5398
msgid "<command> tag not within <tab>"
msgstr ""
-#: ../src/roxterm.c:5402
+#: ../src/roxterm.c:5403
msgid "<command> tag nested within another <command>"
msgstr ""
-#: ../src/roxterm.c:5414
+#: ../src/roxterm.c:5415
msgid "<arg> tag not within <command>"
msgstr ""
-#: ../src/roxterm.c:5424
+#: ../src/roxterm.c:5425
#, c-format
msgid "Unknown element <%s>"
msgstr ""
-#: ../src/roxterm.c:5440
+#: ../src/roxterm.c:5441
msgid "Unmatched </roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5445
+#: ../src/roxterm.c:5446
msgid "Attempt to close <roxterm_session> without closing <window>"
msgstr ""
-#: ../src/roxterm.c:5458
+#: ../src/roxterm.c:5459
msgid "Unmatched </window>"
msgstr ""
-#: ../src/roxterm.c:5463
+#: ../src/roxterm.c:5464
msgid "Attempt to close <window> without closing <tab>"
msgstr ""
-#: ../src/roxterm.c:5475
+#: ../src/roxterm.c:5476
msgid "Unmatched </tab>"
msgstr ""
-#: ../src/roxterm.c:5489
+#: ../src/roxterm.c:5490
msgid "Unmatched </command>"
msgstr ""
-#: ../src/roxterm.c:5495
+#: ../src/roxterm.c:5496
#, c-format
msgid "Unknown closing element </%s>"
msgstr ""
-#: ../src/roxterm.c:5505
+#: ../src/roxterm.c:5506
#, c-format
msgid "Unable to parse data for session '%s': %s"
msgstr ""
@@ -1484,12 +1496,12 @@
msgid "Shortcut '%s' in '%s' has invalid value"
msgstr ""
-#: ../src/shortcuts.c:478
+#: ../src/shortcuts.c:481
msgid ""
"Unable to find a text editor. Please install gedit, gvim, kate or emacs."
msgstr ""
-#: ../src/shortcuts.c:502
+#: ../src/shortcuts.c:505
#, c-format
msgid "Error trying to edit or monitor Shortcuts file '%s': %s"
msgstr ""
diff -Nru roxterm-2.9.4/po/ru.po roxterm-2.9.5/po/ru.po
--- roxterm-2.9.4/po/ru.po 2014-09-17 15:48:46.000000000 +0100
+++ roxterm-2.9.5/po/ru.po 2014-11-28 18:21:58.000000000 +0000
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: roxterm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 19:48+0100\n"
+"POT-Creation-Date: 2014-09-29 16:59+0100\n"
"PO-Revision-Date: 2013-05-23 15:18+0000\n"
"Last-Translator: Tony Houghton <h@realh.co.uk>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/roxterm/language/";
@@ -1127,154 +1127,154 @@
msgid "Invalid geometry specification"
msgstr ""
-#: ../src/roxterm.c:4705
+#: ../src/roxterm.c:4706
msgid ""
"Closing this ROXTerm tab may cause loss of data. Are you sure you want to "
"continue?"
msgstr ""
-#: ../src/roxterm.c:4709
+#: ../src/roxterm.c:4710
msgid ""
"You are about to close a ROXTerm window; this may cause loss of data. Are "
"you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4713
+#: ../src/roxterm.c:4714
msgid ""
"You are about to close a window containing multiple ROXTerm tabs; this may "
"cause loss of data. Are you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4722
+#: ../src/roxterm.c:4723
msgid "ROXTerm: Confirm close"
msgstr ""
-#: ../src/roxterm.c:4726
+#: ../src/roxterm.c:4727
msgid "_Don't show this again"
msgstr ""
-#: ../src/roxterm.c:4734
+#: ../src/roxterm.c:4735
msgid "Only warn if tasks are still _running"
msgstr ""
-#: ../src/roxterm.c:4849
+#: ../src/roxterm.c:4850
#, c-format
msgid "Unable to spawn command %s: %s"
msgstr ""
-#: ../src/roxterm.c:5017
+#: ../src/roxterm.c:5018
#, c-format
msgid "Unknown <window> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5068
+#: ../src/roxterm.c:5069
msgid "Session contains window with no valid tabs"
msgstr ""
-#: ../src/roxterm.c:5172
+#: ../src/roxterm.c:5173
#, c-format
msgid "Unknown <tab> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5205
+#: ../src/roxterm.c:5206
msgid "<command> with no arguments"
msgstr ""
-#: ../src/roxterm.c:5255
+#: ../src/roxterm.c:5256
#, c-format
msgid "Unknown <command> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5267
+#: ../src/roxterm.c:5268
msgid "<command> missing argc attribute"
msgstr ""
-#: ../src/roxterm.c:5281
+#: ../src/roxterm.c:5282
#, c-format
msgid "Too many <arg> elements for <command argc='%d>"
msgstr ""
-#: ../src/roxterm.c:5298
+#: ../src/roxterm.c:5299
#, c-format
msgid "Unknown <arg> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5310
+#: ../src/roxterm.c:5311
msgid "<arg> missing s attribute"
msgstr ""
-#: ../src/roxterm.c:5330
+#: ../src/roxterm.c:5331
#, c-format
msgid "Unknown <roxterm_session> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5349
+#: ../src/roxterm.c:5350
msgid "<roxterm_session> tag nested within <window>"
msgstr ""
-#: ../src/roxterm.c:5363
+#: ../src/roxterm.c:5364
msgid "<window> tag not within <roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5368
+#: ../src/roxterm.c:5369
msgid "<window> tag nested within another <window>"
msgstr ""
-#: ../src/roxterm.c:5380
+#: ../src/roxterm.c:5381
msgid "<tab> tag not within <window>"
msgstr ""
-#: ../src/roxterm.c:5385
+#: ../src/roxterm.c:5386
msgid "<tab> tag nested within another <tab>"
msgstr ""
-#: ../src/roxterm.c:5397
+#: ../src/roxterm.c:5398
msgid "<command> tag not within <tab>"
msgstr ""
-#: ../src/roxterm.c:5402
+#: ../src/roxterm.c:5403
msgid "<command> tag nested within another <command>"
msgstr ""
-#: ../src/roxterm.c:5414
+#: ../src/roxterm.c:5415
msgid "<arg> tag not within <command>"
msgstr ""
-#: ../src/roxterm.c:5424
+#: ../src/roxterm.c:5425
#, c-format
msgid "Unknown element <%s>"
msgstr ""
-#: ../src/roxterm.c:5440
+#: ../src/roxterm.c:5441
msgid "Unmatched </roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5445
+#: ../src/roxterm.c:5446
msgid "Attempt to close <roxterm_session> without closing <window>"
msgstr ""
-#: ../src/roxterm.c:5458
+#: ../src/roxterm.c:5459
msgid "Unmatched </window>"
msgstr ""
-#: ../src/roxterm.c:5463
+#: ../src/roxterm.c:5464
msgid "Attempt to close <window> without closing <tab>"
msgstr ""
-#: ../src/roxterm.c:5475
+#: ../src/roxterm.c:5476
msgid "Unmatched </tab>"
msgstr ""
-#: ../src/roxterm.c:5489
+#: ../src/roxterm.c:5490
msgid "Unmatched </command>"
msgstr ""
-#: ../src/roxterm.c:5495
+#: ../src/roxterm.c:5496
#, c-format
msgid "Unknown closing element </%s>"
msgstr ""
-#: ../src/roxterm.c:5505
+#: ../src/roxterm.c:5506
#, c-format
msgid "Unable to parse data for session '%s': %s"
msgstr ""
@@ -1490,12 +1490,12 @@
msgid "Shortcut '%s' in '%s' has invalid value"
msgstr ""
-#: ../src/shortcuts.c:478
+#: ../src/shortcuts.c:481
msgid ""
"Unable to find a text editor. Please install gedit, gvim, kate or emacs."
msgstr ""
-#: ../src/shortcuts.c:502
+#: ../src/shortcuts.c:505
#, c-format
msgid "Error trying to edit or monitor Shortcuts file '%s': %s"
msgstr ""
diff -Nru roxterm-2.9.4/po/uk.po roxterm-2.9.5/po/uk.po
--- roxterm-2.9.4/po/uk.po 2014-09-17 15:48:46.000000000 +0100
+++ roxterm-2.9.5/po/uk.po 2014-11-28 18:21:58.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: roxterm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 19:48+0100\n"
+"POT-Creation-Date: 2014-09-29 16:59+0100\n"
"PO-Revision-Date: 2013-05-23 15:18+0000\n"
"Last-Translator: Tony Houghton <h@realh.co.uk>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/roxterm/";
@@ -1125,154 +1125,154 @@
msgid "Invalid geometry specification"
msgstr ""
-#: ../src/roxterm.c:4705
+#: ../src/roxterm.c:4706
msgid ""
"Closing this ROXTerm tab may cause loss of data. Are you sure you want to "
"continue?"
msgstr ""
-#: ../src/roxterm.c:4709
+#: ../src/roxterm.c:4710
msgid ""
"You are about to close a ROXTerm window; this may cause loss of data. Are "
"you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4713
+#: ../src/roxterm.c:4714
msgid ""
"You are about to close a window containing multiple ROXTerm tabs; this may "
"cause loss of data. Are you sure you want to continue?"
msgstr ""
-#: ../src/roxterm.c:4722
+#: ../src/roxterm.c:4723
msgid "ROXTerm: Confirm close"
msgstr ""
-#: ../src/roxterm.c:4726
+#: ../src/roxterm.c:4727
msgid "_Don't show this again"
msgstr ""
-#: ../src/roxterm.c:4734
+#: ../src/roxterm.c:4735
msgid "Only warn if tasks are still _running"
msgstr ""
-#: ../src/roxterm.c:4849
+#: ../src/roxterm.c:4850
#, c-format
msgid "Unable to spawn command %s: %s"
msgstr ""
-#: ../src/roxterm.c:5017
+#: ../src/roxterm.c:5018
#, c-format
msgid "Unknown <window> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5068
+#: ../src/roxterm.c:5069
msgid "Session contains window with no valid tabs"
msgstr ""
-#: ../src/roxterm.c:5172
+#: ../src/roxterm.c:5173
#, c-format
msgid "Unknown <tab> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5205
+#: ../src/roxterm.c:5206
msgid "<command> with no arguments"
msgstr ""
-#: ../src/roxterm.c:5255
+#: ../src/roxterm.c:5256
#, c-format
msgid "Unknown <command> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5267
+#: ../src/roxterm.c:5268
msgid "<command> missing argc attribute"
msgstr ""
-#: ../src/roxterm.c:5281
+#: ../src/roxterm.c:5282
#, c-format
msgid "Too many <arg> elements for <command argc='%d>"
msgstr ""
-#: ../src/roxterm.c:5298
+#: ../src/roxterm.c:5299
#, c-format
msgid "Unknown <arg> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5310
+#: ../src/roxterm.c:5311
msgid "<arg> missing s attribute"
msgstr ""
-#: ../src/roxterm.c:5330
+#: ../src/roxterm.c:5331
#, c-format
msgid "Unknown <roxterm_session> attribute '%s'"
msgstr ""
-#: ../src/roxterm.c:5349
+#: ../src/roxterm.c:5350
msgid "<roxterm_session> tag nested within <window>"
msgstr ""
-#: ../src/roxterm.c:5363
+#: ../src/roxterm.c:5364
msgid "<window> tag not within <roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5368
+#: ../src/roxterm.c:5369
msgid "<window> tag nested within another <window>"
msgstr ""
-#: ../src/roxterm.c:5380
+#: ../src/roxterm.c:5381
msgid "<tab> tag not within <window>"
msgstr ""
-#: ../src/roxterm.c:5385
+#: ../src/roxterm.c:5386
msgid "<tab> tag nested within another <tab>"
msgstr ""
-#: ../src/roxterm.c:5397
+#: ../src/roxterm.c:5398
msgid "<command> tag not within <tab>"
msgstr ""
-#: ../src/roxterm.c:5402
+#: ../src/roxterm.c:5403
msgid "<command> tag nested within another <command>"
msgstr ""
-#: ../src/roxterm.c:5414
+#: ../src/roxterm.c:5415
msgid "<arg> tag not within <command>"
msgstr ""
-#: ../src/roxterm.c:5424
+#: ../src/roxterm.c:5425
#, c-format
msgid "Unknown element <%s>"
msgstr ""
-#: ../src/roxterm.c:5440
+#: ../src/roxterm.c:5441
msgid "Unmatched </roxterm_session>"
msgstr ""
-#: ../src/roxterm.c:5445
+#: ../src/roxterm.c:5446
msgid "Attempt to close <roxterm_session> without closing <window>"
msgstr ""
-#: ../src/roxterm.c:5458
+#: ../src/roxterm.c:5459
msgid "Unmatched </window>"
msgstr ""
-#: ../src/roxterm.c:5463
+#: ../src/roxterm.c:5464
msgid "Attempt to close <window> without closing <tab>"
msgstr ""
-#: ../src/roxterm.c:5475
+#: ../src/roxterm.c:5476
msgid "Unmatched </tab>"
msgstr ""
-#: ../src/roxterm.c:5489
+#: ../src/roxterm.c:5490
msgid "Unmatched </command>"
msgstr ""
-#: ../src/roxterm.c:5495
+#: ../src/roxterm.c:5496
#, c-format
msgid "Unknown closing element </%s>"
msgstr ""
-#: ../src/roxterm.c:5505
+#: ../src/roxterm.c:5506
#, c-format
msgid "Unable to parse data for session '%s': %s"
msgstr ""
@@ -1487,12 +1487,12 @@
msgid "Shortcut '%s' in '%s' has invalid value"
msgstr ""
-#: ../src/shortcuts.c:478
+#: ../src/shortcuts.c:481
msgid ""
"Unable to find a text editor. Please install gedit, gvim, kate or emacs."
msgstr ""
-#: ../src/shortcuts.c:502
+#: ../src/shortcuts.c:505
#, c-format
msgid "Error trying to edit or monitor Shortcuts file '%s': %s"
msgstr ""
diff -Nru roxterm-2.9.4/src/globalopts.c roxterm-2.9.5/src/globalopts.c
--- roxterm-2.9.4/src/globalopts.c 2014-09-17 15:18:24.000000000 +0100
+++ roxterm-2.9.5/src/globalopts.c 2014-09-29 16:49:15.000000000 +0100
@@ -42,7 +42,7 @@
gboolean global_options_maximise = FALSE;
gboolean global_options_tab = FALSE;
gboolean global_options_fork = FALSE;
-int global_options_workspace = -1;
+guint32 global_options_workspace = WORKSPACE_UNDEFINED;
static void correct_scheme(const char *bad_name, const char *good_name)
{
@@ -69,7 +69,7 @@
global_options_replace = FALSE;
global_options_fullscreen = FALSE;
global_options_tab = FALSE;
- global_options_workspace = -1;
+ global_options_workspace = WORKSPACE_UNDEFINED;
global_options_disable_sm = FALSE;
options_reload_keyfile(global_options);
correct_schemes();
@@ -198,9 +198,9 @@
(void) option_name;
global_options_tab = TRUE;
if (value)
- global_options_workspace = atoi(value);
+ global_options_workspace = (guint32) strtoul(value, NULL, 0);
else
- global_options_workspace = -1;
+ global_options_workspace = WORKSPACE_UNDEFINED;
return TRUE;
}
diff -Nru roxterm-2.9.4/src/globalopts.h roxterm-2.9.5/src/globalopts.h
--- roxterm-2.9.4/src/globalopts.h 2014-09-17 15:18:24.000000000 +0100
+++ roxterm-2.9.5/src/globalopts.h 2014-09-29 16:58:46.000000000 +0100
@@ -50,7 +50,10 @@
/* Whether to try to open new terminal in an existing window */
extern gboolean global_options_tab;
-extern int global_options_workspace;
+
+extern guint32 global_options_workspace;
+#define WORKSPACE_ALL 0xffffffff
+#define WORKSPACE_UNDEFINED 0xfffffffe
/* Fork first instance */
extern gboolean global_options_fork;
diff -Nru roxterm-2.9.4/src/main.c roxterm-2.9.5/src/main.c
--- roxterm-2.9.4/src/main.c 2014-09-17 15:18:24.000000000 +0100
+++ roxterm-2.9.5/src/main.c 2014-09-29 16:52:17.000000000 +0100
@@ -66,21 +66,21 @@
if (!strcmp(argv[n], "--tab"))
{
- if (global_options_workspace == -1)
+ if (global_options_workspace == WORKSPACE_UNDEFINED)
{
guint32 ws;
if (x11support_get_current_desktop(
gdk_get_default_root_window(), &ws))
{
- global_options_workspace = (int) ws;
+ global_options_workspace = ws;
}
else
{
g_warning(_("Unable to read current workspace"));
}
}
- sprintf(tmp, "--tab=%d", global_options_workspace);
+ sprintf(tmp, "--tab=%u", global_options_workspace);
arg = tmp;
}
else
diff -Nru roxterm-2.9.4/src/roxterm.c roxterm-2.9.5/src/roxterm.c
--- roxterm-2.9.4/src/roxterm.c 2014-09-17 15:18:24.000000000 +0100
+++ roxterm-2.9.5/src/roxterm.c 2014-09-29 16:55:40.000000000 +0100
@@ -4466,7 +4466,8 @@
if (x11support_get_wm_desktop(gtk_widget_get_window(w),
&workspace))
{
- if ((int) workspace == global_options_workspace)
+ if (workspace == global_options_workspace ||
+ workspace == WORKSPACE_ALL)
{
next_best = win;
}
diff -Nru roxterm-2.9.4/src/shortcuts.c roxterm-2.9.5/src/shortcuts.c
--- roxterm-2.9.4/src/shortcuts.c 2014-09-17 15:18:24.000000000 +0100
+++ roxterm-2.9.5/src/shortcuts.c 2014-09-29 15:57:48.000000000 +0100
@@ -403,12 +403,15 @@
if (editor)
return editor;
env = getenv("EDITOR");
- for (n = 0; subs[n] && !editor; ++n)
+ if (env)
{
- if (strstr(env, subs[n]))
+ for (n = 0; subs[n] && !editor; ++n)
{
- editor = g_find_program_in_path(
- strcmp(subs[n], "vi") ? subs[n] : "gvim");
+ if (strstr(env, subs[n]))
+ {
+ editor = g_find_program_in_path(
+ strcmp(subs[n], "vi") ? subs[n] : "gvim");
+ }
}
}
if (!editor)
diff -Nru roxterm-2.9.4/version roxterm-2.9.5/version
--- roxterm-2.9.4/version 2014-09-17 15:33:30.000000000 +0100
+++ roxterm-2.9.5/version 2014-11-28 18:21:47.000000000 +0000
@@ -1 +1 @@
-2.9.4
+2.9.5
Reply to: