diff -ru sakura-3.1.5.orig/CMakeLists.txt sakura-3.1.5/CMakeLists.txt --- sakura-3.1.5.orig/CMakeLists.txt 2014-09-16 14:05:50.634577830 +0200 +++ sakura-3.1.5/CMakeLists.txt 2014-09-16 14:06:01.411578118 +0200 @@ -23,9 +23,9 @@ MESSAGE(FATAL_ERROR "You don't seem to have gtk >= 3.0 development libraries installed...") ENDIF (NOT GTK_FOUND) -pkg_check_modules (VTE REQUIRED vte-2.90) +pkg_check_modules (VTE REQUIRED vte-2.91) IF (NOT VTE_FOUND) - MESSAGE(FATAL_ERROR "You don't seem to have vte >= 2.90 development libraries installed...") + MESSAGE(FATAL_ERROR "You don't seem to have vte >= 2.91 development libraries installed...") ENDIF (NOT VTE_FOUND) FIND_PROGRAM(POD2MAN pod2man) diff -ru sakura-3.1.5.orig/po/ca.po sakura-3.1.5/po/ca.po --- sakura-3.1.5.orig/po/ca.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/ca.po 2014-09-23 11:16:05.768476500 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:16+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Jordi Jané Cardo \n" @@ -116,12 +116,6 @@ msgid "New window title" msgstr "Definiu el nom de la finestra" -msgid "Select a background file" -msgstr "Sel·leccioneu l'imatge de fons" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -205,9 +199,6 @@ msgid "Set audible bell" msgstr "Definir la senyal acústica" -msgid "Set visible bell" -msgstr "Definir la senyal visible" - msgid "Set blinking cursor" msgstr "Definir el cursor" @@ -244,3 +235,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "La versió de sakura és %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Sel·leccioneu l'imatge de fons" + +#~ msgid "Set visible bell" +#~ msgstr "Definir la senyal visible" diff -ru sakura-3.1.5.orig/po/cs.po sakura-3.1.5/po/cs.po --- sakura-3.1.5.orig/po/cs.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/cs.po 2014-09-23 11:16:06.155476510 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura 2.3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Czech \n" @@ -120,12 +120,6 @@ msgid "New window title" msgstr "Název nového okna" -msgid "Select a background file" -msgstr "Vyberte obrázek na pozadí" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -211,9 +205,6 @@ msgid "Set audible bell" msgstr "Nastavit akustické upozornění" -msgid "Set visible bell" -msgstr "Nastavit vizuální upozornění" - msgid "Set blinking cursor" msgstr "Nastavit blikající kurzor" @@ -249,3 +240,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura verze %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Vyberte obrázek na pozadí" + +#~ msgid "Set visible bell" +#~ msgstr "Nastavit vizuální upozornění" diff -ru sakura-3.1.5.orig/po/de.po sakura-3.1.5/po/de.po --- sakura-3.1.5.orig/po/de.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/de.po 2014-09-23 11:16:05.925476504 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 2.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Deutsch \n" @@ -120,12 +120,6 @@ msgid "New window title" msgstr "Fenstertitel wählen" -msgid "Select a background file" -msgstr "Datei für Hintergrundbild wählen" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -209,9 +203,6 @@ msgid "Set audible bell" msgstr "Hörbarer Alarm" -msgid "Set visible bell" -msgstr "Sichtbarer Alarm" - msgid "Set blinking cursor" msgstr "Blinkender Cursor" @@ -247,3 +238,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "Sakura-Version ist %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Datei für Hintergrundbild wählen" + +#~ msgid "Set visible bell" +#~ msgstr "Sichtbarer Alarm" diff -ru sakura-3.1.5.orig/po/en_GB.po sakura-3.1.5/po/en_GB.po --- sakura-3.1.5.orig/po/en_GB.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/en_GB.po 2014-09-23 11:16:05.827476501 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: English (United Kingdom) \n" @@ -117,12 +117,6 @@ msgid "New window title" msgstr "New window title" -msgid "Select a background file" -msgstr "Select a background file" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -206,9 +200,6 @@ msgid "Set audible bell" msgstr "Set audible bell" -msgid "Set visible bell" -msgstr "Set visible bell" - msgid "Set blinking cursor" msgstr "Set blinking cursor" @@ -244,3 +235,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura version is %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Select a background file" + +#~ msgid "Set visible bell" +#~ msgstr "Set visible bell" diff -ru sakura-3.1.5.orig/po/es.po sakura-3.1.5/po/es.po --- sakura-3.1.5.orig/po/es.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/es.po 2014-09-23 11:16:06.056476507 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-07-27 18:42+0000\n" "Last-Translator: David Gómez \n" "Language-Team: \n" @@ -112,12 +112,6 @@ msgid "New window title" msgstr "Nuevo título de la venta" -msgid "Select a background file" -msgstr "Seleccionar fichero de fondo" - -msgid "_Open" -msgstr "_Abrir" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -200,9 +194,6 @@ msgid "Set audible bell" msgstr "Activar campana audible" -msgid "Set visible bell" -msgstr "Activar campana visible" - msgid "Set blinking cursor" msgstr "Activar parpadeo del cursor" @@ -239,3 +230,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "La versión de sakura es %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Seleccionar fichero de fondo" + +#~ msgid "_Open" +#~ msgstr "_Abrir" + +#~ msgid "Set visible bell" +#~ msgstr "Activar campana visible" diff -ru sakura-3.1.5.orig/po/fr.po sakura-3.1.5/po/fr.po --- sakura-3.1.5.orig/po/fr.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/fr.po 2014-09-23 11:16:05.875476502 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: sakura 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: Michael Scherer \n" "Language-Team: \n" @@ -117,12 +117,6 @@ msgid "New window title" msgstr "Définir le titre de la fenêtre" -msgid "Select a background file" -msgstr "Sélectionner une image de fond" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -206,9 +200,6 @@ msgid "Set audible bell" msgstr "Utiliser un avertissement audio" -msgid "Set visible bell" -msgstr "Utiliser un avertissement visuel" - msgid "Set blinking cursor" msgstr "Utliser un curseur clignotant" @@ -244,3 +235,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "Sakura version %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Sélectionner une image de fond" + +#~ msgid "Set visible bell" +#~ msgstr "Utiliser un avertissement visuel" diff -ru sakura-3.1.5.orig/po/he.po sakura-3.1.5/po/he.po --- sakura-3.1.5.orig/po/he.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/he.po 2014-09-23 11:16:06.171476510 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura 3.1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-08-12 23:44+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Rahut \n" @@ -132,12 +132,6 @@ msgid "New window title" msgstr "כותרת חלון חדשה" -msgid "Select a background file" -msgstr "בחירת קובץ רקע" - -msgid "_Open" -msgstr "_פתח" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -221,9 +215,6 @@ msgid "Set audible bell" msgstr "קבע פעמון שמיע" -msgid "Set visible bell" -msgstr "קבע פעמון נראה" - msgid "Set blinking cursor" msgstr "קבע סמן מהבהב" @@ -262,3 +253,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura version is %s\n" + +#~ msgid "Select a background file" +#~ msgstr "בחירת קובץ רקע" + +#~ msgid "_Open" +#~ msgstr "_פתח" + +#~ msgid "Set visible bell" +#~ msgstr "קבע פעמון נראה" diff -ru sakura-3.1.5.orig/po/hr.po sakura-3.1.5/po/hr.po --- sakura-3.1.5.orig/po/hr.po 2014-09-16 14:04:45.474576085 +0200 +++ sakura-3.1.5/po/hr.po 2014-09-23 11:16:06.222476512 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Sakura 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: brentaal \n" @@ -117,12 +117,6 @@ msgid "New window title" msgstr "Novi naslov prozora" -msgid "Select a background file" -msgstr "Odaberite slikovnu datoteku s pozadinom" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -206,9 +200,6 @@ msgid "Set audible bell" msgstr "Postavi zvučno zvono" -msgid "Set visible bell" -msgstr "Postavi vidljivo zvono" - msgid "Set blinking cursor" msgstr "Koristi treptajući pokazivač" @@ -244,3 +235,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "inačica Sakure je %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Odaberite slikovnu datoteku s pozadinom" + +#~ msgid "Set visible bell" +#~ msgstr "Postavi vidljivo zvono" diff -ru sakura-3.1.5.orig/po/hu.po sakura-3.1.5/po/hu.po --- sakura-3.1.5.orig/po/hu.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/hu.po 2014-09-23 11:16:06.125476509 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: hu\n" @@ -114,12 +114,6 @@ msgid "New window title" msgstr "" -msgid "Select a background file" -msgstr "Válassz háttér fájlt" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -199,9 +193,6 @@ msgid "Set audible bell" msgstr "" -msgid "Set visible bell" -msgstr "" - msgid "Set blinking cursor" msgstr "" @@ -237,3 +228,6 @@ #, c-format msgid "sakura version is %s\n" msgstr "" + +#~ msgid "Select a background file" +#~ msgstr "Válassz háttér fájlt" diff -ru sakura-3.1.5.orig/po/it.po sakura-3.1.5/po/it.po --- sakura-3.1.5.orig/po/it.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/it.po 2014-09-23 11:16:06.072476508 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:16+0000\n" "Last-Translator: David Gómez \n" "Language-Team: sakura-it \n" @@ -119,12 +119,6 @@ msgid "New window title" msgstr "Nuovo titolo della finestra" -msgid "Select a background file" -msgstr "Seleziona un file di sfondo" - -msgid "_Open" -msgstr "_Apri" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -208,9 +202,6 @@ msgid "Set audible bell" msgstr "Imposta l'avviso acustico" -msgid "Set visible bell" -msgstr "Imposta l'avviso visivo" - msgid "Set blinking cursor" msgstr "Imposta il cursore lampeggiante" @@ -246,3 +237,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "La versione di Sakura è %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Seleziona un file di sfondo" + +#~ msgid "_Open" +#~ msgstr "_Apri" + +#~ msgid "Set visible bell" +#~ msgstr "Imposta l'avviso visivo" diff -ru sakura-3.1.5.orig/po/ja.po sakura-3.1.5/po/ja.po --- sakura-3.1.5.orig/po/ja.po 2014-09-16 14:04:45.474576085 +0200 +++ sakura-3.1.5/po/ja.po 2014-09-23 11:16:06.205476511 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-07-27 18:45+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Japanese \n" @@ -111,12 +111,6 @@ msgid "New window title" msgstr "ウィンドウタイトルを指定" -msgid "Select a background file" -msgstr "背景ファイルを選択" - -msgid "_Open" -msgstr "開く" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -200,9 +194,6 @@ msgid "Set audible bell" msgstr "可聴なベルを表示" -msgid "Set visible bell" -msgstr "可視のベルを表示" - msgid "Set blinking cursor" msgstr "ブリキングのカーソルを表示" @@ -238,3 +229,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura のバージョンは %s です\n" + +#~ msgid "Select a background file" +#~ msgstr "背景ファイルを選択" + +#~ msgid "_Open" +#~ msgstr "開く" + +#~ msgid "Set visible bell" +#~ msgstr "可視のベルを表示" diff -ru sakura-3.1.5.orig/po/ko.po sakura-3.1.5/po/ko.po --- sakura-3.1.5.orig/po/ko.po 2014-09-16 14:04:45.465576085 +0200 +++ sakura-3.1.5/po/ko.po 2014-09-23 11:16:05.731476499 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Korean \n" @@ -116,12 +116,6 @@ msgid "New window title" msgstr "새 창 제목" -msgid "Select a background file" -msgstr "배경 파일 선택" - -msgid "_Open" -msgstr "열기" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -205,9 +199,6 @@ msgid "Set audible bell" msgstr "소리 나게 설정" -msgid "Set visible bell" -msgstr "소리 보이게 설정" - msgid "Set blinking cursor" msgstr "커서 깜빡임 설정" @@ -243,3 +234,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura 버전은 %s 입니다\n" + +#~ msgid "Select a background file" +#~ msgstr "배경 파일 선택" + +#~ msgid "_Open" +#~ msgstr "열기" + +#~ msgid "Set visible bell" +#~ msgstr "소리 보이게 설정" diff -ru sakura-3.1.5.orig/po/pl.po sakura-3.1.5/po/pl.po --- sakura-3.1.5.orig/po/pl.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/pl.po 2014-09-23 11:16:05.891476503 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Polish \n" @@ -120,12 +120,6 @@ msgid "New window title" msgstr "Nowy tytuł okna" -msgid "Select a background file" -msgstr "Wybierz plik tła" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -211,9 +205,6 @@ msgid "Set audible bell" msgstr "Dźwiękowy sygnał" -msgid "Set visible bell" -msgstr "Migający sygnał" - msgid "Set blinking cursor" msgstr "Migający kursor" @@ -249,3 +240,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "wersja sakura to %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Wybierz plik tła" + +#~ msgid "Set visible bell" +#~ msgstr "Migający sygnał" diff -ru sakura-3.1.5.orig/po/pt_BR.po sakura-3.1.5/po/pt_BR.po --- sakura-3.1.5.orig/po/pt_BR.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/pt_BR.po 2014-09-23 11:16:06.040476507 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:16+0000\n" "Last-Translator: Neliton Pereira Jr. \n" "Language-Team: fabio.antunes@hotmail.com \n" @@ -113,12 +113,6 @@ msgid "New window title" msgstr "Definir título da janela" -msgid "Select a background file" -msgstr "Selecionar arquivo de segundo plano" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -202,9 +196,6 @@ msgid "Set audible bell" msgstr "Ativar aviso sonoro" -msgid "Set visible bell" -msgstr "Ativar aviso visual" - msgid "Set blinking cursor" msgstr "Ativar cursor piscando" @@ -240,3 +231,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura versão %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Selecionar arquivo de segundo plano" + +#~ msgid "Set visible bell" +#~ msgstr "Ativar aviso visual" diff -ru sakura-3.1.5.orig/po/pt.po sakura-3.1.5/po/pt.po --- sakura-3.1.5.orig/po/pt.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/pt.po 2014-09-23 11:16:05.983476505 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-07-27 18:19+0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese \n" @@ -117,12 +117,6 @@ msgid "New window title" msgstr "Título da nova janela" -msgid "Select a background file" -msgstr "Escolha um ficheiro de fundo" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -206,9 +200,6 @@ msgid "Set audible bell" msgstr "Definir sinal sonoro" -msgid "Set visible bell" -msgstr "Definir sinal visual" - msgid "Set blinking cursor" msgstr "Definir cursor intermitente" @@ -244,3 +235,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "a versão do sakura é a %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Escolha um ficheiro de fundo" + +#~ msgid "Set visible bell" +#~ msgstr "Definir sinal visual" diff -ru sakura-3.1.5.orig/po/ru.po sakura-3.1.5/po/ru.po --- sakura-3.1.5.orig/po/ru.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/ru.po 2014-09-23 11:16:06.110476509 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-07-27 18:20+0000\n" "Last-Translator: ManDrive \n" "Language-Team: Evgenij Vdovin \n" @@ -109,12 +109,6 @@ msgid "New window title" msgstr "Новый заголовок окна:" -msgid "Select a background file" -msgstr "Выбор файла с фоновым рисунком" - -msgid "_Open" -msgstr "_Открыть" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -198,9 +192,6 @@ msgid "Set audible bell" msgstr "Звуковое оповещение" -msgid "Set visible bell" -msgstr "Визуальное оповещение" - msgid "Set blinking cursor" msgstr "Мигающий курсор" @@ -236,3 +227,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "Версия sakura %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Выбор файла с фоновым рисунком" + +#~ msgid "_Open" +#~ msgstr "_Открыть" + +#~ msgid "Set visible bell" +#~ msgstr "Визуальное оповещение" diff -ru sakura-3.1.5.orig/po/uk.po sakura-3.1.5/po/uk.po --- sakura-3.1.5.orig/po/uk.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/uk.po 2014-09-23 11:16:05.909476503 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:17+0000\n" "Last-Translator: Andriy Nezhivy \n" "Language-Team: Ukrainian \n" @@ -117,12 +117,6 @@ msgid "New window title" msgstr "Новий заголовок вікна" -msgid "Select a background file" -msgstr "Обрати файл тла" - -msgid "_Open" -msgstr "" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -206,9 +200,6 @@ msgid "Set audible bell" msgstr "Встановити звуковий сигнал" -msgid "Set visible bell" -msgstr "Встановити візуальний сигнал" - msgid "Set blinking cursor" msgstr "Встановити мерехтіння курсора" @@ -244,3 +235,9 @@ #, c-format msgid "sakura version is %s\n" msgstr "версія Sakura %s\n" + +#~ msgid "Select a background file" +#~ msgstr "Обрати файл тла" + +#~ msgid "Set visible bell" +#~ msgstr "Встановити візуальний сигнал" diff -ru sakura-3.1.5.orig/po/zh_CN.po sakura-3.1.5/po/zh_CN.po --- sakura-3.1.5.orig/po/zh_CN.po 2014-09-16 14:04:45.466576085 +0200 +++ sakura-3.1.5/po/zh_CN.po 2014-09-23 11:16:05.965476505 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sakura 1.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-12 02:03+0200\n" +"POT-Creation-Date: 2014-09-23 11:16+0200\n" "PO-Revision-Date: 2014-06-23 01:16+0000\n" "Last-Translator: David Gómez \n" "Language-Team: Chinese/Simplified \n" @@ -116,12 +116,6 @@ msgid "New window title" msgstr "新窗口标题" -msgid "Select a background file" -msgstr "选择一个背景图片" - -msgid "_Open" -msgstr "打开" - msgid "" "There is a running process in this terminal.\n" "\n" @@ -205,9 +199,6 @@ msgid "Set audible bell" msgstr "设定蜂鸣提醒" -msgid "Set visible bell" -msgstr "设置可视提醒" - msgid "Set blinking cursor" msgstr "设置闪烁光标" @@ -243,3 +234,12 @@ #, c-format msgid "sakura version is %s\n" msgstr "sakura 版本是 %s\n" + +#~ msgid "Select a background file" +#~ msgstr "选择一个背景图片" + +#~ msgid "_Open" +#~ msgstr "打开" + +#~ msgid "Set visible bell" +#~ msgstr "设置可视提醒" diff -ru sakura-3.1.5.orig/src/sakura.c sakura-3.1.5/src/sakura.c --- sakura-3.1.5.orig/src/sakura.c 2014-09-16 14:04:45.642576089 +0200 +++ sakura-3.1.5/src/sakura.c 2014-09-23 11:36:45.273509692 +0200 @@ -225,7 +225,7 @@ glong columns; glong rows; gint label_count; - VteTerminalCursorShape cursor_type; + VteCursorShape cursor_type; bool first_tab; bool show_scrollbar; bool show_resize_grip; @@ -233,22 +233,18 @@ bool tabs_on_bottom; bool less_questions; bool audible_bell; - bool visible_bell; bool blinking_cursor; bool fullscreen; bool keep_fc; /* Global flag to indicate that we don't want changes in the files and columns values */ bool config_modified; /* Configuration has been modified */ bool externally_modified; /* Configuration file has been modified by another proccess */ bool resized; - GtkWidget *item_clear_background; /* We include here only the items which need to be hided */ GtkWidget *item_copy_link; GtkWidget *item_open_link; GtkWidget *open_link_separator; GKeyFile *cfg; GtkCssProvider *provider; char *configfile; - char *background; - char *word_chars; /* Set of characters for word boundaries */ gint last_colorset; gint add_tab_accelerator; gint del_tab_accelerator; @@ -295,7 +291,6 @@ #define DEFAULT_ROWS 24 #define DEFAULT_FONT "Ubuntu Mono,monospace 13" #define FONT_MINIMAL_SIZE (PANGO_SCALE*6) -#define DEFAULT_WORD_CHARS "-A-Za-z0-9,./?%&#_~" #define DEFAULT_PALETTE "solarized_dark" #define TAB_MAX_SIZE 40 #define TAB_MIN_SIZE 6 @@ -367,7 +362,6 @@ static void sakura_set_name_dialog (GtkWidget *, void *); static void sakura_color_dialog (GtkWidget *, void *); static void sakura_set_title_dialog (GtkWidget *, void *); -static void sakura_select_background_dialog (GtkWidget *, void *); static void sakura_new_tab (GtkWidget *, void *); static void sakura_close_tab (GtkWidget *, void *); static void sakura_fullscreen (GtkWidget *, void *); @@ -858,7 +852,7 @@ for (i=0; i < npages; i++) { term = sakura_get_page_term(sakura, i); - pgid = tcgetpgrp(vte_terminal_get_pty(VTE_TERMINAL(term->vte))); + pgid = tcgetpgrp(vte_pty_get_fd(vte_terminal_get_pty(VTE_TERMINAL(term->vte)))); /* If running processes are found, we ask one time and exit */ if ( (pgid != -1) && (pgid != term->pid)) { @@ -1000,24 +994,23 @@ int i; int n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)); struct terminal *term; - GdkRGBA white={255, 255, 255, 1}; /* Re-apply in each notebook tab its terminals colors */ for (i = (n_pages - 1); i >= 0; i--) { term = sakura_get_page_term(sakura, i); + GdkRGBA white={255, 255, 255, sakura.backcolors[term->colorset].alpha}; if (sakura.has_rgba) { /* FIXME: Is this still needed with RGBA colors?? */ /* This is needed for set_opacity to have effect. The opacity does take effect when switching tabs, so this setting to white is actually needed only in the shown tab.*/ - vte_terminal_set_color_background_rgba(VTE_TERMINAL (term->vte), &white); - vte_terminal_set_opacity(VTE_TERMINAL (term->vte), (int)((sakura.backcolors[term->colorset].alpha)*65535)); + vte_terminal_set_color_background(VTE_TERMINAL (term->vte), &white); } - vte_terminal_set_colors_rgba(VTE_TERMINAL(term->vte), + vte_terminal_set_colors(VTE_TERMINAL(term->vte), &sakura.forecolors[term->colorset], &sakura.backcolors[term->colorset], sakura.palette, PALETTE_SIZE); - vte_terminal_set_color_cursor_rgba(VTE_TERMINAL(term->vte), &sakura.curscolors[term->colorset]); + vte_terminal_set_color_cursor(VTE_TERMINAL(term->vte), &sakura.curscolors[term->colorset]); } } @@ -1261,33 +1254,6 @@ static void -sakura_select_background_dialog (GtkWidget *widget, void *data) -{ - GtkWidget *dialog; - gint response; - gchar *filename; - - dialog = gtk_file_chooser_dialog_new (_("Select a background file"), GTK_WINDOW(sakura.main_window), - GTK_FILE_CHOOSER_ACTION_OPEN, - _("_Cancel"), GTK_RESPONSE_CANCEL, - _("_Open"), GTK_RESPONSE_ACCEPT, - NULL); - - - response=gtk_dialog_run(GTK_DIALOG(dialog)); - if (response == GTK_RESPONSE_ACCEPT) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - sakura.background=g_strdup(filename); - sakura_set_bgimage(sakura.background); - gtk_widget_show(sakura.item_clear_background); - g_free(filename); - } - - gtk_widget_destroy(dialog); -} - - -static void sakura_copy_url (GtkWidget *widget, void *data) { GtkClipboard* clip; @@ -1328,26 +1294,6 @@ static void -sakura_clear (GtkWidget *widget, void *data) -{ - gint page; - struct terminal *term; - - page = gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook)); - term = sakura_get_page_term(sakura, page); - - gtk_widget_hide(sakura.item_clear_background); - - vte_terminal_set_background_image(VTE_TERMINAL(term->vte), NULL); - - sakura_set_config_string("background", "none"); - - g_free(sakura.background); - sakura.background=NULL; -} - - -static void sakura_show_first_tab (GtkWidget *widget, void *data) { if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) { @@ -1467,25 +1413,6 @@ static void -sakura_visible_bell (GtkWidget *widget, void *data) -{ - gint page; - struct terminal *term; - - page = gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook)); - term = sakura_get_page_term(sakura, page); - - if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) { - vte_terminal_set_visible_bell (VTE_TERMINAL(term->vte), TRUE); - sakura_set_config_string("visible_bell", "Yes"); - } else { - vte_terminal_set_visible_bell (VTE_TERMINAL(term->vte), FALSE); - sakura_set_config_string("visible_bell", "No"); - } -} - - -static void sakura_blinking_cursor (GtkWidget *widget, void *data) { gint page; @@ -1558,11 +1485,11 @@ for (i = (n_pages - 1); i >= 0; i--) { term = sakura_get_page_term(sakura, i); - vte_terminal_set_colors_rgba(VTE_TERMINAL(term->vte), + vte_terminal_set_colors(VTE_TERMINAL(term->vte), &sakura.forecolors[term->colorset], &sakura.backcolors[term->colorset], sakura.palette, PALETTE_SIZE); - vte_terminal_set_color_cursor_rgba(VTE_TERMINAL(term->vte), &sakura.curscolors[term->colorset]); + vte_terminal_set_color_cursor(VTE_TERMINAL(term->vte), &sakura.curscolors[term->colorset]); } sakura_set_config_string("palette", palette); @@ -1692,7 +1619,7 @@ } /* Check if there are running processes for this tab. Use tcgetpgrp to compare to the shell PGID */ - pgid = tcgetpgrp(vte_terminal_get_pty(VTE_TERMINAL(term->vte))); + pgid = tcgetpgrp(vte_pty_get_fd(vte_terminal_get_pty(VTE_TERMINAL(term->vte)))); if ( (pgid != -1) && (pgid != term->pid) && (!sakura.less_questions) ) { dialog=gtk_message_dialog_new(GTK_WINDOW(sakura.main_window), GTK_DIALOG_MODAL, @@ -1748,7 +1675,7 @@ } /* Check if there are running processes for this tab. Use tcgetpgrp to compare to the shell PGID */ - pgid = tcgetpgrp(vte_terminal_get_pty(VTE_TERMINAL(term->vte))); + pgid = tcgetpgrp(vte_pty_get_fd(vte_terminal_get_pty(VTE_TERMINAL(term->vte)))); if ( (pgid != -1) && (pgid != term->pid) && (!sakura.less_questions) ) { dialog=gtk_message_dialog_new(GTK_WINDOW(sakura.main_window), GTK_DIALOG_MODAL, @@ -1875,18 +1802,6 @@ } sakura.last_colorset = g_key_file_get_integer(sakura.cfg, cfg_group, "last_colorset", NULL); - if (!g_key_file_has_key(sakura.cfg, cfg_group, "background", NULL)) { - sakura_set_config_string("background", "none"); - } - cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "background", NULL); - if (strcmp(cfgtmp, "none")==0) { - sakura.background=NULL; - } else { - sakura.background=g_strdup(cfgtmp); - } - g_free(cfgtmp); - - if (!g_key_file_has_key(sakura.cfg, cfg_group, "font", NULL)) { sakura_set_config_string("font", DEFAULT_FONT); } @@ -1933,13 +1848,6 @@ sakura.audible_bell= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0; g_free(cfgtmp); - if (!g_key_file_has_key(sakura.cfg, cfg_group, "visible_bell", NULL)) { - sakura_set_config_string("visible_bell", "No"); - } - cfgtmp = g_key_file_get_value(sakura.cfg, cfg_group, "visible_bell", NULL); - sakura.visible_bell= (strcmp(cfgtmp, "Yes")==0) ? 1 : 0; - g_free(cfgtmp); - if (!g_key_file_has_key(sakura.cfg, cfg_group, "blinking_cursor", NULL)) { sakura_set_config_string("blinking_cursor", "No"); } @@ -1952,11 +1860,6 @@ } sakura.cursor_type = g_key_file_get_integer(sakura.cfg, cfg_group, "cursor_type", NULL); - if (!g_key_file_has_key(sakura.cfg, cfg_group, "word_chars", NULL)) { - sakura_set_config_string("word_chars", DEFAULT_WORD_CHARS); - } - sakura.word_chars = g_key_file_get_value(sakura.cfg, cfg_group, "word_chars", NULL); - if (!g_key_file_has_key(sakura.cfg, cfg_group, "palette", NULL)) { sakura_set_config_string("palette", DEFAULT_PALETTE); } @@ -2168,9 +2071,9 @@ { GtkWidget *item_new_tab, *item_set_name, *item_close_tab, *item_copy, *item_paste, *item_select_font, *item_select_colors, - *item_select_background, *item_set_title, *item_fullscreen, + *item_set_title, *item_fullscreen, *item_toggle_scrollbar, *item_options, - *item_show_first_tab, *item_audible_bell, *item_visible_bell, + *item_show_first_tab, *item_audible_bell, *item_blinking_cursor, *item_other_options, *item_cursor, *item_cursor_block, *item_cursor_underline, *item_cursor_ibeam, *item_palette, *item_palette_tango, *item_palette_linux, *item_palette_xterm, @@ -2227,8 +2130,6 @@ item_paste=gtk_menu_item_new_with_label(_("Paste")); item_select_font=gtk_menu_item_new_with_label(_("Select font...")); item_select_colors=gtk_menu_item_new_with_label(_("Select colors...")); - item_select_background=gtk_menu_item_new_with_label(_("Select background...")); - sakura.item_clear_background=gtk_menu_item_new_with_label(_("Clear background")); item_set_title=gtk_menu_item_new_with_label(_("Set window title...")); item_options=gtk_menu_item_new_with_label(_("Options")); @@ -2241,7 +2142,6 @@ item_toggle_resize_grip=gtk_check_menu_item_new_with_label(_("Show resize grip")); item_less_questions=gtk_check_menu_item_new_with_label(_("Don't show exit dialog")); item_audible_bell=gtk_check_menu_item_new_with_label(_("Set audible bell")); - item_visible_bell=gtk_check_menu_item_new_with_label(_("Set visible bell")); item_blinking_cursor=gtk_check_menu_item_new_with_label(_("Set blinking cursor")); item_cursor=gtk_menu_item_new_with_label(_("Set cursor type")); item_cursor_block=gtk_radio_menu_item_new_with_label(NULL, _("Block")); @@ -2297,10 +2197,6 @@ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_audible_bell), TRUE); } - if (sakura.visible_bell) { - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_visible_bell), TRUE); - } - if (sakura.blinking_cursor) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item_blinking_cursor), TRUE); } @@ -2347,7 +2243,6 @@ gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), gtk_separator_menu_item_new()); gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), item_copy); gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), item_paste); - gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), sakura.item_clear_background); gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), gtk_separator_menu_item_new()); gtk_menu_shell_append(GTK_MENU_SHELL(sakura.menu), item_options); @@ -2359,7 +2254,6 @@ gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_set_title); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_select_colors); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_select_font); - gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_select_background); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), gtk_separator_menu_item_new()); gtk_menu_shell_append(GTK_MENU_SHELL(options_menu), item_other_options); gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_show_first_tab); @@ -2370,7 +2264,6 @@ gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_toggle_resize_grip); gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_less_questions); gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_audible_bell); - gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_visible_bell); gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_blinking_cursor); gtk_menu_shell_append(GTK_MENU_SHELL(other_options_menu), item_cursor); gtk_menu_shell_append(GTK_MENU_SHELL(cursor_menu), item_cursor_block); @@ -2393,7 +2286,6 @@ g_signal_connect(G_OBJECT(item_set_name), "activate", G_CALLBACK(sakura_set_name_dialog), NULL); g_signal_connect(G_OBJECT(item_close_tab), "activate", G_CALLBACK(sakura_close_tab), NULL); g_signal_connect(G_OBJECT(item_select_font), "activate", G_CALLBACK(sakura_font_dialog), NULL); - g_signal_connect(G_OBJECT(item_select_background), "activate", G_CALLBACK(sakura_select_background_dialog), NULL); g_signal_connect(G_OBJECT(item_copy), "activate", G_CALLBACK(sakura_copy), NULL); g_signal_connect(G_OBJECT(item_paste), "activate", G_CALLBACK(sakura_paste), NULL); g_signal_connect(G_OBJECT(item_select_colors), "activate", G_CALLBACK(sakura_color_dialog), NULL); @@ -2405,7 +2297,6 @@ g_signal_connect(G_OBJECT(item_toggle_scrollbar), "activate", G_CALLBACK(sakura_show_scrollbar), NULL); g_signal_connect(G_OBJECT(item_toggle_resize_grip), "activate", G_CALLBACK(sakura_show_resize_grip), NULL); g_signal_connect(G_OBJECT(item_audible_bell), "activate", G_CALLBACK(sakura_audible_bell), NULL); - g_signal_connect(G_OBJECT(item_visible_bell), "activate", G_CALLBACK(sakura_visible_bell), NULL); g_signal_connect(G_OBJECT(item_blinking_cursor), "activate", G_CALLBACK(sakura_blinking_cursor), NULL); g_signal_connect(G_OBJECT(item_set_title), "activate", G_CALLBACK(sakura_set_title_dialog), NULL); g_signal_connect(G_OBJECT(item_cursor_block), "activate", G_CALLBACK(sakura_set_cursor), "block"); @@ -2419,16 +2310,10 @@ g_signal_connect(G_OBJECT(sakura.item_open_link), "activate", G_CALLBACK(sakura_open_url), NULL); g_signal_connect(G_OBJECT(sakura.item_copy_link), "activate", G_CALLBACK(sakura_copy_url), NULL); - g_signal_connect(G_OBJECT(sakura.item_clear_background), "activate", G_CALLBACK(sakura_clear), NULL); g_signal_connect(G_OBJECT(item_fullscreen), "activate", G_CALLBACK(sakura_fullscreen), NULL); gtk_widget_show_all(sakura.menu); - - /* We don't want to see this if there's no background image */ - if (!sakura.background) { - gtk_widget_hide(sakura.item_clear_background); - } } @@ -2446,9 +2331,6 @@ pango_font_description_free(sakura.font); - if (sakura.background) - free(sakura.background); - free(sakura.configfile); gtk_main_quit(); @@ -2460,7 +2342,6 @@ sakura_set_size(void) { struct terminal *term; - gint pad_x, pad_y; gint char_width, char_height; guint npages; gint min_width, natural_width; @@ -2478,15 +2359,11 @@ sakura.resized=FALSE; } - gtk_widget_style_get(term->vte, "inner-border", &term->border, NULL); - pad_x = term->border->left + term->border->right; - pad_y = term->border->top + term->border->bottom; - SAY("padding x %d y %d", pad_x, pad_y); char_width = vte_terminal_get_char_width(VTE_TERMINAL(term->vte)); char_height = vte_terminal_get_char_height(VTE_TERMINAL(term->vte)); - sakura.width = pad_x + (char_width * sakura.columns); - sakura.height = pad_y + (char_height * sakura.rows); + sakura.width = char_width * sakura.columns; + sakura.height = char_height * sakura.rows; if (npages>=2 || sakura.first_tab) { //gint min_height, natural_height; @@ -2507,7 +2384,7 @@ sakura.height += 47; sakura.width += 8; - sakura.width += /* (hb*2)+*/ (pad_x*2); + /*sakura.width += (hb*2)+*/; } page = gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook)); @@ -2664,7 +2541,7 @@ vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), sakura.http_regexp, 0); vte_terminal_set_mouse_autohide(VTE_TERMINAL(term->vte), TRUE); - term->scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, vte_terminal_get_adjustment(VTE_TERMINAL(term->vte))); + term->scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(term->vte))); gtk_box_pack_start(GTK_BOX(term->hbox), term->vte, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(term->hbox), term->scrollbar, FALSE, FALSE, 0); @@ -2799,8 +2676,8 @@ if (command_argc > 0) { path=g_find_program_in_path(command_argv[0]); if (path) { - if (!vte_terminal_fork_command_full(VTE_TERMINAL(term->vte), VTE_PTY_DEFAULT, NULL, command_argv, NULL, - G_SPAWN_SEARCH_PATH, NULL, NULL, &term->pid, &gerror)) { + if (!vte_terminal_spawn_sync(VTE_TERMINAL(term->vte), VTE_PTY_DEFAULT, NULL, command_argv, NULL, + G_SPAWN_SEARCH_PATH, NULL, NULL, &term->pid, NULL, &gerror)) { SAY("error: %s", gerror->message); } } else { @@ -2819,8 +2696,8 @@ sakura_error("Hold option given without any command"); option_hold=FALSE; } - vte_terminal_fork_command_full(VTE_TERMINAL(term->vte), VTE_PTY_DEFAULT, cwd, sakura.argv, NULL, - G_SPAWN_SEARCH_PATH|G_SPAWN_FILE_AND_ARGV_ZERO, NULL, NULL, &term->pid, NULL); + vte_terminal_spawn_sync(VTE_TERMINAL(term->vte), VTE_PTY_DEFAULT, cwd, sakura.argv, NULL, + G_SPAWN_SEARCH_PATH|G_SPAWN_FILE_AND_ARGV_ZERO, NULL, NULL, &term->pid, NULL, NULL); } /* Not the first tab */ } else { @@ -2838,36 +2715,24 @@ * function in the window is not visible *sigh*. Gtk documentation * says this is for "historical" reasons. Me arse */ gtk_notebook_set_current_page(GTK_NOTEBOOK(sakura.notebook), index); - vte_terminal_fork_command_full(VTE_TERMINAL(term->vte), VTE_PTY_DEFAULT, cwd, sakura.argv, NULL, - G_SPAWN_SEARCH_PATH|G_SPAWN_FILE_AND_ARGV_ZERO, NULL, NULL, &term->pid, NULL); + vte_terminal_spawn_sync(VTE_TERMINAL(term->vte), VTE_PTY_DEFAULT, cwd, sakura.argv, NULL, + G_SPAWN_SEARCH_PATH|G_SPAWN_FILE_AND_ARGV_ZERO, NULL, NULL, &term->pid, NULL, NULL); } free(cwd); /* Configuration for the newly created terminal */ - GdkRGBA white={255, 255, 255, 1}; - vte_terminal_set_color_background_rgba(VTE_TERMINAL (term->vte), &white); + GdkRGBA white={255, 255, 255, sakura.backcolors[term->colorset].alpha}; + vte_terminal_set_color_background(VTE_TERMINAL (term->vte), &white); vte_terminal_set_backspace_binding(VTE_TERMINAL(term->vte), VTE_ERASE_ASCII_DELETE); - vte_terminal_set_colors_rgba(VTE_TERMINAL(term->vte), + vte_terminal_set_colors(VTE_TERMINAL(term->vte), &sakura.forecolors[term->colorset], &sakura.backcolors[term->colorset], sakura.palette, PALETTE_SIZE); - vte_terminal_set_color_cursor_rgba(VTE_TERMINAL(term->vte), &sakura.curscolors[term->colorset]); - if (sakura.has_rgba) { - vte_terminal_set_opacity(VTE_TERMINAL (term->vte), (int)((sakura.backcolors[term->colorset].alpha)*65535)); - } - - if (sakura.background) { - sakura_set_bgimage(sakura.background); - } - - if (sakura.word_chars) { - vte_terminal_set_word_chars( VTE_TERMINAL (term->vte), sakura.word_chars ); - } + vte_terminal_set_color_cursor(VTE_TERMINAL(term->vte), &sakura.curscolors[term->colorset]); /* Get rid of these nasty bells */ vte_terminal_set_audible_bell (VTE_TERMINAL(term->vte), sakura.audible_bell ? TRUE : FALSE); - vte_terminal_set_visible_bell (VTE_TERMINAL(term->vte), sakura.visible_bell ? TRUE : FALSE); /* Disable stupid blinking cursor */ vte_terminal_set_cursor_blink_mode (VTE_TERMINAL(term->vte), sakura.blinking_cursor ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF); @@ -2928,36 +2793,6 @@ } } - -static void -sakura_set_bgimage(char *infile) -{ - GError *gerror=NULL; - GdkPixbuf *pixbuf=NULL; - gint page; - struct terminal *term; - - if (!infile) SAY("File parameter is NULL"); - - page = gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook)); - term = sakura_get_page_term(sakura, page); - - /* Check file existence and type */ - if (g_file_test(infile, G_FILE_TEST_IS_REGULAR)) { - - pixbuf = gdk_pixbuf_new_from_file (infile, &gerror); - if (!pixbuf) { - sakura_error("Error loading image file: %s\n", gerror->message); - } else { - vte_terminal_set_background_image(VTE_TERMINAL(term->vte), pixbuf); - vte_terminal_set_background_saturation(VTE_TERMINAL(term->vte), TRUE); - vte_terminal_set_background_transparent(VTE_TERMINAL(term->vte),FALSE); - - sakura_set_config_string("background", infile); - } - } -} - static void sakura_set_config_key(const gchar *key, guint value)