GConf to GSettings port
This commit is contained in:
committed by
Daniel Narvaez
parent
93437ddedf
commit
db2ba3e579
@@ -58,10 +58,10 @@ import StringIO
|
||||
import cairo
|
||||
import json
|
||||
|
||||
from gi.repository import GConf
|
||||
from gi.repository import Gtk
|
||||
from gi.repository import Gdk
|
||||
from gi.repository import GObject
|
||||
from gi.repository import Gio
|
||||
import dbus
|
||||
import dbus.service
|
||||
from dbus import PROPERTIES_IFACE
|
||||
@@ -375,8 +375,8 @@ class Activity(Window, Gtk.Container):
|
||||
|
||||
def _initialize_journal_object(self):
|
||||
title = _('%s Activity') % get_bundle_name()
|
||||
client = GConf.Client.get_default()
|
||||
icon_color = client.get_string('/desktop/sugar/user/color')
|
||||
settings = Gio.Settings('org.sugarlabs.user')
|
||||
icon_color = settings.get_string('color')
|
||||
|
||||
jobject = datastore.create()
|
||||
jobject.metadata['title'] = title
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
from gi.repository import Gdk
|
||||
from gi.repository import Gtk
|
||||
import gettext
|
||||
from gi.repository import GConf
|
||||
|
||||
from sugar3.graphics.toolbutton import ToolButton
|
||||
from sugar3.graphics.toolbarbox import ToolbarButton
|
||||
@@ -31,6 +30,7 @@ from sugar3.graphics.icon import Icon
|
||||
from sugar3.bundle.activitybundle import ActivityBundle
|
||||
from sugar3.graphics import style
|
||||
from sugar3.graphics.palettemenu import PaletteMenuBox
|
||||
from sugar3 import profile
|
||||
|
||||
|
||||
_ = lambda msg: gettext.dgettext('sugar-toolkit-gtk3', msg)
|
||||
@@ -40,8 +40,7 @@ def _create_activity_icon(metadata):
|
||||
if metadata is not None and metadata.get('icon-color'):
|
||||
color = XoColor(metadata['icon-color'])
|
||||
else:
|
||||
client = GConf.Client.get_default()
|
||||
color = XoColor(client.get_string('/desktop/sugar/user/color'))
|
||||
color = profile.get_color()
|
||||
|
||||
from sugar3.activity.activity import get_bundle_path
|
||||
bundle = ActivityBundle(get_bundle_path())
|
||||
|
||||
Reference in New Issue
Block a user