Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel QuiƱones <manuq@laptop.org>2012-08-30 02:59:04 (GMT)
committer Manuel QuiƱones <manuq@laptop.org>2012-08-30 02:59:04 (GMT)
commit07323f507a742e63c73428f6a762d85d7f0256b4 (patch)
tree6d12e2e6c6b5cc78030c0803b180a7b87fad467d
parentad486d6df147874d6ba204cea0bd82671d5df3a8 (diff)
More Journal fixes
- one more Gio.VolumeMonitor.get API - GObject not imported in keepicon.py - fix bad renaming in mimeregistry.py (pygi-convert renaming commit)
-rw-r--r--src/jarabe/journal/journaltoolbox.py2
-rw-r--r--src/jarabe/journal/keepicon.py1
-rw-r--r--src/jarabe/model/mimeregistry.py4
3 files changed, 4 insertions, 3 deletions
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index 0d588f2..52953f9 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -473,7 +473,7 @@ class EntryToolbar(Gtk.Toolbar):
palette.menu.append(journal_menu)
journal_menu.show()
- volume_monitor = Gio.volume_monitor_get()
+ volume_monitor = Gio.VolumeMonitor.get()
icon_theme = Gtk.IconTheme.get_default()
for mount in volume_monitor.get_mounts():
if self._metadata['mountpoint'] == mount.get_root().get_path():
diff --git a/src/jarabe/journal/keepicon.py b/src/jarabe/journal/keepicon.py
index 90d08f4..e107d25 100644
--- a/src/jarabe/journal/keepicon.py
+++ b/src/jarabe/journal/keepicon.py
@@ -16,6 +16,7 @@
from gi.repository import Gtk
from gi.repository import GConf
+from gi.repository import GObject
import logging
from sugar3.graphics.icon import Icon
diff --git a/src/jarabe/model/mimeregistry.py b/src/jarabe/model/mimeregistry.py
index 87e14cd..cb908b6 100644
--- a/src/jarabe/model/mimeregistry.py
+++ b/src/jarabe/model/mimeregistry.py
@@ -32,10 +32,10 @@ class MimeRegistry(object):
self._gconf = GConf.Client.get_default()
def get_default_activity(self, mime_type):
- return self._GConf.get_string(_key_name(mime_type))
+ return self._gconf.get_string(_key_name(mime_type))
def set_default_activity(self, mime_type, bundle_id):
- self._GConf.set_string(_key_name(mime_type), bundle_id)
+ self._gconf.set_string(_key_name(mime_type), bundle_id)
def get_registry():