[transmageddon] Fix the setting of the environment variables from python
- From: Christian Fredrik Kalager Schaller <uraeus src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [transmageddon] Fix the setting of the environment variables from python
- Date: Sun, 11 Oct 2009 11:33:12 +0000 (UTC)
commit 6a6956fab6be56d2c317901daa125aeb3f0c3724
Author: Christian F.K. Schaller <christian schaller collabora co uk>
Date: Sun Oct 11 12:30:40 2009 +0100
Fix the setting of the environment variables from python
Fix some small makefile issues
Add icon to about dialog
increase version number
bin/transmageddon.in | 1 +
configure.ac | 2 +-
presets/Makefile.am | 4 ++--
src/about.py.in | 2 ++
src/transmageddon.py | 7 ++++---
5 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/bin/transmageddon.in b/bin/transmageddon.in
index 6f07c05..0832d97 100644
--- a/bin/transmageddon.in
+++ b/bin/transmageddon.in
@@ -1,3 +1,4 @@
#!/bin/bash
+export GST_DEBUG_DUMP_DOT_DIR="/tmp"
cd @DATADIR@/transmageddon
python transmageddon.py
diff --git a/configure.ac b/configure.ac
index 18a38c0..8b171a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(transmageddon, 0.13,
+AC_INIT(transmageddon, 0.14,
http://www.linuxrising.org/transmageddon,
transmageddon)
diff --git a/presets/Makefile.am b/presets/Makefile.am
index 79e760f..a90052a 100755
--- a/presets/Makefile.am
+++ b/presets/Makefile.am
@@ -4,7 +4,7 @@ preset_DATA = ffenc_ac3.prs GstFaac.prs GstVorbisEnc.prs \
ffenc_flv.prs GstLameMP3Enc.prs \
ffenc_h263p.prs GstXvidEnc.prs \
ffenc_mpeg4.prs GstTheoraEnc.prs
-EXTRA_DIST = ffenc_ac3.prs GstFaac.prs GstVorbisEnc.prs \
- ffenc_flv.prs GstLameMP3Enc.prs \
+EXTRA_DIST = ffenc_ac3.prs GstFaac.prs GstVorbisEnc.prs \
+ ffenc_flv.prs GstLameMP3Enc.prs \
ffenc_h263p.prs GstXvidEnc.prs \
ffenc_mpeg4.prs GstTheoraEnc.prs
diff --git a/src/about.py.in b/src/about.py.in
index 452df83..d73368f 100644
--- a/src/about.py.in
+++ b/src/about.py.in
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import gtk
+import os
from gettext import gettext as _
Authors = ["Christian Schaller <uraeus gnome org>",
@@ -42,6 +43,7 @@ class AboutDialog:
x.set_authors(Authors)
x.set_translator_credits(_("translator-credits"))
x.set_artists(Artists)
+ x.set_logo_icon_name("transmageddon")
x.set_license(LGPL)
x.connect("response", lambda d, r: d.destroy())
x.show()
diff --git a/src/transmageddon.py b/src/transmageddon.py
index bce9470..6219e2e 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -20,6 +20,10 @@
import sys
import os
+
+os.environ["GST_DEBUG_DUMP_DOT_DIR"] = "/tmp"
+os.putenv('GST_DEBUG_DUMP_DIR_DIR', '/tmp')
+
import time
import transcoder_engine
import gobject; gobject.threads_init()
@@ -55,9 +59,6 @@ if (major == 2) and (minor < 18):
TARGET_TYPE_URI_LIST = 80
dnd_list = [ ( 'text/uri-list', 0, TARGET_TYPE_URI_LIST ) ]
-os.environ["GST_DEBUG_DUMP_DOT_DIR"] = "/tmp"
-os.putenv('GST_DEBUG_DUMP_DIR_DIR', '/tmp')
-
supported_containers = [
"Ogg",
"Matroska",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]