[pitivi: 1/4] Remove unused gconf code, drop the gconf dependency entirely.
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi: 1/4] Remove unused gconf code, drop the gconf dependency entirely.
- Date: Sat, 20 Aug 2011 14:05:22 +0000 (UTC)
commit 7ae7a3a29ef49755fa1f93dafd0ae362294e3301
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date: Fri Aug 19 09:56:28 2011 -0400
Remove unused gconf code, drop the gconf dependency entirely.
Fixes bug #656901
pitivi.spec.in | 1 -
pitivi/ui/mainwindow.py | 12 ------------
2 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/pitivi.spec.in b/pitivi.spec.in
index 92e7659..b291ec5 100644
--- a/pitivi.spec.in
+++ b/pitivi.spec.in
@@ -16,7 +16,6 @@ Requires: gstreamer-python >= @PYGST_REQ@
Requires: pygtk2 >= @PYGTK_REQ@
Requires: gnonlin >= @GNONLIN_REQ@
Requires: gnome-python2 >= @PYGNOME_REQ@
-Requires: gnome-python2-gconf
Requires: pycairo >= @PYCAIRO_REQ@
Requires: pygoocanvas
Requires: pyxdg
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index d5d3936..0a91746 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -33,13 +33,6 @@ import gst
from urllib import unquote
import webbrowser
-try:
- import gconf
-except:
- HAVE_GCONF = False
-else:
- HAVE_GCONF = True
-
from gettext import gettext as _
from gtk import RecentManager
@@ -66,11 +59,6 @@ from pitivi.utils import beautify_length, show_user_manual
from pitivi.ui.zoominterface import Zoomable
from pitivi.ui.filechooserpreview import PreviewWidget
-if HAVE_GCONF:
- D_G_INTERFACE = "/desktop/gnome/interface"
-
- for gconf_dir in (D_G_INTERFACE, ):
- gconf.client_get_default().add_dir(gconf_dir, gconf.CLIENT_PRELOAD_NONE)
GlobalSettings.addConfigOption("fileSupportEnabled",
environment="PITIVI_FILE_SUPPORT",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]