Magellan Linux

Annotation of /trunk/zeitgeist/patches/zeitgeist-0.8.2-gobject.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1649 - (hide annotations) (download)
Fri Feb 17 19:32:01 2012 UTC (12 years, 3 months ago) by niro
File size: 1939 byte(s)
-added zeitgeist patches
1 niro 1649 .../engine/extensions/datasource_registry.py | 4 ++--
2     zeitgeist-daemon | 2 +-
3     zeitgeist-daemon.py | 4 ++--
4     3 files changed, 5 insertions(+), 5 deletions(-)
5    
6     diff --git a/_zeitgeist/engine/extensions/datasource_registry.py b/_zeitgeist/engine/extensions/datasource_registry.py
7     index 17d357f..fea7d85 100644
8     --- a/_zeitgeist/engine/extensions/datasource_registry.py
9     +++ b/_zeitgeist/engine/extensions/datasource_registry.py
10     @@ -23,7 +23,7 @@ import os
11     import cPickle as pickle
12     import dbus
13     import dbus.service
14     -import gobject
15     +from gi.repository import GObject
16     import logging
17    
18     from zeitgeist.datamodel import get_timestamp_for_now
19     @@ -96,7 +96,7 @@ class DataSourceRegistry(Extension, dbus.service.Object):
20     )
21    
22     self._dirty = True
23     - gobject.timeout_add(DISK_WRITE_TIMEOUT, self._write_to_disk)
24     + GObject.timeout_add(DISK_WRITE_TIMEOUT, self._write_to_disk)
25    
26     def _write_to_disk(self):
27     data = [DataSource.get_plain(datasource) for datasource in
28     diff --git a/zeitgeist-daemon b/zeitgeist-daemon
29     index 3f5ae91..c845d10 100755
30     --- a/zeitgeist-daemon
31     +++ b/zeitgeist-daemon
32     @@ -21,7 +21,7 @@
33    
34     import sys
35     import os
36     -import gobject
37     +from gi.repository import GObject
38     import glib
39     import dbus.mainloop.glib
40     import gettext
41     diff --git a/zeitgeist-daemon.py b/zeitgeist-daemon.py
42     index 1afe89b..dad24fc 100755
43     --- a/zeitgeist-daemon.py
44     +++ b/zeitgeist-daemon.py
45     @@ -21,7 +21,7 @@
46    
47     import sys
48     import os
49     -import gobject
50     +from gi.repository import GObject
51     import glib
52     import dbus.mainloop.glib
53     import gettext
54     @@ -99,7 +99,7 @@ def do_shell_completion(parser):
55     def setup_interface():
56     from _zeitgeist.engine.remote import RemoteInterface
57     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
58     - mainloop = gobject.MainLoop()
59     + mainloop = GObject.MainLoop()
60     return mainloop, RemoteInterface(mainloop = mainloop)
61    
62     def start_datahub():