[caribou] Removed last mentions of GConf where not needed.
- From: Eitan Isaacson <eitani src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [caribou] Removed last mentions of GConf where not needed.
- Date: Wed, 9 Mar 2011 18:46:21 +0000 (UTC)
commit 9134d8d4316b14a4bdaac11295d8b8d108712f93
Author: Eitan Isaacson <eitan monotonous org>
Date: Wed Mar 9 13:45:08 2011 -0500
Removed last mentions of GConf where not needed.
caribou/ui/window.py | 40 ++++++++++++++++++++--------------------
configure.ac | 4 ----
2 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/caribou/ui/window.py b/caribou/ui/window.py
index 153a280..471ee1c 100644
--- a/caribou/ui/window.py
+++ b/caribou/ui/window.py
@@ -24,7 +24,6 @@ from caribou import data_path
from opacity import ProximityWindowBase
from caribou.common.settings_manager import SettingsManager
-from gi.repository import GConf
from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import Clutter
@@ -32,7 +31,6 @@ import os
import sys
import gobject
-CARIBOU_GCONF_LAYOUT_KEY = '/apps/caribou/osk/layout'
CARIBOU_LAYOUT_DIR = 'keyboards'
Clutter.init("caribou")
@@ -62,7 +60,6 @@ class CaribouWindow(Gtk.Window, Clutter.Animatable, ProximityWindowBase):
self._vbox.pack_start(text_entry_mech, True, True, 0)
self.connect("size-allocate", lambda w, a: self._update_position())
- self._gconf_client = GConf.Client.get_default()
self._cursor_location = Rectangle()
self._entry_location = Rectangle()
@@ -140,23 +137,26 @@ class CaribouWindow(Gtk.Window, Clutter.Animatable, ProximityWindowBase):
root_bbox = Rectangle(*args)
- current_screen = Gdk.Screen.get_default().get_number()
- for panel in self._gconf_client.all_dirs('/apps/panel/toplevels'):
- orientation = self._gconf_client.get_string(panel+'/orientation')
- size = self._gconf_client.get_int(panel+'/size')
- screen = self._gconf_client.get_int(panel+'/screen')
- if screen != current_screen:
- continue
- if orientation == 'top':
- root_bbox.y += size
- root_bbox.height -= size
- elif orientation == 'bottom':
- root_bbox.height -= size
- elif orientation == 'right':
- root_bbox.x += size
- root_bbox.width -= size
- elif orientation == 'left':
- root_bbox.x -= size
+ # TODO: Do whatever we need to do to place the keyboard correctly
+ # in GNOME Shell and Unity.
+ #
+ #current_screen = Gdk.Screen.get_default().get_number()
+ #for panel in self._gconf_client.all_dirs('/apps/panel/toplevels'):
+ # orientation = self._gconf_client.get_string(panel+'/orientation')
+ # size = self._gconf_client.get_int(panel+'/size')
+ # screen = self._gconf_client.get_int(panel+'/screen')
+ # if screen != current_screen:
+ # continue
+ # if orientation == 'top':
+ # root_bbox.y += size
+ # root_bbox.height -= size
+ # elif orientation == 'bottom':
+ # root_bbox.height -= size
+ # elif orientation == 'right':
+ # root_bbox.x += size
+ # root_bbox.width -= size
+ # elif orientation == 'left':
+ # root_bbox.x -= size
return root_bbox
diff --git a/configure.ac b/configure.ac
index 25f5b7a..78fbbc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,10 +15,6 @@ AM_SILENT_RULES([yes])
dnl == check for python ==
AM_PATH_PYTHON(2.4)
-dnl == check for GConf ==
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
dnl == Library dependencies ==
PYGOBJECT_REQUIRED=2.27.92
GTK_REQUIRED=2.91.8
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]