Merge lp:~huxuan/gtg/port-to-gtk3-py3 into lp:~gtg/gtg/old-trunk

[Xuan (Sean) Hu]

This is the Gtk3 and Python3 ported GTG.
You can get more information about the porting work here [1].
BTW, there is a shared evernote [2] with test actions and coverage [3] report listed.
If you find any bugs, feel free to tell me. :-)

[1] https://wiki.gnome.org/SummerOfCode2013/Projects/XuanHu_PortingGTG
[2] https://www.evernote.com/shard/s43/sh/8e6e0ce8-227e-4c7a-b1e4-1e4e13e2728a/3b9d652d1303c5418292963b9483155c
[3] http://nedbatchelder.com/code/coverage/

[Parin Porecha (parinporecha)]

Hi Huxuan,

I found 2 bugs -

1) In the icon selection in tag editor, I noticed a difference in the window heights -
Trunk code - http://i.imgur.com/QkAMZzN.png
Your branch - http://i.imgur.com/Ae4jKyL.png
Only one row of icons are visible at a time.

2) I can't close the icon selection without selecting an icon. On clicking anywhere outside, or on clicking the 'Remove selection' button (i.e. - on trying to close the icon selection window), I get this traceback - http://pastebin.com/hurXQb0U

Another thing -
When I ran GTG through './gtg', the dark theme I've applied for all GTK3 windows works for GTG (http://i.imgur.com/76rhSaD.png).
But when I run the dev version './scripts/debug.sh', it does not work (http://i.imgur.com/Ae4jKyL.png). I don't know if it is a bug in your branch or some XDG variable fault (I'm just guessing).

[Parin Porecha (parinporecha)]

The no. 2 bug in the above comment also occurs in the task editor.

When the calendar is opened, it doesn't close if I don't select a date. Here's the traceback - http://pastebin.com/gt9Cgv7C

Here's a link which I think will help - http://docs.python.org/3.0/whatsnew/3.0.html#ordering-comparisons

[Izidor Matušov (izidor)]

I am not able to select a color for tag. It would be better to either stick with the old colorselector, or make it work with Gtk3 selector.

review: Needs Fixing

[Xuan (Sean) Hu (huxuan)]

Hi, thx for your guys' bug reporting!

I was a little busy before China's National Holiday. But the bug fixing work is already listed on my to do list in GTG. Suppose to have some update in two or three days.

If you find any other problems, feel free to note it down here.

[lp:~huxuan/gtg/port-to-gtk3-py3]

1325. By Xuan (Sean) Hu on 2013-10-08

Merge Trunk

[Parin Porecha (parinporecha)]

Hi,

can you please patch the bugs mentioned above ?
GTG is participating in OPW round from November, and the student will work on your branch
So, it's better if we can make it as stable as possible :-)

Thanks !

[Xuan (Sean) Hu (huxuan)]

Sorry, Just too busy these days. I will try my best.

[lp:~huxuan/gtg/port-to-gtk3-py3]

1326. By Xuan (Sean) Hu on 2013-11-08

Merge Trunk

1327. By Xuan (Sean) Hu on 2013-11-08

Bug fix for change gobject to GObject

[Xuan (Sean) Hu (huxuan)]

Hi, all

Need help for the IconView set_size_request bug.
It seems to be a bug of PyGObject/Gtk3, I have created a simple demo as following:
```python
from gi.repository import Gtk

win = Gtk.Window()
sw = Gtk.ScrolledWindow()
sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.ALWAYS)
iv = Gtk.IconView()
iv.set_size_request(640, 640)
sw.add(iv)
win.add(sw)
win.connect("delete-event", Gtk.main_quit)
win.show_all()
Gtk.main()
```
The set_size_request() doesn't seem to work when vertical policy is set to ALWAYS, but when change the PolicyType to NEVER, the request size seems to work fine.
Just not sure whether this conclusion is true. Any suggestions are welcome. :-)

[lp:~huxuan/gtg/port-to-gtk3-py3]

1328. By Xuan (Sean) Hu on 2013-11-09

use specific method rather than set_property

[Izidor Matušov (izidor)]

Where do we use IconView?

[Xuan (Sean) Hu (huxuan)]

The icon selector in Tag Editor.
The related code can be found here [1].

[1] http://bazaar.launchpad.net/~huxuan/gtg/port-to-gtk3-py3/view/head:/GTG/gtk/browser/tag_editor.py#L68

[Izidor Matušov (izidor)]

Try to report the bug with the demo and chase folks at GNOME IRC channels.
With such a simple demo, it should be pretty straightforward to get some
answer.

On Sun, Nov 10, 2013 at 7:18 PM, Xuan (Sean) Hu <email address hidden>wrote:

> The icon selector in Tag Editor.
> The related code can be found here [1].
>
> [1]
> http://bazaar.launchpad.net/~huxuan/gtg/port-to-gtk3-py3/view/head:/GTG/gtk/browser/tag_editor.py#L68
> --
> https://code.launchpad.net/~huxuan/gtg/port-to-gtk3-py3/+merge/187552
> You are reviewing the proposed merge of lp:~huxuan/gtg/port-to-gtk3-py3
> into lp:gtg.
>

[Xuan (Sean) Hu (huxuan)]

I have created the bug here [1]. If there is any problem about the reporting, feel free to tell me.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=711793

[lp:~huxuan/gtg/port-to-gtk3-py3]

1329. By Xuan (Sean) Hu on 2013-11-25

Merge Trunk

1330. By Xuan (Sean) Hu on 2013-12-12

Merge Trunk

[Parin Porecha (parinporecha)]

Hi,

we want to merge your branch to the trunk as soon as possible, but the tag editor is not working, thats where we're stuck.
Once it gets working, we'll merge it.

If you need help, I'll be happy to fix some problems :-)

[lp:~huxuan/gtg/port-to-gtk3-py3]

1331. By Xuan (Sean) Hu on 2013-12-18

Merge Trunk

1332. By Xuan (Sean) Hu on 2014-01-12

Merge Trunk

=== modified file 'AUTHORS'
--- AUTHORS	2013-10-27 00:28:23 +0000
+++ AUTHORS	2014-01-12 07:15:48 +0000
@@ -114,6 +114,7 @@
 
 For 0.3.1:
 ----------
+* Joe R. Nassimian <[e-mail]>
 * Antonio Roquentin <https://launchpad.net/~antonio-roquentin> (no email provided)
 * Codee <[e-mail]>
 * Sebastian Dyroff <[e-mail]>
 
=== modified file 'GTG/__init__.py'
--- GTG/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/__init__.py	2014-01-12 07:15:48 +0000
@@ -29,13 +29,9 @@
     locale.setlocale(locale.LC_ALL, 'C')
 
 import gettext
-try:
-    from gtk import glade
-    loaded_glade = glade
-except:
-    # that's not pretty but it looks functional.
-    loaded_glade = None
 
+# FIXME is this construction needed?
+# There are many other places where this is used
 try:
     from xdg.BaseDirectory import xdg_config_home
     config_home = xdg_config_home
@@ -48,11 +44,9 @@
 GETTEXT_DOMAIN = 'gtg'
 LOCALE_PATH = gettext.bindtextdomain(GETTEXT_DOMAIN)
 
-for module in gettext, loaded_glade:
-    # check if glade is well loaded to avoid error in Fedora build farm
-    if module:
-        module.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
-        module.textdomain(GETTEXT_DOMAIN)
+gettext.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
+gettext.textdomain(GETTEXT_DOMAIN)
+# FIXME set translation for Builder as well!
 
 translation = gettext.translation(GETTEXT_DOMAIN, LOCALE_PATH, fallback=True)
 
 
=== modified file 'GTG/backends/__init__.py'
--- GTG/backends/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/backends/__init__.py	2014-01-12 07:15:48 +0000
@@ -50,30 +50,29 @@
         """
          Creates a dictionary of the currently available backend modules
         """
-        super(BackendFactory, self).__init__()
+        Borg.__init__(self)
         if hasattr(self, "backend_modules"):
             # This object has already been constructed
             return
         self.backend_modules = {}
         # Look for backends in the GTG/backends dir
         this_dir = os.path.dirname(__file__)
-        backend_files = filter(lambda f: f.endswith(".py") and
-                               f.startswith(self.BACKEND_PREFIX),
-                               os.listdir(this_dir))
+        backend_files = [f for f in os.listdir(this_dir) if f.endswith(".py") and
+                               f.startswith(self.BACKEND_PREFIX)]
         # Create module names
-        module_names = map(lambda f: f.replace(".py", ""), backend_files)
+        module_names = [f.replace(".py", "") for f in backend_files]
         Log.debug("Backends found: " + str(module_names))
         # Load backend modules
         for module_name in module_names:
             extended_module_name = "GTG.backends." + module_name
             try:
                 __import__(extended_module_name)
-            except ImportError, exception:
+            except ImportError as exception:
                 # Something is wrong with this backend, skipping
                 Log.warning("Backend %s could not be loaded: %s" %
                            (module_name, str(exception)))
                 continue
-            except Exception, exception:
+            except Exception as exception:
                 # Other exception log as errors
                 Log.error("Malformated backend %s: %s" %
                          (module_name, str(exception)))
@@ -113,11 +112,11 @@
         # type
         parameters = module.Backend.get_static_parameters()
         # we all the parameters and their default values in dic
-        for param_name, param_dic in parameters.iteritems():
+        for param_name, param_dic in parameters.items():
             dic[param_name] = param_dic[GenericBackend.PARAM_DEFAULT_VALUE]
         dic["pid"] = str(uuid.uuid4())
         dic["module"] = module.Backend.get_name()
-        for param_name, param_value in additional_parameters.iteritems():
+        for param_name, param_value in additional_parameters.items():
             dic[param_name] = param_value
         dic["backend"] = module.Backend(dic)
         return dic
@@ -146,7 +145,7 @@
         # Building the dictionary
         parameters_specs = module.Backend.get_static_parameters()
         dic["pid"] = str(xp.getAttribute("pid"))
-        for param_name, param_dic in parameters_specs.iteritems():
+        for param_name, param_dic in parameters_specs.items():
             if xp.hasAttribute(param_name):
                 # we need to convert the parameter to the right format.
                 # we fetch the format from the static_parameters
 
=== modified file 'GTG/backends/backend_rtm.py'
--- GTG/backends/backend_rtm.py	2013-11-23 14:40:23 +0000
+++ GTG/backends/backend_rtm.py	2014-01-12 07:15:48 +0000
@@ -41,6 +41,7 @@
 from GTG.core.task import Task
 from GTG.tools.interruptible import interruptible
 from GTG.tools.logger import Log
+from functools import reduce
 
 
 class Backend(PeriodicImportBackend):
@@ -140,7 +141,7 @@
         # set
         stored_rtm_task_ids = self.sync_engine.get_all_remote()
         current_rtm_task_ids = [tid for tid in
-                                self.rtm_proxy.get_rtm_tasks_dict().iterkeys()]
+                                self.rtm_proxy.get_rtm_tasks_dict().keys()]
 
         if self._this_is_the_first_loop:
             self._on_successful_authentication()
@@ -424,7 +425,7 @@
         # tags to add
         for tag in tags.difference(gtg_tags_lower):
             gtg_all_tags = self.datastore.get_all_tags()
-            matching_tags = filter(lambda t: t.lower() == tag, gtg_all_tags)
+            matching_tags = [t for t in gtg_all_tags if t.lower() == tag]
             if len(matching_tags) != 0:
                 tag = matching_tags[0]
             task.add_tag(tag)
@@ -471,7 +472,7 @@
         three times before giving up.
         '''
         MAX_ATTEMPTS = 3
-        for i in xrange(MAX_ATTEMPTS):
+        for i in range(MAX_ATTEMPTS):
             try:
                 return fun(*args)
             except:
@@ -589,7 +590,7 @@
             self.rtm = createRTM(self.PUBLIC_KEY, self.PRIVATE_KEY, self.token)
             self.timeline = self.rtm.timelines.create().timeline
             return True
-        except (RTMError, RTMAPIError), e:
+        except (RTMError, RTMAPIError) as e:
             Log.error("RTM ERROR" + str(e))
         return False
 
@@ -890,8 +891,7 @@
             return ""
         else:
             note_list = self.__getattr_the_rtm_way(notes, 'note')
-            return "".join(map(lambda note: "%s\n" % getattr(note, '$t'),
-                               note_list))
+            return "".join(["%s\n" % getattr(note, '$t') for note in note_list])
 
     def set_text(self, text, transaction_ids=[]):
         '''
 
=== modified file 'GTG/backends/backendsignals.py'
--- GTG/backends/backendsignals.py	2013-11-23 14:40:23 +0000
+++ GTG/backends/backendsignals.py	2014-01-12 07:15:48 +0000
@@ -17,7 +17,7 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gobject
+from gi.repository import GObject
 
 from GTG.tools.borg import Borg
 
@@ -59,10 +59,10 @@
 
     @returns: tuple
     '''
-    return (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, args)
-
-
-class _BackendSignalsGObject(gobject.GObject):
+    return (GObject.SignalFlags.RUN_FIRST, None, args)
+
+
+class _BackendSignalsGObject(GObject.GObject):
 
     # signal name constants
     BACKEND_STATE_TOGGLED = 'backend-state-toggled'  # emitted when a
@@ -103,7 +103,7 @@
     # As a general rule, signals should only be emitted in the GenericBackend
     # class
     def _emit_signal(self, signal, backend_id):
-        gobject.idle_add(self.emit, signal, backend_id)
+        GObject.idle_add(self.emit, signal, backend_id)
 
     def backend_state_changed(self, backend_id):
         self._emit_signal(self.BACKEND_STATE_TOGGLED, backend_id)
@@ -118,15 +118,15 @@
         self._emit_signal(self.BACKEND_REMOVED, backend_id)
 
     def default_backend_loaded(self):
-        gobject.idle_add(self.emit, self.DEFAULT_BACKEND_LOADED)
+        GObject.idle_add(self.emit, self.DEFAULT_BACKEND_LOADED)
 
     def backend_failed(self, backend_id, error_code):
-        gobject.idle_add(self.emit, self.BACKEND_FAILED, backend_id,
+        GObject.idle_add(self.emit, self.BACKEND_FAILED, backend_id,
                          error_code)
 
     def interaction_requested(self, backend_id, description,
                               interaction_type, callback_str):
-        gobject.idle_add(self.emit, self.INTERACTION_REQUESTED,
+        GObject.idle_add(self.emit, self.INTERACTION_REQUESTED,
                          backend_id, description, interaction_type,
                          callback_str)
 
 
=== modified file 'GTG/backends/genericbackend.py'
--- GTG/backends/genericbackend.py	2013-11-23 14:40:23 +0000
+++ GTG/backends/genericbackend.py	2014-01-12 07:15:48 +0000
@@ -33,6 +33,7 @@
 from GTG.core import CoreConfig
 from GTG.tools.logger import Log
 from GTG.tools.interruptible import _cancellation_point
+from functools import reduce
 
 PICKLE_BACKUP_NBR = 2
 
@@ -261,9 +262,9 @@
         if cls._general_description[cls.BACKEND_TYPE] == \
                 cls.TYPE_READWRITE:
             for key, value in \
-                    cls._static_parameters_obligatory_for_rw.iteritems():
+                    cls._static_parameters_obligatory_for_rw.items():
                 temp_dic[key] = value
-        for key, value in cls._static_parameters.iteritems():
+        for key, value in cls._static_parameters.items():
             temp_dic[key] = value
         return temp_dic
 
@@ -537,7 +538,7 @@
         # mkdir -p
         try:
             os.makedirs(os.path.dirname(path))
-        except OSError, exception:
+        except OSError as exception:
             if exception.errno != errno.EEXIST:
                 raise
 
 
=== modified file 'GTG/backends/generictomboy.py'
--- GTG/backends/generictomboy.py	2014-01-01 11:43:36 +0000
+++ GTG/backends/generictomboy.py	2014-01-12 07:15:48 +0000
@@ -126,7 +126,7 @@
             while True:
                 try:
                     [key, timer] = \
-                        self._tomboy_setting_timers.iteritems().next()
+                        next(iter(self._tomboy_setting_timers.items()))
                 except StopIteration:
                     break
                 timer.cancel()
@@ -416,12 +416,12 @@
         try:
             end_of_title = content.index('\n')
         except ValueError:
-            return content, unicode("")
+            return content, str("")
         title = content[: end_of_title]
         if len(content) > end_of_title:
             return title, content[end_of_title + 1:]
         else:
-            return title, unicode("")
+            return title, str("")
 
     def _populate_task(self, task, note):
         '''
@@ -438,10 +438,10 @@
         # update the tags list
         task.set_only_these_tags(extract_tags_from_text(content))
         # extract title and text
-        [title, text] = self._tomboy_split_title_and_text(unicode(content))
+        [title, text] = self._tomboy_split_title_and_text(str(content))
         # Tomboy speaks unicode, we don't
-        title = unicodedata.normalize('NFKD', title).encode('ascii', 'ignore')
-        text = unicodedata.normalize('NFKD', text).encode('ascii', 'ignore')
+        title = unicodedata.normalize('NFKD', title)
+        text = unicodedata.normalize('NFKD', text)
         task.set_title(title)
         task.set_text(text)
         task.add_remote_id(self.get_id(), note)
@@ -467,7 +467,7 @@
         # tomboy passes Dbus.String objects, which are not pickable. We convert
         # those to unicode
         if "remote_id" in kwargs:
-            kwargs["remote_id"] = unicode(kwargs["remote_id"])
+            kwargs["remote_id"] = str(kwargs["remote_id"])
         try:
             self.sync_engine.break_relationship(*args, **kwargs)
             # we try to save the state at each change in the sync_engine:
@@ -485,7 +485,7 @@
         # tomboy passes Dbus.String objects, which are not pickable. We convert
         # those to unicode
         if "remote_id" in kwargs:
-            kwargs["remote_id"] = unicode(kwargs["remote_id"])
+            kwargs["remote_id"] = str(kwargs["remote_id"])
 
         self.sync_engine.record_relationship(*args, **kwargs)
         # we try to save the state at each change in the sync_engine:
 
=== modified file 'GTG/backends/rtm/rtm.py'
--- GTG/backends/rtm/rtm.py	2013-02-25 08:12:02 +0000
+++ GTG/backends/rtm/rtm.py	2014-01-12 07:15:48 +0000
@@ -8,7 +8,7 @@
 )
 
 
-import urllib
+import urllib.request, urllib.parse, urllib.error
 from hashlib import md5
 
 from GTG import _
@@ -80,7 +80,7 @@
         self.authInfo = AuthStateMachine(['frob', 'token'])
 
         # this enables one to do 'rtm.tasks.getList()', for example
-        for prefix, methods in API.items():
+        for prefix, methods in list(API.items()):
             setattr(self, prefix,
                     RTMAPICategory(self, prefix, methods))
 
@@ -130,7 +130,7 @@
             'frob': frob
         }
         params['api_sig'] = self._sign(params)
-        return AUTH_SERVICE_URL + '?' + urllib.urlencode(params)
+        return AUTH_SERVICE_URL + '?' + urllib.parse.urlencode(params)
 
     def getToken(self):
         frob = self.authInfo.get('frob')
@@ -178,7 +178,7 @@
 # Utility functions
 def sortedItems(dictionary):
     "Return a list of (key, value) sorted based on keys"
-    keys = dictionary.keys()
+    keys = list(dictionary.keys())
     keys.sort()
     for key in keys:
         yield key, dictionary[key]
@@ -186,9 +186,9 @@
 
 def openURL(url, queryArgs=None):
     if queryArgs:
-        url = url + '?' + urllib.urlencode(queryArgs)
+        url = url + '?' + urllib.parse.urlencode(queryArgs)
     # LOG.debug("URL> %s", url)
-    return urllib.urlopen(url)
+    return urllib.request.urlopen(url)
 
 
 class dottedDict(object):
@@ -198,7 +198,7 @@
         self._name = name
 
         if type(dictionary) is dict:
-            for key, value in dictionary.items():
+            for key, value in list(dictionary.items()):
                 if type(value) is dict:
                     value = dottedDict(key, value)
                 elif type(value) in (list, tuple) and key != 'tag':
@@ -396,12 +396,12 @@
     rtm = createRTM(apiKey, secret, token)
 
     rspTasks = rtm.tasks.getList(filter='dueWithin:"1 week of today"')
-    print [t.name for t in rspTasks.tasks.list.taskseries]
-    print rspTasks.tasks.list.id
+    print([t.name for t in rspTasks.tasks.list.taskseries])
+    print(rspTasks.tasks.list.id)
 
     rspLists = rtm.lists.getList()
     # print rspLists.lists.list
-    print [(x.name, x.id) for x in rspLists.lists.list]
+    print([(x.name, x.id) for x in rspLists.lists.list])
 
 
 def set_log_level(level):
 
=== modified file 'GTG/core/__init__.py'
--- GTG/core/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/core/__init__.py	2014-01-12 07:15:48 +0000
@@ -37,8 +37,8 @@
 
 #=== IMPORT ===================================================================
 from re import findall
+import configparser
 
-import ConfigParser
 from xdg.BaseDirectory import xdg_data_home, xdg_config_home, xdg_data_dirs
 import os
 
@@ -132,8 +132,8 @@
             toreturn = DEFAULTS[self._section][option]
             self.set(option, toreturn)
         else:
-            print "Warning : no default conf value for %s in %s" % (
-                option, self._section)
+            print("Warning : no default conf value for %s in %s" % (
+                option, self._section))
             toreturn = None
         return toreturn
 
@@ -208,10 +208,10 @@
     def check_config_file(self, path):
         """ This function bypasses the errors of config file and allows GTG
         to open smoothly"""
-        config = ConfigParser.ConfigParser()
+        config = configparser.ConfigParser()
         try:
             config.read(path)
-        except ConfigParser.Error:
+        except configparser.Error:
             open(path, "w").close()
         return config
 
 
=== modified file 'GTG/core/datastore.py'
--- GTG/core/datastore.py	2013-11-23 14:40:23 +0000
+++ GTG/core/datastore.py	2014-01-12 07:15:48 +0000
@@ -106,7 +106,6 @@
     ### Tags functions ########################################################
     def _add_new_tag(self, name, tag, filter_func, parameters, parent_id=None):
         """ Add tag into a tree """
-        name = name.encode("UTF-8")
         if self._tagstore.has_node(name):
             raise IndexError('tag %s was already in the datastore' % name)
 
@@ -120,7 +119,6 @@
 
         @returns GTG.core.tag.Tag: the new tag
         """
-        name = name.encode("UTF-8")
         parameters = {'tag': name}
         tag = Tag(name, req=self.requester, attributes=attributes)
         self._add_new_tag(name, tag, self.treefactory.tag_filter, parameters)
@@ -134,12 +132,11 @@
         """
         try:
             parameters = parse_search_query(query)
-        except InvalidQuery, e:
+        except InvalidQuery as e:
             Log.warning("Problem with parsing query '%s' (skipping): %s" %
                        (query, e.message))
             return None
 
-        name = name.encode("UTF-8")
 
         # Create own copy of attributes and add special attributes label, query
         init_attr = dict(attributes)
@@ -176,7 +173,7 @@
         tag = self.get_tag(oldname)
 
         if not tag.is_search_tag():
-            print "Tag renaming not implemented yet"
+            print("Tag renaming not implemented yet")
             return None
 
         query = tag.get_attribute("query")
@@ -360,7 +357,7 @@
         @return list: a list of TaskSource objects
         """
         result = []
-        for backend in self.backends.itervalues():
+        for backend in self.backends.values():
             if backend.is_enabled() or disabled:
                 result.append(backend)
         return result
@@ -437,7 +434,7 @@
             return
 
         self.is_default_backend_loaded = True
-        for backend in self.backends.itervalues():
+        for backend in self.backends.values():
             if backend.is_enabled() and not backend.is_default():
                 self._backend_startup(backend)
 
@@ -565,7 +562,7 @@
                 thread = threading.Thread(target=b.quit)
                 threads_dic[b.get_id()] = thread
                 thread.start()
-            for backend_id, thread in threads_dic.iteritems():
+            for backend_id, thread in threads_dic.items():
                 # after 20 seconds, we give up
                 thread.join(20)
                 if thread.isAlive():
@@ -574,7 +571,7 @@
         # we save the parameters
         for b in self.get_all_backends(disabled=True):
             t_xml = doc.createElement("backend")
-            for key, value in b.get_parameters().iteritems():
+            for key, value in b.get_parameters().items():
                 if key in ["backend", "xmlobject"]:
                     # We don't want parameters, backend, xmlobject:
                     # we'll create them at next startup
 
=== modified file 'GTG/core/plugins/__init__.py'
--- GTG/core/plugins/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/core/plugins/__init__.py	2014-01-12 07:15:48 +0000
@@ -21,15 +21,10 @@
 # This is the tool package. It contains some useful function and tool
 # that could be useful for any part of GTG.
 
-import os
-
 from GTG import _
 
 
 class GnomeConfig:
-    current_rep = os.path.dirname(os.path.abspath(__file__))
-    GLADE_FILE = os.path.join(current_rep, "pluginmanager.glade")
-
     CANLOAD = _("Everything necessary to run this plugin is available.")
     CANNOTLOAD = _("The plugin can not be loaded")
     miss1 = _("Some python modules are missing")
 
=== modified file 'GTG/core/plugins/api.py'
--- GTG/core/plugins/api.py	2014-01-02 07:08:53 +0000
+++ GTG/core/plugins/api.py	2014-01-12 07:15:48 +0000
@@ -135,7 +135,7 @@
         """Adds a menu entry to the Plugin Menu of the Main Window
         (task browser).
 
-        @param item: The gtk.MenuItem that is going to be added.
+        @param item: The Gtk.MenuItem that is going to be added.
         """
         widget = self.__builder.get_object('plugin_mi')
         widget.get_submenu().append(item)
@@ -145,7 +145,7 @@
         """Removes a menu entry from the Plugin Menu of the Main Window
         (task browser).
 
-        @param item: The gtk.MenuItem that is going to be removed.
+        @param item: The Gtk.MenuItem that is going to be removed.
         @return: Returns C{True} if the operation has sucess or c{False} if it
         fails.
         """
@@ -162,7 +162,7 @@
         """Adds a button to the task browser's toolbar or the task editor
         toolbar, depending on which plugin api it's being used.
 
-        @param widget: The gtk.ToolButton that is going to be added to the
+        @param widget: The Gtk.ToolButton that is going to be added to the
         toolbar.
         """
         #-1 means "append to the end"
@@ -174,17 +174,17 @@
         """
         try:
             self.__toolbar.remove(widget)
-        except Exception, e:
-            print "Error removing the toolbar item in the TaskEditor: %s" % e
+        except Exception as e:
+            print("Error removing the toolbar item in the TaskEditor: %s" % e)
 
     def add_widget_to_taskeditor(self, widget):
         """Adds a widget to the bottom of the task editor dialog
 
-        @param widget: The gtk.Widget that is going to be added.
+        @param widget: The Gtk.Widget that is going to be added.
         """
         vbox = self.__builder.get_object('vbox4')
         if vbox:
-            vbox.pack_start(widget)
+            vbox.pack_start(widget, True, True, 0)
             vbox.reorder_child(widget, -2)
             widget.show_all()
             self.taskwidget_id += 1
@@ -196,14 +196,14 @@
     def remove_widget_from_taskeditor(self, widg_id):
         """Remove a widget from the bottom of the task editor dialog
 
-        @param widget: The gtk.Widget that is going to be removed
+        @param widget: The Gtk.Widget that is going to be removed
         """
         if self.is_editor() and widg_id:
             try:
                 wi = self.__builder.get_object('vbox4')
                 if wi and widg_id in self.taskwidget_widg:
                     wi.remove(self.taskwidget_widg.pop(widg_id))
-            except Exception, e:
+            except Exception as e:
                 Log.debug("Error removing the toolbar item in the TaskEditor:"
                           "%s" % e)
 
@@ -219,7 +219,7 @@
         if func is None:
             func = browser.tv_factory.task_bg_color
 
-        for pane in browser.vtree_panes.itervalues():
+        for pane in browser.vtree_panes.values():
             pane.set_bg_color(func, 'bg_color')
             pane.basetree.get_basetree().refresh_all()
 
 
=== modified file 'GTG/core/plugins/engine.py'
--- GTG/core/plugins/engine.py	2013-11-23 14:40:23 +0000
+++ GTG/core/plugins/engine.py	2014-01-12 07:15:48 +0000
@@ -19,7 +19,7 @@
 import imp
 import os
 import types
-import ConfigParser
+import configparser
 
 import dbus
 
@@ -53,7 +53,7 @@
             'module_depends': 'dependencies',
             'dbus_depends': 'dbus-dependencies',
         }
-        for attr, field in info_fields.iteritems():
+        for attr, field in info_fields.items():
             try:
                 setattr(self, attr, info[field])
             except KeyError:
@@ -122,12 +122,12 @@
             f, pathname, desc = imp.find_module(self.module_name, module_path)
             module = imp.load_module(self.module_name, f, pathname, desc)
             # find the class object for the actual plugin
-            for key, item in module.__dict__.iteritems():
-                if isinstance(item, types.ClassType):
+            for key, item in module.__dict__.items():
+                if isinstance(item, type):
                     self.plugin_class = item
                     self.class_name = item.__dict__['__module__'].split('.')[1]
                     break
-        except ImportError, e:
+        except ImportError as e:
             # load_module() failed, probably because of a module dependency
             if len(self.module_depends) > 0:
                 self._check_module_depends()
@@ -135,7 +135,7 @@
                 # no dependencies in info file; use the ImportError instead
                 self.missing_modules.append(str(e).split(" ")[3])
             self.error = True
-        except Exception, e:
+        except Exception as e:
             # load_module() failed for some other reason
             Log.error(e)
             self.error = True
@@ -169,9 +169,9 @@
             for f in os.listdir(path):
                 info_file = os.path.join(path, f)
                 if os.path.isfile(info_file) and f.endswith('.gtg-plugin'):
-                    info = ConfigParser.ConfigParser()
+                    info = configparser.ConfigParser()
                     info.read(info_file)
-                    info = dict(info.items("GTG Plugin"))
+                    info = dict(info.items("GTG Plugin", True))
                     p = Plugin(info, self.plugin_path)
                     self.plugins[p.module_name] = p
 
@@ -188,7 +188,7 @@
                                        "disabled",
                                        "all"
         """
-        all_plugins = self.plugins.itervalues()
+        all_plugins = iter(self.plugins.values())
         if kind_of_plugins == "all":
             return all_plugins
 
@@ -197,7 +197,7 @@
                    (kind_of_plugins == "inactive" and not plugin.active) or
                    (kind_of_plugins == "enabled" and plugin.enabled) or
                    (kind_of_plugins == "disabled" and not plugin.enabled))
-        return filter(filter_fun, all_plugins)
+        return list(filter(filter_fun, all_plugins))
 
     def register_api(self, api):
         '''Adds a plugin api to the list of currently loaded apis'''
@@ -287,8 +287,8 @@
                         plugin.enabled = False
                     else:
                         self.activate_plguins(self.plugin_apis, [plugin])
-            except Exception, e:
-                print "Error: %s" % e
+            except Exception as e:
+                print("Error: %s" % e)
 
     def recheck_plugin_errors(self, check_all=False):
         """Attempt a reload of plugins with errors, or all plugins."""
 
=== modified file 'GTG/core/requester.py'
--- GTG/core/requester.py	2013-11-23 14:40:23 +0000
+++ GTG/core/requester.py	2014-01-12 07:15:48 +0000
@@ -21,13 +21,13 @@
 A nice general purpose interface for the datastore and tagstore
 """
 
-import gobject
+from gi.repository import GObject
 
 from GTG.core.tag import Tag
 from GTG.tools.logger import Log
 
 
-class Requester(gobject.GObject):
+class Requester(GObject.GObject):
     """ A view on a GTG datastore.
 
     L{Requester} is a stateless object that simply provides a nice API for
@@ -39,7 +39,7 @@
 
     def __init__(self, datastore, global_conf):
         """Construct a L{Requester}."""
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
         self.ds = datastore
         self.__config = global_conf
         self.__basetree = self.ds.get_tasks_tree()
@@ -198,7 +198,7 @@
         tagstore = self.ds.get_tagstore()
         view = tagstore.get_viewtree(name='tag_completion', refresh=False)
         tags = view.get_all_nodes()
-        tags.sort(cmp=lambda x, y: cmp(x.lower(), y.lower()))
+        tags.sort(key=str.lower)
         return tags
 
     def get_all_tags(self):
 
=== modified file 'GTG/core/tag.py'
--- GTG/core/tag.py	2013-11-23 14:40:23 +0000
+++ GTG/core/tag.py	2014-01-12 07:15:48 +0000
@@ -28,6 +28,7 @@
 
 from GTG.core import CoreConfig
 from liblarch import TreeNode
+from functools import reduce
 
 
 class Tag(TreeNode):
@@ -54,7 +55,7 @@
         self.req = req
         self._save = None
         self._attributes = {'name': self._name}
-        for key, value in attributes.iteritems():
+        for key, value in attributes.items():
             self.set_attribute(key, value)
 
         self.viewcount = None
@@ -126,7 +127,7 @@
             modified = True
         else:
             # Attributes should all be strings.
-            val = unicode(str(att_value), "UTF-8")
+            val = str(att_value)
             self._attributes[att_name] = val
             if self._save:
                 self._save()
@@ -174,7 +175,7 @@
             names.
         @param withparent: If True, the "parent" attribute is attached
         """
-        attributes = self._attributes.keys()
+        attributes = list(self._attributes.keys())
         if butname:
             attributes.remove('name')
         if withparent:
 
=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2013-12-17 14:39:47 +0000
+++ GTG/core/task.py	2014-01-12 07:15:48 +0000
@@ -47,7 +47,7 @@
         TreeNode.__init__(self, ze_id)
         # the id of this task in the project should be set
         # tid is a string ! (we have to choose a type and stick to it)
-        assert(isinstance(ze_id, str) or isinstance(ze_id, unicode))
+        assert(isinstance(ze_id, str) or isinstance(ze_id, str))
         self.tid = str(ze_id)
         self.set_uuid(uuid.uuid4())
         self.remote_ids = {}
@@ -128,8 +128,6 @@
         # We should check for other task with the same title
         # In that case, we should add a number (like Tomboy does)
         old_title = self.title
-        if isinstance(title, str):
-            title = title.decode('utf8')
         if title:
             self.title = title.strip('\t\n')
         else:
@@ -360,7 +358,8 @@
         return self.due_date
 
     def get_urgent_date(self):
-        """Returns the most urgent due date among the task and it's subtasks"""
+        """ Returns the most urgent due date among the tasks and its subtasks
+        """
         urg_date = self.due_date
         for sub in self.get_subtasks():
             sub_urg_date = sub.get_urgent_date()
@@ -568,7 +567,7 @@
     #        (Lionel)
     # Agreed. it's only used by the "add tag to all subtasks" widget.
     def get_self_and_all_subtasks(self, active_only=False, tasks=[]):
-        print "DEPRECATED FUNCTION: get_self_and_all_subtasks"
+        print("DEPRECATED FUNCTION: get_self_and_all_subtasks")
         tasks.append(self)
         for tid in self.get_children():
             i = self.req.get_task(tid)
@@ -579,7 +578,7 @@
 
     def get_subtask(self, tid):
         # FIXME : remove this function. This is not useful
-        print "DEPRECATED: get_subtask"
+        print("DEPRECATED: get_subtask")
         """Return the task corresponding to a given ID.
 
         @param tid: the ID of the task to return.
@@ -605,7 +604,7 @@
         @param att_value: The value of the attribute. Will be converted to a
             string.
         """
-        val = unicode(str(att_value), "UTF-8")
+        val = str(att_value)
         self.attributes[(namespace, att_name)] = val
         self.sync()
 
@@ -662,18 +661,17 @@
         """
         Adds a tag. Does not add '@tag' to the contents. See add_tag
         """
-        t = tagname.encode("UTF-8")
         # Do not add the same tag twice
-        if not t in self.tags:
-            self.tags.append(t)
+        if not tagname in self.tags:
+            self.tags.append(tagname)
             if self.is_loaded():
                 for child in self.get_subtasks():
                     if child.can_be_deleted:
-                        child.add_tag(t)
+                        child.add_tag(tagname)
 
-                tag = self.req.get_tag(t)
+                tag = self.req.get_tag(tagname)
                 if not tag:
-                    tag = self.req.new_tag(t)
+                    tag = self.req.new_tag(tagname)
                 tag.modified()
             return True
 
 
=== modified file 'GTG/gtg.py'
--- GTG/gtg.py	2013-11-23 14:40:23 +0000
+++ GTG/gtg.py	2014-01-12 07:15:48 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
 # Getting Things GNOME! - a personal organizer for the GNOME desktop
@@ -74,7 +74,7 @@
     pidfile = os.path.join(directory, "gtg.pid")
     if not os.path.exists(pidfile):
         open(pidfile, "w").close()
-        os.chmod(pidfile, 0600)
+        os.chmod(pidfile, 0o600)
 
     # see if gtg is already running
     pid = open(pidfile, "r").readline()
@@ -82,7 +82,7 @@
         p = os.system("/bin/ps %s >/dev/null" % pid)
         p_name = os.popen("/bin/ps -f %s" % pid).read()
         if p == 0 and "gtg" in p_name:
-            print _("gtg is already running!")
+            print(_("gtg is already running!"))
             try:
                 d = dbus.SessionBus().get_object(CoreConfig.BUSNAME,
                                                  CoreConfig.BUSINTERFACE)
 
=== modified file 'GTG/gtk/__init__.py'
--- GTG/gtk/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/__init__.py	2014-01-12 07:15:48 +0000
@@ -17,14 +17,14 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-""" Configuration for browser, it contains path to .glade files """
+""" Configuration for browser, it contains path to .ui files """
 
 import os
 
 
-class ViewConfig:
+class ViewConfig(object):
     current_rep = os.path.dirname(os.path.abspath(__file__))
-    DELETE_GLADE_FILE = os.path.join(current_rep, "deletion.glade")
-    PREFERENCES_GLADE_FILE = os.path.join(current_rep, "preferences.glade")
-    PLUGINS_GLADE_FILE = os.path.join(current_rep, "plugins.glade")
-    BACKENDS_GLADE_FILE = os.path.join(current_rep, "backends_dialog.glade")
+    DELETE_UI_FILE = os.path.join(current_rep, "deletion.ui")
+    PREFERENCES_UI_FILE = os.path.join(current_rep, "preferences.ui")
+    PLUGINS_UI_FILE = os.path.join(current_rep, "plugins.ui")
+    BACKENDS_UI_FILE = os.path.join(current_rep, "backends_dialog.ui")
 
=== renamed file 'GTG/gtk/backends_dialog.glade' => 'GTG/gtk/backends_dialog.ui'
--- GTG/gtk/backends_dialog.glade	2012-11-10 12:08:18 +0000
+++ GTG/gtk/backends_dialog.ui	2014-01-12 07:15:48 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -11,7 +10,7 @@
   <object class="GtkWindow" id="backends_dialog">
     <property name="can_focus">False</property>
     <property name="window_position">mouse</property>
-    <signal name="delete-event" handler="on_BackendsDialog_delete_event" swapped="no"/>
+    <signal name="delete_event" handler="on_BackendsDialog_delete_event"/>
     <child>
       <object class="GtkAlignment" id="alignment1">
         <property name="visible">True</property>
@@ -21,19 +20,21 @@
         <property name="left_padding">10</property>
         <property name="right_padding">10</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">10</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="big_central_hbox">
+              <object class="GtkBox" id="big_central_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">10</property>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkViewport" id="treeview_window">
                         <property name="height_request">400</property>
@@ -60,7 +61,7 @@
                         <property name="left_padding">10</property>
                         <property name="right_padding">10</property>
                         <child>
-                          <object class="GtkHButtonBox" id="hbuttonbox3">
+                          <object class="GtkButtonBox" id="hbuttonbox3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">10</property>
@@ -145,7 +146,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox2">
+              <object class="GtkButtonBox" id="hbuttonbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="layout_style">edge</property>
 
=== modified file 'GTG/gtk/backends_dialog/__init__.py'
--- GTG/gtk/backends_dialog/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/__init__.py	2014-01-12 07:15:48 +0000
@@ -26,7 +26,7 @@
     panel (these are called also "views" in this class)
 '''
 
-import gtk
+from gi.repository import Gtk
 
 from webbrowser import open as openurl
 
@@ -68,9 +68,8 @@
         self.backends_tv = None
         self.config_panel = None
         self.add_panel = None
-        # Load from Glade
-        builder = gtk.Builder()
-        self._load_widgets_from_glade(builder)
+        builder = Gtk.Builder()
+        self._load_widgets_from_builder(builder)
         # Load and setup other widgets
         self.dialog.set_title(_("Synchronization Services - %s" % info.NAME))
         self._create_widgets_for_add_panel()
@@ -119,14 +118,14 @@
         @param height: the height of the returned pixbuf
         @param width:  the width of the returned pixbuf
 
-        @returns gtk.gdk.Pixbuf: a pixbuf containing the wanted icon, or None
+        @returns GdkPixbuf: a pixbuf containing the wanted icon, or None
         (if the icon is not present)
         '''
         icon_info = self.icon_theme.lookup_icon(name, height, 0)
         if icon_info is None:
             return None
         else:
-            return gtk.icon_theme_get_default().load_icon(name, height, 0)
+            return Gtk.IconTheme.get_default().load_icon(name, height, 0)
 
     def _show_panel(self, panel_name):
         '''
@@ -147,7 +146,7 @@
             Log.error("panel name unknown")
             return
         # Central pane
-        # NOTE: self.central_pane is the gtk.Container in which we load panels
+        # NOTE: self.central_pane is the Gtk.Container in which we load panels
         if panel_to_remove in self.central_pane:
             self.central_pane.remove(panel_to_remove)
         if not panel_to_add in self.central_pane:
@@ -167,13 +166,13 @@
 ########################################
 ### WIDGETS AND SIGNALS ################
 ########################################
-    def _load_widgets_from_glade(self, builder):
+    def _load_widgets_from_builder(self, builder):
         '''
-        Loads widgets from the glade file
+        Loads widgets from the builder .ui file
 
-        @param builder: a gtk.Builder
+        @param builder: a Gtk.Builder
         '''
-        builder.add_from_file(ViewConfig.BACKENDS_GLADE_FILE)
+        builder.add_from_file(ViewConfig.BACKENDS_UI_FILE)
         widgets = {
             'dialog': 'backends_dialog',
             'treeview_window': 'treeview_window',
@@ -181,14 +180,14 @@
             'add_button': 'add_button',
             'remove_button': 'remove_button',
         }
-        for attr, widget in widgets.iteritems():
+        for attr, widget in widgets.items():
             setattr(self, attr, builder.get_object(widget))
 
     def _setup_signal_connections(self, builder):
         '''
         Creates some GTK signals connections
 
-        @param builder: a gtk.Builder
+        @param builder: a Gtk.Builder
         '''
         signals = {
             'on_add_button_clicked': self.on_add_button,
@@ -205,7 +204,7 @@
         Inform gtk on the location of the backends icons (which is in
         the GTG directory tree, and not in the default location for icons
         '''
-        self.icon_theme = gtk.icon_theme_get_default()
+        self.icon_theme = Gtk.IconTheme.get_default()
         for directory in CoreConfig().get_icons_directories():
             self.icon_theme.prepend_search_path(directory)
 
@@ -285,17 +284,17 @@
             # no backend selected
             return
         backend = self.req.get_backend(backend_id)
-        dialog = gtk.MessageDialog(
+        dialog = Gtk.MessageDialog(
             parent=self.dialog,
-            flags=gtk.DIALOG_DESTROY_WITH_PARENT,
-            type=gtk.MESSAGE_QUESTION,
-            buttons=gtk.BUTTONS_YES_NO,
+            flags=Gtk.DialogFlags.DESTROY_WITH_PARENT,
+            type=Gtk.MessageType.QUESTION,
+            buttons=Gtk.ButtonsType.YES_NO,
             message_format=_("Do you really want to remove the '%s' "
                              "synchronization service?") %
             backend.get_human_name())
         response = dialog.run()
         dialog.destroy()
-        if response == gtk.RESPONSE_YES:
+        if response == Gtk.ResponseType.YES:
             # delete the backend and remove it from the lateral treeview
             self.req.remove_backend(backend_id)
             self.backends_tv.remove_backend(backend_id)
 
=== modified file 'GTG/gtk/backends_dialog/addpanel.py'
--- GTG/gtk/backends_dialog/addpanel.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/addpanel.py	2014-01-12 07:15:48 +0000
@@ -17,16 +17,18 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 
 from GTG.gtk.backends_dialog.backendscombo import BackendsCombo
 from GTG.backends import BackendFactory
 from GTG import _, ngettext
-
-
-class AddPanel(gtk.VBox):
+from functools import reduce
+
+
+class AddPanel(Gtk.Box):
     '''
-    A VBox filled with gtk widgets to let the user choose a new backend.
+    A vertical Box filled with gtk widgets to let the user choose a new
+    backend.
     '''
 
     def __init__(self, backends_dialog):
@@ -36,7 +38,7 @@
         @param backends_dialog: a reference to the dialog in which this is
         loaded
         '''
-        super(AddPanel, self).__init__()
+        super(AddPanel, self).__init__(orientation=Gtk.Orientation.VERTICAL)
         self.dialog = backends_dialog
         self._create_widgets()
 
@@ -46,90 +48,90 @@
         '''
         # Division of the available space in three segments:
         # top, middle and bottom.
-        top = gtk.HBox()
+        top = Gtk.Box()
         top.set_spacing(6)
-        middle = gtk.HBox()
-        bottom = gtk.HBox()
-        self._fill_top_hbox(top)
-        self._fill_middle_hbox(middle)
-        self._fill_bottom_hbox(bottom)
-        self.pack_start(top, False)
-        self.pack_start(middle, True)
-        self.pack_start(bottom, True)
+        middle = Gtk.Box()
+        bottom = Gtk.Box()
+        self._fill_top_box(top)
+        self._fill_middle_box(middle)
+        self._fill_bottom_box(bottom)
+        self.pack_start(top, False, True, 0)
+        self.pack_start(middle, True, True, 0)
+        self.pack_start(bottom, True, True, 0)
         self.set_border_width(12)
 
-    def _fill_top_hbox(self, hbox):
+    def _fill_top_box(self, box):
         '''
-        Helper function to fill and hbox with a combobox that lists the
-        available backends and a gtk.Label.
+        Helper function to fill and box with a combobox that lists the
+        available backends and a Gtk.Label.
 
-        @param hbox: the gtk.HBox to fill
+        @param box: the Gtk.Box to fill
         '''
-        label = gtk.Label(_("Select synchronization service:"))
+        label = Gtk.Label(label=_("Select synchronization service:"))
         label.set_alignment(0, 0.5)
         self.combo_types = BackendsCombo(self.dialog)
-        self.combo_types.child.connect('changed', self.on_combo_changed)
-        hbox.pack_start(label, False, True)
-        hbox.pack_start(self.combo_types, False, True)
-
-    def _fill_middle_hbox(self, hbox):
-        '''
-        Helper function to fill an hbox with a label describing the backend
-        and a gtk.Image (that loads the backend image)
-
-        @param hbox: the gtk.HBox to fill
-        '''
-        self.label_name = gtk.Label("name")
+        #FIXME
+        #self.combo_types.get_child().connect('changed', self.on_combo_changed)
+        self.combo_types.connect('changed', self.on_combo_changed)
+        box.pack_start(label, False, True, 0)
+        box.pack_start(self.combo_types, False, True, 0)
+
+    def _fill_middle_box(self, box):
+        '''
+        Helper function to fill an box with a label describing the backend
+        and a Gtk.Image (that loads the backend image)
+
+        @param box: the Gtk.Box to fill
+        '''
+        self.label_name = Gtk.Label(label="name")
         self.label_name.set_alignment(xalign=0.5, yalign=1)
-        self.label_description = gtk.Label()
-        self.label_description.set_justify(gtk.JUSTIFY_FILL)
+        self.label_description = Gtk.Label()
+        self.label_description.set_justify(Gtk.Justification.FILL)
         self.label_description.set_line_wrap(True)
         self.label_description.set_size_request(300, -1)
         self.label_description.set_alignment(xalign=0, yalign=0.5)
-        self.label_author = gtk.Label("")
+        self.label_author = Gtk.Label(label="")
         self.label_author.set_line_wrap(True)
         self.label_author.set_alignment(xalign=0, yalign=0)
-        self.label_modules = gtk.Label("")
+        self.label_modules = Gtk.Label(label="")
         self.label_modules.set_line_wrap(True)
         self.label_modules.set_alignment(xalign=0, yalign=0)
-        self.image_icon = gtk.Image()
+        self.image_icon = Gtk.Image()
         self.image_icon.set_size_request(128, 128)
-        align_image = gtk.Alignment(xalign=1, yalign=0)
+        align_image = Gtk.Alignment.new(1, 0, 0, 0)
         align_image.add(self.image_icon)
-        labels_vbox = gtk.VBox()
-        labels_vbox.pack_start(self.label_description, True, True, padding=10)
-        labels_vbox.pack_start(self.label_author, True, True)
-        labels_vbox.pack_start(self.label_modules, True, True)
-        low_hbox = gtk.HBox()
-        low_hbox.pack_start(labels_vbox, True, True)
-        low_hbox.pack_start(align_image, True, True)
-        vbox = gtk.VBox()
-        vbox.pack_start(self.label_name, True, True)
-        vbox.pack_start(low_hbox, True, True)
-        hbox.pack_start(vbox, True, True)
+        labels_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        labels_vbox.pack_start(self.label_description, True, True, 10)
+        labels_vbox.pack_start(self.label_author, True, True, 0)
+        labels_vbox.pack_start(self.label_modules, True, True, 0)
+        low_box = Gtk.Box()
+        low_box.pack_start(labels_vbox, True, True, 0)
+        low_box.pack_start(align_image, True, True, 0)
+        vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        vbox.pack_start(self.label_name, True, True, 0)
+        vbox.pack_start(low_box, True, True, 0)
+        box.pack_start(vbox, True, True, 0)
 
-    def _fill_bottom_hbox(self, hbox):
+    def _fill_bottom_box(self, box):
         '''
-        Helper function to fill and hbox with a buttonbox, featuring
+        Helper function to fill and box with a buttonbox, featuring
         and ok and cancel buttons.
 
-        @param hbox: the gtk.HBox to fill
+        @param box: the Gtk.Box to fill
         '''
-        cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL)
+        cancel_button = Gtk.Button(stock=Gtk.STOCK_CANCEL)
         cancel_button.connect('clicked', self.on_cancel)
-        self.ok_button = gtk.Button(stock=gtk.STOCK_OK)
+        self.ok_button = Gtk.Button(stock=Gtk.STOCK_OK)
         self.ok_button.connect('clicked', self.on_confirm)
-        align = gtk.Alignment(xalign=0.5,
-                              yalign=1,
-                              xscale=1)
+        align = Gtk.Alignment.new(0.5, 1, 1, 0)
         align.set_padding(0, 10, 0, 0)
-        buttonbox = gtk.HButtonBox()
-        buttonbox.set_layout(gtk.BUTTONBOX_EDGE)
+        buttonbox = Gtk.ButtonBox()
+        buttonbox.set_layout(Gtk.ButtonBoxStyle.EDGE)
         buttonbox.add(cancel_button)
         buttonbox.set_child_secondary(cancel_button, False)
         buttonbox.add(self.ok_button)
         align.add(buttonbox)
-        hbox.pack_start(align, True, True)
+        box.pack_start(align, True, True, 0)
 
     def refresh_backends(self):
         '''Populates the combo box containing the available backends'''
@@ -137,7 +139,7 @@
 
     def on_confirm(self, widget=None):
         '''
-        Notifies the dialog holding this VBox that a backend has been
+        Notifies the dialog holding this Box that a backend has been
         chosen
 
         @param widget: just to make this function usable as a signal callback.
 
=== modified file 'GTG/gtk/backends_dialog/backendscombo.py'
--- GTG/gtk/backends_dialog/backendscombo.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/backendscombo.py	2014-01-12 07:15:48 +0000
@@ -17,12 +17,13 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
+from gi.repository import GdkPixbuf
 
 from GTG.backends import BackendFactory
 
 
-class BackendsCombo(gtk.ComboBoxEntry):
+class BackendsCombo(Gtk.ComboBox):
     '''
     A combobox listing all the available backends types
     '''
@@ -39,7 +40,7 @@
         @param backends_dialog: reference to the dialog in which this combo is
                                 loaded.
         '''
-        super(BackendsCombo, self).__init__()
+        Gtk.ComboBox.__init__(self)
         self.dialog = backends_dialog
         self._liststore_init()
         self._renderers_init()
@@ -47,18 +48,18 @@
         self.show_all()
 
     def _liststore_init(self):
-        '''Setup the gtk.ListStore'''
-        self.liststore = gtk.ListStore(str, str, gtk.gdk.Pixbuf)
+        '''Setup the Gtk.ListStore'''
+        self.liststore = Gtk.ListStore(str, str, GdkPixbuf.Pixbuf)
         self.set_model(self.liststore)
 
     def _renderers_init(self):
         '''Configure the cell renderers'''
         # Text renderer
-        text_cell = gtk.CellRendererText()
+        text_cell = Gtk.CellRendererText()
         self.pack_start(text_cell, False)
-        self.set_text_column(self.COLUMN_HUMAN_NAME)
+        self.add_attribute(text_cell, 'text', 1)
         # Icon renderer
-        pixbuf_cell = gtk.CellRendererPixbuf()
+        pixbuf_cell = Gtk.CellRendererPixbuf()
         self.pack_start(pixbuf_cell, False)
         self.add_attribute(pixbuf_cell, "pixbuf", self.COLUMN_ICON)
 
@@ -68,7 +69,7 @@
         '''
         self.liststore.clear()
         backend_types = BackendFactory().get_all_backends()
-        for name, module in backend_types.iteritems():
+        for name, module in backend_types.items():
             # FIXME: Disable adding another localfile backend.
             # It just produce many warnings, provides no use case
             # See LP bug #940917 (Izidor)
 
=== modified file 'GTG/gtk/backends_dialog/backendstree.py'
--- GTG/gtk/backends_dialog/backendstree.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/backendstree.py	2014-01-12 07:15:48 +0000
@@ -17,16 +17,17 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
+from gi.repository import GdkPixbuf
 
 from GTG.gtk.colors import get_colored_tags_markup
 from GTG.backends.genericbackend import GenericBackend
 from GTG.backends.backendsignals import BackendSignals
 
 
-class BackendsTree(gtk.TreeView):
+class BackendsTree(Gtk.TreeView):
     '''
-    gtk.TreeView that shows the currently loaded backends.
+    Gtk.TreeView that shows the currently loaded backends.
     '''
 
     COLUMN_BACKEND_ID = 0  # never shown, used for internal lookup.
@@ -50,7 +51,7 @@
         self.refresh()
 
     def refresh(self):
-        '''refreshes the gtk.Liststore'''
+        '''refreshes the Gtk.Liststore'''
         self.backendid_to_iter = {}
         self.liststore.clear()
 
@@ -110,7 +111,6 @@
         @param backend_id: the id of the backend to add
         '''
         if backend_id in self.backendid_to_iter:
-            style = self.get_style()
             b_iter = self.backendid_to_iter[backend_id]
             b_path = self.liststore.get_path(b_iter)
             backend = self.req.get_backend(backend_id)
@@ -118,7 +118,12 @@
             if backend.is_enabled():
                 text = backend_name
             else:
-                color = str(style.text[gtk.STATE_INSENSITIVE])
+                #FIXME This snippet is on more than 2 places!!!
+                #FIXME create a function which takes a widget and
+                #flag and returns color as #RRGGBB
+                style_context = self.get_style_context()
+                color = style_context.get_color(Gtk.StateFlags.INSENSITIVE)
+                color = color.to_color().to_string()
                 text = "<span color='%s'>%s</span>" % \
                     (color, backend_name)
             self.liststore[b_path][self.COLUMN_TEXT] = text
@@ -153,7 +158,7 @@
 
     def _init_liststore(self):
         '''Creates the liststore'''
-        self.liststore = gtk.ListStore(object, gtk.gdk.Pixbuf, str, str)
+        self.liststore = Gtk.ListStore(object, GdkPixbuf.Pixbuf, str, str)
         self.set_model(self.liststore)
 
     def _init_renderers(self):
@@ -161,29 +166,29 @@
         # We hide the columns headers
         self.set_headers_visible(False)
         # For the backend icon
-        pixbuf_cell = gtk.CellRendererPixbuf()
-        tvcolumn_pixbuf = gtk.TreeViewColumn('Icon', pixbuf_cell)
+        pixbuf_cell = Gtk.CellRendererPixbuf()
+        tvcolumn_pixbuf = Gtk.TreeViewColumn('Icon', pixbuf_cell)
         tvcolumn_pixbuf.add_attribute(pixbuf_cell, 'pixbuf', self.COLUMN_ICON)
         self.append_column(tvcolumn_pixbuf)
         # For the backend name
-        text_cell = gtk.CellRendererText()
-        tvcolumn_text = gtk.TreeViewColumn('Name', text_cell)
+        text_cell = Gtk.CellRendererText()
+        tvcolumn_text = Gtk.TreeViewColumn('Name', text_cell)
         tvcolumn_text.add_attribute(text_cell, 'markup', self.COLUMN_TEXT)
         self.append_column(tvcolumn_text)
         text_cell.connect('edited', self.cell_edited_callback)
         text_cell.set_property('editable', True)
         # For the backend tags
-        tags_cell = gtk.CellRendererText()
-        tvcolumn_tags = gtk.TreeViewColumn('Tags', tags_cell)
+        tags_cell = Gtk.CellRendererText()
+        tvcolumn_tags = Gtk.TreeViewColumn('Tags', tags_cell)
         tvcolumn_tags.add_attribute(tags_cell, 'markup', self.COLUMN_TAGS)
         self.append_column(tvcolumn_tags)
 
     def cell_edited_callback(self, text_cell, path, new_text):
         '''If a backend name is changed, it saves the changes in the Backend
 
-        @param text_cell: not used. The gtk.CellRendererText that emitted the
+        @param text_cell: not used. The Gtk.CellRendererText that emitted the
                           signal. Only here because it's passed by the signal
-        @param path: the gtk.TreePath of the edited cell
+        @param path: the Gtk.TreePath of the edited cell
         @param new_text: the new name of the backend
         '''
         # we strip everything not permitted in backend names
@@ -218,7 +223,7 @@
         '''
         Helper function to get the selected path
 
-        @return gtk.TreePath : returns exactly one path for the selected object
+        @return Gtk.TreePath : returns exactly one path for the selected object
                                or None
         '''
         selection = self.get_selection()
 
=== modified file 'GTG/gtk/backends_dialog/configurepanel.py'
--- GTG/gtk/backends_dialog/configurepanel.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/configurepanel.py	2014-01-12 07:15:48 +0000
@@ -17,16 +17,16 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 
 from GTG import _
 from GTG.gtk.backends_dialog.parameters_ui import ParametersUI
 from GTG.backends.backendsignals import BackendSignals
 
 
-class ConfigurePanel(gtk.VBox):
+class ConfigurePanel(Gtk.Box):
     '''
-    A VBox that lets you configure a backend
+    A vertical Box that lets you configure a backend
     '''
 
     def __init__(self, backends_dialog):
@@ -36,7 +36,8 @@
         @param backends_dialog: a reference to the dialog in which this is
         loaded
         '''
-        super(ConfigurePanel, self).__init__()
+        super(ConfigurePanel, self).__init__(
+            orientation=Gtk.Orientation.VERTICAL)
         self.dialog = backends_dialog
         self.should_spinner_be_shown = False
         self.task_deleted_handle = None
@@ -56,61 +57,61 @@
 
     def _create_widgets(self):
         '''
-        This function fills this Vbox with widgets
+        This function fills this box with widgets
         '''
         # Division of the available space in three segments:
         # top, middle and bottom
-        top = gtk.HBox()
-        middle = gtk.HBox()
-        self._fill_top_hbox(top)
-        self._fill_middle_hbox(middle)
-        self.pack_start(top, False)
-        self.pack_start(middle, False)
-        align = gtk.Alignment(xalign=0, yalign=0, xscale=1)
+        top = Gtk.Box()
+        middle = Gtk.Box()
+        self._fill_top_box(top)
+        self._fill_middle_box(middle)
+        self.pack_start(top, False, True, 0)
+        self.pack_start(middle, False, True, 0)
+        align = Gtk.Alignment.new(0, 0, 1, 0)
         align.set_padding(10, 0, 0, 0)
         self.parameters_ui = ParametersUI(self.req)
         align.add(self.parameters_ui)
-        self.pack_start(align, False)
+        self.pack_start(align, False, True, 0)
 
-    def _fill_top_hbox(self, hbox):
+    def _fill_top_box(self, box):
         """ Fill header with service's icon, name, and a spinner
         for inidcation of work.
-
-        @param hbox: the gtk.HBox to fill
         """
-        self.image_icon = gtk.Image()
+        box.set_spacing(10)
+        self.image_icon = Gtk.Image()
         self.image_icon.set_size_request(48, 48)
 
-        self.human_name_label = gtk.Label()
+        self.human_name_label = Gtk.Label()
         self.human_name_label.set_alignment(xalign=0, yalign=0.5)
 
+        #FIXME in the newer versions of GTK3 there always be Spinner!
         try:
-            self.spinner = gtk.Spinner()
+            self.spinner = Gtk.Spinner()
         except AttributeError:
             # worarkound for archlinux: bug #624204
-            self.spinner = gtk.HBox()
+            self.spinner = Gtk.Box()
         self.spinner.connect("show", self.on_spinner_show)
         self.spinner.set_size_request(32, 32)
-        align_spin = gtk.Alignment(xalign=1, yalign=0)
+        align_spin = Gtk.Alignment.new(1, 0, 0, 0)
         align_spin.add(self.spinner)
 
-        hbox.set_spacing(10)
-        hbox.pack_start(self.image_icon, False)
-        hbox.pack_start(self.human_name_label, True)
-        hbox.pack_start(align_spin, False)
-
-    def _fill_middle_hbox(self, hbox):
-        '''
-        Helper function to fill an hbox with a label and a button
-
-        @param hbox: the gtk.HBox to fill
-        '''
-        self.sync_status_label = gtk.Label()
+        box.set_spacing(10)
+        box.pack_start(self.image_icon, False, True, 0)
+        box.pack_start(self.human_name_label, True, True, 0)
+        box.pack_start(align_spin, False, True, 0)
+
+    def _fill_middle_box(self, box):
+        '''
+        Helper function to fill an box with a label and a button
+
+        @param box: the Gtk.Box to fill
+        '''
+        self.sync_status_label = Gtk.Label()
         self.sync_status_label.set_alignment(xalign=0.8, yalign=0.5)
-        self.sync_button = gtk.Button()
+        self.sync_button = Gtk.Button()
         self.sync_button.connect("clicked", self.on_sync_button_clicked)
-        hbox.pack_start(self.sync_status_label, True)
-        hbox.pack_start(self.sync_button, True)
+        box.pack_start(self.sync_status_label, True, True, 0)
+        box.pack_start(self.sync_button, True, True, 0)
 
     def set_backend(self, backend_id):
         '''Changes the backend to configure, refreshing this view.
@@ -149,7 +150,7 @@
 
     def refresh_sync_status_label(self):
         '''
-        Refreshes the gtk.Label that shows the current state of this backend
+        Refreshes the Gtk.Label that shows the current state of this backend
         '''
         if self.backend.is_default():
             label = _("This is the default synchronization service")
@@ -183,7 +184,7 @@
     def on_sync_started(self, sender, backend_id):
         '''
         If the backend has started syncing tasks, update the state of the
-        gtk.Spinner
+        Gtk.Spinner
 
         @param sender: not used, here only for signal callback compatibility
         @param backend_id: the id of the backend that emitted this signal
@@ -194,7 +195,7 @@
     def on_sync_ended(self, sender, backend_id):
         '''
         If the backend has stopped syncing tasks, update the state of the
-        gtk.Spinner
+        Gtk.Spinner
 
         @param sender: not used, here only for signal callback compatibility
         @param backend_id: the id of the backend that emitted this signal
@@ -216,17 +217,17 @@
 
     def spinner_set_active(self, active):
         '''
-        Enables/disables the gtk.Spinner, while showing/hiding it at the same
+        Enables/disables the Gtk.Spinner, while showing/hiding it at the same
         time
 
         @param active: True if the spinner should spin
         '''
         self.should_spinner_be_shown = active
         if active:
-            if isinstance(self.spinner, gtk.Spinner):
+            if isinstance(self.spinner, Gtk.Spinner):
                 self.spinner.start()
             self.spinner.show()
         else:
             self.spinner.hide()
-            if isinstance(self.spinner, gtk.Spinner):
+            if isinstance(self.spinner, Gtk.Spinner):
                 self.spinner.stop()
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/__init__.py'
--- GTG/gtk/backends_dialog/parameters_ui/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/__init__.py	2014-01-12 07:15:48 +0000
@@ -24,7 +24,7 @@
 server and client
 '''
 
-import gtk
+from gi.repository import Gtk
 import functools
 
 from GTG import _
@@ -37,9 +37,10 @@
 from GTG.gtk.backends_dialog.parameters_ui.pathui import PathUI
 
 
-class ParametersUI(gtk.VBox):
+class ParametersUI(Gtk.Box):
     '''
-    Given a bakcend, this gtk.VBox populates itself with all the necessary
+    Given a bakcend, this vertical Gtk.Box populates itself with all the
+    necessary
     widgets to view and edit a backend configuration
     '''
 
@@ -50,7 +51,8 @@
 
         @param requester: a GTG.core.requester.Requester object
         '''
-        super(ParametersUI, self).__init__(False)
+        super(ParametersUI, self).__init__(
+            False, orientation=Gtk.Orientation.VERTICAL)
         self.req = requester
         self.set_spacing(10)
 
@@ -98,7 +100,7 @@
             })),
             ("tag-with-project-name", self.UI_generator(CheckBoxUI, {
                 "text": _("Tag your GTG tasks with the project "
-                     "targeted by the bug"),
+                          "targeted by the bug"),
                 "parameter": "tag-with-project-name",
             })),
         )
@@ -127,9 +129,9 @@
         @param backend: the backend that is being configured
         '''
         # remove the old parameters UIs
-        def _remove_child(self, child):
+        def _remove_child(self, child, data=None):
             self.remove(child)
-        self.foreach(functools.partial(_remove_child, self))
+        self.foreach(functools.partial(_remove_child, self), None)
         # add new widgets
         backend_parameters = backend.get_parameters()
         if backend_parameters[GenericBackend.KEY_DEFAULT_BACKEND]:
@@ -137,7 +139,8 @@
             return
         for parameter_name, widget in self.parameter_widgets:
             if parameter_name in backend_parameters:
-                self.pack_start(widget(backend), True)
+                #FIXME I am not 100% about this change
+                self.pack_start(widget(backend), True, True, 0)
         self.show_all()
 
     def commit_changes(self):
@@ -146,6 +149,6 @@
         modified them)
         '''
 
-        def _commit_changes(child):
+        def _commit_changes(child, data=None):
             child.commit_changes()
-        self.foreach(_commit_changes)
+        self.foreach(_commit_changes, None)
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/checkboxui.py'
--- GTG/gtk/backends_dialog/parameters_ui/checkboxui.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/checkboxui.py	2014-01-12 07:15:48 +0000
@@ -17,10 +17,10 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
-
-
-class CheckBoxUI(gtk.HBox):
+from gi.repository import Gtk
+
+
+class CheckBoxUI(Gtk.Box):
     '''
     It's a widget displaying a simple checkbox, with some text to explain its
     meaning
@@ -46,13 +46,13 @@
     def _populate_gtk(self, width):
         '''Creates the checkbox and the related label
 
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
-        self.checkbutton = gtk.CheckButton(label=self.text)
+        self.checkbutton = Gtk.CheckButton(label=self.text)
         backend_parameters = self.backend.get_parameters()[self.parameter]
         self.checkbutton.set_active(backend_parameters)
         self.checkbutton.connect("toggled", self.on_modified)
-        self.pack_start(self.checkbutton, False)
+        self.pack_start(self.checkbutton, False, True, 0)
 
     def commit_changes(self):
         '''Saves the changes to the backend parameter'''
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/importtagsui.py'
--- GTG/gtk/backends_dialog/parameters_ui/importtagsui.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/importtagsui.py	2014-01-12 07:15:48 +0000
@@ -17,12 +17,13 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 
 from GTG.backends.genericbackend import GenericBackend
-
-
-class ImportTagsUI(gtk.VBox):
+from functools import reduce
+
+
+class ImportTagsUI(Gtk.Box):
     '''
     It's a widget displaying a couple of radio buttons, a label and a textbox
     to let the user change the attached tags (or imported)
@@ -42,7 +43,8 @@
                              radio button
         @param parameter_name: the backend parameter this widget should modify
         '''
-        super(ImportTagsUI, self).__init__()
+        super(ImportTagsUI, self).__init__(
+            orientation=Gtk.Orientation.VERTICAL)
         self.backend = backend
         self.req = req
         self.title = title
@@ -59,26 +61,26 @@
 
         @param width: the length of the radio buttons
         '''
-        title_label = gtk.Label()
+        title_label = Gtk.Label()
         title_label.set_alignment(xalign=0, yalign=0)
         title_label.set_markup("<big><b>%s</b></big>" % self.title)
-        self.pack_start(title_label, True)
-        align = gtk.Alignment(xalign=0, yalign=0, xscale=1)
+        self.pack_start(title_label, True, True, 0)
+        align = Gtk.Alignment.new(0, 0, 1, 0)
         align.set_padding(0, 0, 10, 0)
-        self.pack_start(align, True)
-        vbox = gtk.VBox()
+        self.pack_start(align, True, True, 0)
+        vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         align.add(vbox)
-        self.all_tags_radio = gtk.RadioButton(group=None,
+        self.all_tags_radio = Gtk.RadioButton(group=None,
                                               label=self.anybox_text)
-        vbox.pack_start(self.all_tags_radio, True)
-        self.some_tags_radio = gtk.RadioButton(group=self.all_tags_radio,
+        vbox.pack_start(self.all_tags_radio, True, True, 0)
+        self.some_tags_radio = Gtk.RadioButton(group=self.all_tags_radio,
                                                label=self.somebox_text)
         self.some_tags_radio.set_size_request(width=width, height=-1)
-        hbox = gtk.HBox()
-        vbox.pack_start(hbox, True)
-        hbox.pack_start(self.some_tags_radio, False)
-        self.tags_entry = gtk.Entry()
-        hbox.pack_start(self.tags_entry, True)
+        box = Gtk.Box()
+        vbox.pack_start(box, True, True, 0)
+        box.pack_start(self.some_tags_radio, False, True, 0)
+        self.tags_entry = Gtk.Entry()
+        box.pack_start(self.tags_entry, True, True, 0)
 
     def on_changed(self, radio, data=None):
         ''' Signal callback, executed when the user modifies something.
@@ -99,9 +101,9 @@
         else:
             tags = self.tags_entry.get_text().split(",")
             # stripping spaces
-            tags = map(lambda t: t.strip(), tags)
+            tags = [t.strip() for t in tags]
             # removing empty tags
-            tags = filter(lambda t: t, tags)
+            tags = [t for t in tags if t]
 
         self.backend.set_parameter(self.parameter_name, tags)
 
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/passwordui.py'
--- GTG/gtk/backends_dialog/parameters_ui/passwordui.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/passwordui.py	2014-01-12 07:15:48 +0000
@@ -17,12 +17,12 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 
 from GTG import _
 
 
-class PasswordUI(gtk.HBox):
+class PasswordUI(Gtk.Box):
     '''Widget displaying a gtk.Label and a textbox to input a password'''
 
     def __init__(self, req, backend, width):
@@ -31,7 +31,7 @@
 
         @param req: a Requester
         @param backend: a backend object
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
         super(PasswordUI, self).__init__()
         self.backend = backend
@@ -43,16 +43,16 @@
     def _populate_gtk(self, width):
         '''Creates the text box and the related label
 
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
-        password_label = gtk.Label(_("Password:"))
+        password_label = Gtk.Label(label=_("Password:"))
         password_label.set_alignment(xalign=0, yalign=0.5)
         password_label.set_size_request(width=width, height=-1)
-        self.pack_start(password_label, False)
-        align = gtk.Alignment(xalign=0, yalign=0.5, xscale=1)
+        self.pack_start(password_label, False, True, 0)
+        align = Gtk.Alignment.new(0, 0.5, 1, 0)
         align.set_padding(0, 0, 10, 0)
-        self.pack_start(align, True)
-        self.password_textbox = gtk.Entry()
+        self.pack_start(align, True, True, 0)
+        self.password_textbox = Gtk.Entry()
         align.add(self.password_textbox)
 
     def _load_password(self):
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/pathui.py'
--- GTG/gtk/backends_dialog/parameters_ui/pathui.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/pathui.py	2014-01-12 07:15:48 +0000
@@ -17,13 +17,13 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 import os.path
 
 from GTG import _
 
 
-class PathUI(gtk.HBox):
+class PathUI(Gtk.Box):
     '''Gtk widgets to show a path in a textbox, and a button to bring up a
     filesystem explorer to modify that path (also, a label to describe those)
     '''
@@ -34,7 +34,7 @@
 
         @param req: a Requester
         @param backend: a backend object
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
         super(PathUI, self).__init__()
         self.backend = backend
@@ -42,25 +42,25 @@
         self._populate_gtk(width)
 
     def _populate_gtk(self, width):
-        '''Creates the gtk.Label, the textbox and the button
+        '''Creates the Gtk.Label, the textbox and the button
 
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
-        label = gtk.Label(_("Filename:"))
+        label = Gtk.Label(label=_("Filename:"))
         label.set_line_wrap(True)
         label.set_alignment(xalign=0, yalign=0.5)
         label.set_size_request(width=width, height=-1)
-        self.pack_start(label, False)
-        align = gtk.Alignment(xalign=0, yalign=0.5, xscale=1)
+        self.pack_start(label, False, True, 0)
+        align = Gtk.Alignment.new(0, 0.5, 1, 0)
         align.set_padding(0, 0, 10, 0)
-        self.pack_start(align, True)
-        self.textbox = gtk.Entry()
+        self.pack_start(align, True, True, 0)
+        self.textbox = Gtk.Entry()
         self.textbox.set_text(self.backend.get_parameters()['path'])
         self.textbox.connect('changed', self.on_path_modified)
         align.add(self.textbox)
-        self.button = gtk.Button(stock=gtk.STOCK_EDIT)
+        self.button = Gtk.Button(stock=Gtk.STOCK_EDIT)
         self.button.connect('clicked', self.on_button_clicked)
-        self.pack_start(self.button, False)
+        self.pack_start(self.button, False, True, 0)
 
     def commit_changes(self):
         '''Saves the changes to the backend parameter'''
@@ -81,30 +81,30 @@
 
         @param sender: not used, only here for signal compatibility
         '''
-        self.chooser = gtk.FileChooserDialog(
+        self.chooser = Gtk.FileChooserDialog(
             title=None,
-            action=gtk.FILE_CHOOSER_ACTION_SAVE,
-            buttons=(gtk.STOCK_CANCEL,
-                     gtk.RESPONSE_CANCEL,
-                     gtk.STOCK_OK,
-                     gtk.RESPONSE_OK))
-        self.chooser.set_default_response(gtk.RESPONSE_OK)
+            action=Gtk.FileChooserAction.SAVE,
+            buttons=(Gtk.STOCK_CANCEL,
+                     Gtk.ResponseType.CANCEL,
+                     Gtk.STOCK_OK,
+                     Gtk.ResponseType.OK))
+        self.chooser.set_default_response(Gtk.ResponseType.OK)
         # set default file as the current self.path
         dirname, basename = os.path.split(self.textbox.get_text())
         self.chooser.set_current_name(basename)
         self.chosser.set_current_folder(dirname)
 
         # filter files
-        afilter = gtk.FileFilter()
+        afilter = Gtk.FileFilter()
         afilter.set_name("All files")
         afilter.add_pattern("*")
         self.chooser.add_filter(afilter)
-        afilter = gtk.FileFilter()
+        afilter = Gtk.FileFilter()
         afilter.set_name("XML files")
         afilter.add_mime_type("text/plain")
         afilter.add_pattern("*.xml")
         self.chooser.add_filter(afilter)
         response = self.chooser.run()
-        if response == gtk.RESPONSE_OK:
+        if response == Gtk.ResponseType.OK:
             self.textbox.set_text(self.chooser.get_filename())
         self.chooser.destroy()
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/periodui.py'
--- GTG/gtk/backends_dialog/parameters_ui/periodui.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/periodui.py	2014-01-12 07:15:48 +0000
@@ -17,23 +17,23 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 
 from GTG import _, ngettext
 
 
-class PeriodUI(gtk.HBox):
+class PeriodUI(Gtk.Box):
     '''A widget to change the frequency of a backend synchronization
     '''
 
     def __init__(self, req, backend, width):
         '''
-        Creates the gtk.Adjustment and the related label. Loads the current
+        Creates the Gtk.Adjustment and the related label. Loads the current
         period.
 
         @param req: a Requester
         @param backend: a backend object
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
         super(PeriodUI, self).__init__()
         self.backend = backend
@@ -44,30 +44,30 @@
     def _populate_gtk(self, width):
         '''Creates the gtk widgets
 
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
-        period_label = gtk.Label(_("Check for new tasks every"))
+        period_label = Gtk.Label(label=_("Check for new tasks every"))
         period_label.set_alignment(xalign=0, yalign=0.5)
         period_label.set_line_wrap(True)
         period_label.set_size_request(width=width, height=-1)
-        self.pack_start(period_label, False)
-        align = gtk.Alignment(xalign=0, yalign=0.5, xscale=1)
+        self.pack_start(period_label, False, True, 0)
+        align = Gtk.Alignment.new(0, 0.5, 1, 0)
         align.set_padding(0, 0, 10, 0)
-        self.pack_start(align, False)
+        self.pack_start(align, False, True, 0)
         period = self.backend.get_parameters()['period']
-        self.adjustment = gtk.Adjustment(value=period,
+        self.adjustment = Gtk.Adjustment(value=period,
                                          lower=1,
                                          upper=120,
                                          step_incr=1,
                                          page_incr=0,
                                          page_size=0)
-        self.period_spin = gtk.SpinButton(adjustment=self.adjustment,
+        self.period_spin = Gtk.SpinButton(adjustment=self.adjustment,
                                           climb_rate=0.3,
                                           digits=0)
-        self.minutes_label = gtk.Label()
+        self.minutes_label = Gtk.Label()
         self.update_minutes_label()
         self.minutes_label.set_alignment(xalign=0, yalign=0.5)
-        self.pack_start(self.minutes_label, False)
+        self.pack_start(self.minutes_label, False, True, 0)
         align.add(self.period_spin)
         self.show_all()
 
 
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/textui.py'
--- GTG/gtk/backends_dialog/parameters_ui/textui.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/backends_dialog/parameters_ui/textui.py	2014-01-12 07:15:48 +0000
@@ -17,10 +17,10 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
-
-
-class TextUI(gtk.HBox):
+from gi.repository import Gtk
+
+
+class TextUI(Gtk.Box):
     '''A widget to display a simple textbox and a label to describe its content
     '''
 
@@ -31,7 +31,7 @@
 
         @param req: a Requester
         @param backend: a backend object
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
         super(TextUI, self).__init__()
         self.backend = backend
@@ -43,17 +43,17 @@
     def _populate_gtk(self, width):
         '''Creates the gtk widgets
 
-        @param width: the width of the gtk.Label object
+        @param width: the width of the Gtk.Label object
         '''
-        label = gtk.Label("%s:" % self.description)
+        label = Gtk.Label(label="%s:" % self.description)
         label.set_line_wrap(True)
         label.set_alignment(xalign=0, yalign=0.5)
         label.set_size_request(width=width, height=-1)
-        self.pack_start(label, False)
-        align = gtk.Alignment(xalign=0, yalign=0.5, xscale=1)
+        self.pack_start(label, False, True, 0)
+        align = Gtk.Alignment.new(0, 0.5, 1, 0)
         align.set_padding(0, 0, 10, 0)
-        self.pack_start(align, True)
-        self.textbox = gtk.Entry()
+        self.pack_start(align, True, True, 0)
+        self.textbox = Gtk.Entry()
         backend_parameters = self.backend.get_parameters()[self.parameter_name]
         self.textbox.set_text(backend_parameters)
         self.textbox.connect('changed', self.on_text_modified)
 
=== modified file 'GTG/gtk/browser/CellRendererTags.py'
--- GTG/gtk/browser/CellRendererTags.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/CellRendererTags.py	2014-01-12 07:15:48 +0000
@@ -20,23 +20,19 @@
 #=== IMPORT ===================================================================
 
 # system imports
-import pygtk
-pygtk.require('2.0')
-import gobject
-import glib
-import gtk
+from gi.repository import GObject, GLib, Gtk, Gdk
 import cairo
 from GTG.tools.logger import Log
 
 #=== MAIN CLASS ===============================================================
 
 
-class CellRendererTags(gtk.GenericCellRenderer):
+class CellRendererTags(Gtk.CellRenderer):
     __gproperties__ = {
-        'tag_list': (gobject.TYPE_PYOBJECT,
-                     "Tag list", "A list of tags", gobject.PARAM_READWRITE),
-        'tag': (gobject.TYPE_PYOBJECT, "Tag",
-                "Tag", gobject.PARAM_READWRITE),
+        'tag_list': (GObject.TYPE_PYOBJECT,
+                     "Tag list", "A list of tags", GObject.PARAM_READWRITE),
+        'tag': (GObject.TYPE_PYOBJECT, "Tag",
+                "Tag", GObject.PARAM_READWRITE),
     }
 
     # Private methods
@@ -81,7 +77,7 @@
 
     # Class methods
     def __init__(self):
-        self.__gobject_init__()
+        Gtk.CellRenderer.__init__(self)
         self.tag_list = None
         self.tag = None
         self.xpad = 1
@@ -100,8 +96,7 @@
         else:
             return getattr(self, pspec.name)
 
-    def on_render(self, window, widget, background_area, cell_area,
-                  expose_area, flags):
+    def do_render(self, cr, widget, background_area, cell_area, flags):
 
         vw_tags = self.__count_viewable_tags()
         count = 0
@@ -115,8 +110,9 @@
             return
 
         # Drawing context
-        cr = window.cairo_create()
-        gdkcontext = gtk.gdk.CairoContext(cr)
+        #cr         = window.cairo_create()
+        #gdkcontext = Gdk.CairoContext(cr)
+        gdkcontext = cr
         gdkcontext.set_antialias(cairo.ANTIALIAS_NONE)
 
         # Coordinates of the origin point
@@ -138,12 +134,13 @@
 
             if my_tag_icon:
                 try:
-                    pixbuf = gtk.icon_theme_get_default().load_icon(
+                    pixbuf = Gtk.IconTheme.get_default().load_icon(
                         my_tag_icon, 16, 0)
-                    gdkcontext.set_source_pixbuf(pixbuf, rect_x, rect_y)
+                    Gdk.cairo_set_source_pixbuf(gdkcontext, pixbuf,
+                                                rect_x, rect_y)
                     gdkcontext.paint()
                     count = count + 1
-                except glib.GError:
+                except GLib.GError:
                     # In some rare cases an icon could not be found
                     # (e.g. wrong set icon path, missing icon)
                     # Raising an exception breaks UI and signal catcher badly
@@ -152,14 +149,14 @@
             elif my_tag_color:
 
                 # Draw rounded rectangle
-                my_color = gtk.gdk.color_parse(my_tag_color)
-                gdkcontext.set_source_color(my_color)
+                my_color = Gdk.color_parse(my_tag_color)
+                Gdk.cairo_set_source_color(gdkcontext, my_color)
                 self.__roundedrec(gdkcontext, rect_x, rect_y, 16, 16, 8)
                 gdkcontext.fill()
                 count = count + 1
 
                 # Outer line
-                gdkcontext.set_source_rgba(0, 0, 0, 0.20)
+                Gdk.cairo_set_source_rgba(gdkcontext, Gdk.RGBA(0, 0, 0, 0.20))
                 gdkcontext.set_line_width(1.0)
                 self.__roundedrec(gdkcontext, rect_x, rect_y, 16, 16, 8)
                 gdkcontext.stroke()
@@ -171,18 +168,18 @@
 
             if not my_tag_icon and not my_tag_color:
                 # Draw rounded rectangle
-                gdkcontext.set_source_rgba(0.95, 0.95, 0.95, 1)
+                Gdk.cairo_set_source_rgba(gdkcontext,
+                                          Gdk.RGBA(0.95, 0.95, 0.95, 1))
                 self.__roundedrec(gdkcontext, rect_x, rect_y, 16, 16, 8)
                 gdkcontext.fill()
 
                 # Outer line
-                gdkcontext.set_source_rgba(0, 0, 0, 0.20)
+                Gdk.cairo_set_source_rgba(gdkcontext, Gdk.RGBA(0, 0, 0, 0.20))
                 gdkcontext.set_line_width(1.0)
                 self.__roundedrec(gdkcontext, rect_x, rect_y, 16, 16, 8)
                 gdkcontext.stroke()
 
-    def on_get_size(self, widget, cell_area=None):
-
+    def do_get_size(self, widget, cell_area=None):
         count = self.__count_viewable_tags()
 
         if count != 0:
@@ -192,4 +189,4 @@
         else:
             return (self.xpad, self.ypad, self.xpad * 2, self.ypad * 2)
 
-gobject.type_register(CellRendererTags)
+GObject.type_register(CellRendererTags)
 
=== modified file 'GTG/gtk/browser/__init__.py'
--- GTG/gtk/browser/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/__init__.py	2014-01-12 07:15:48 +0000
@@ -29,6 +29,8 @@
 
 class GnomeConfig:
     current_rep = os.path.dirname(os.path.abspath(__file__))
+    BROWSER_UI_FILE = os.path.join(current_rep, "taskbrowser.ui")
+    MODIFYTAGS_UI_FILE = os.path.join(current_rep, "modifytags_dialog.ui")
     GLADE_FILE = os.path.join(current_rep, "taskbrowser.glade")
     MODIFYTAGS_GLADE_FILE = os.path.join(current_rep,
                                          "modifytags_dialog.glade")
 
=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2013-12-17 17:40:11 +0000
+++ GTG/gtk/browser/browser.py	2014-01-12 07:15:48 +0000
@@ -25,10 +25,7 @@
 import threading
 from webbrowser import open as openurl
 
-import pygtk
-pygtk.require('2.0')
-import gobject
-import gtk
+from gi.repository import GObject, Gtk, Gdk
 
 # our own imports
 from GTG import _, info, ngettext
@@ -55,21 +52,21 @@
         self.start = time.time()
 
     def __exit__(self, *args):
-        print "%s : %s" % (self.name, time.time() - self.start)
-
-
-class TaskBrowser(gobject.GObject):
+        print(("{0} : {1}".format(self.name, time.time() - self.start)))
+
+
+class TaskBrowser(GObject.GObject):
     """ The UI for browsing open and closed tasks,
     and listing tags in a tree """
 
-    __string_signal__ = (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (str, ))
-    __none_signal__ = (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, tuple())
+    __string_signal__ = (GObject.SignalFlags.RUN_FIRST, None, (str, ))
+    __none_signal__ = (GObject.SignalFlags.RUN_FIRST, None, tuple())
     __gsignals__ = {'task-added-via-quick-add': __string_signal__,
                     'visibility-toggled': __none_signal__,
                     }
 
     def __init__(self, requester, vmanager):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
         # Object prime variables
         self.req = requester
         self.vmanager = vmanager
@@ -98,13 +95,13 @@
         self.tagtreeview = None
 
         # Load window tree
-        self.builder = gtk.Builder()
-        self.builder.add_from_file(GnomeConfig.GLADE_FILE)
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file(GnomeConfig.BROWSER_UI_FILE)
 
         # Define aliases for specific widgets
         self._init_widget_aliases()
 
-        # Init non-glade widgets
+        # Init non-GtkBuilder widgets
         self._init_ui_widget()
 
         # Set the tooltip for the toolbar buttons
@@ -142,8 +139,8 @@
         """
         icon_dirs = CoreConfig().get_icons_directories()
         for i in icon_dirs:
-            gtk.icon_theme_get_default().prepend_search_path(i)
-            gtk.window_set_default_icon_name("gtg")
+            Gtk.IconTheme.get_default().prepend_search_path(i)
+            Gtk.Window.set_default_icon_name("gtg")
 
     def _init_widget_aliases(self):
         """
@@ -244,7 +241,6 @@
         """
         Show the about dialog
         """
-        gtk.about_dialog_set_url_hook(lambda dialog, url: openurl(url))
         self.about.set_website(info.URL)
         self.about.set_website_label(info.URL)
         self.about.set_version(info.VERSION)
@@ -382,14 +378,15 @@
 
     def _add_accelerator_for_widget(self, agr, name, accel):
         widget = self.builder.get_object(name)
-        key, mod = gtk.accelerator_parse(accel)
-        widget.add_accelerator("activate", agr, key, mod, gtk.ACCEL_VISIBLE)
+        key, mod = Gtk.accelerator_parse(accel)
+        widget.add_accelerator("activate", agr, key, mod,
+                               Gtk.AccelFlags.VISIBLE)
 
     def _init_accelerators(self):
         """
         initialize gtk accelerators for different interface elements
         """
-        agr = gtk.AccelGroup()
+        agr = Gtk.AccelGroup()
         self.builder.get_object("MainWindow").add_accel_group(agr)
 
         self._add_accelerator_for_widget(agr, "view_sidebar", "F9")
@@ -407,9 +404,9 @@
         self._add_accelerator_for_widget(agr, "help_contents", "F1")
 
         quickadd_field = self.builder.get_object("quickadd_field")
-        key, mod = gtk.accelerator_parse("<Control>l")
+        key, mod = Gtk.accelerator_parse("<Control>l")
         quickadd_field.add_accelerator("grab-focus", agr, key, mod,
-                                       gtk.ACCEL_VISIBLE)
+                                       Gtk.AccelFlags.VISIBLE)
 
 ### HELPER FUNCTIONS ########################################################
     def open_preferences(self, widget):
@@ -429,11 +426,9 @@
         and stores the state in self.config.max
         This is used to check the window state afterwards
         and maximize it if needed """
-        mask = gtk.gdk.WINDOW_STATE_MAXIMIZED
-        if widget.get_window().get_state() & mask == mask:
-            self.config.set("max", True)
-        else:
-            self.config.set("max", False)
+        mask = Gdk.WindowState.MAXIMIZED
+        is_maximized = widget.get_window().get_state() & mask == mask
+        self.config.set("max", is_maximized)
 
     def restore_state_from_conf(self):
 
@@ -531,7 +526,7 @@
                 return True
 
         for t in self.config.get("opened_tasks"):
-            gobject.idle_add(open_task, self.req, t)
+            GObject.idle_add(open_task, self.req, t)
 
     def do_toggle_workview(self):
         """ Switch between default and work view
@@ -616,7 +611,7 @@
     def on_sort_column_changed(self, model):
         sort_column, sort_order = model.get_sort_column_id()
 
-        if sort_order == gtk.SORT_ASCENDING:
+        if sort_order == Gtk.SortType.ASCENDING:
             sort_order = 0
         else:
             sort_order = 1
@@ -706,10 +701,10 @@
                                           self.on_taskdone_cursor_changed)
             ctree.apply_filter(self.get_selected_tags()[0], refresh=True)
         if not self.closed_pane:
-            self.closed_pane = gtk.ScrolledWindow()
+            self.closed_pane = Gtk.ScrolledWindow()
             self.closed_pane.set_size_request(-1, 100)
-            self.closed_pane.set_policy(gtk.POLICY_AUTOMATIC,
-                                        gtk.POLICY_AUTOMATIC)
+            self.closed_pane.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                        Gtk.PolicyType.AUTOMATIC)
             self.closed_pane.add(self.vtree_panes['closed'])
 
         elif self.accessory_notebook.page_num(self.closed_pane) != -1:
@@ -811,7 +806,7 @@
 
     def on_quickadd_activate(self, widget):
         """ Add a new task from quickadd toolbar """
-        text = unicode(self.quickadd_entry.get_text())
+        text = str(self.quickadd_entry.get_text())
         text = text.strip()
         if text:
             tags = self.get_selected_tags(nospecial=True)
@@ -840,7 +835,7 @@
                         selection.select_path(path)
 
                 # It cannot be another thread than the main gtk thread !
-                gobject.idle_add(selecter, treemodelsort, path, iter, self)
+                GObject.idle_add(selecter, treemodelsort, path, iter, self)
             # event that is set when the new task is created
             self.__last_quick_added_tid_event = threading.Event()
             self.__quick_add_select_handle = \
@@ -854,7 +849,7 @@
             self.quickadd_entry.set_text('')
 
             # signal the event for the plugins to catch
-            gobject.idle_add(self.emit, "task-added-via-quick-add",
+            GObject.idle_add(self.emit, "task-added-via-quick-add",
                              task.get_id())
         else:
             # if no text is selected, we open the currently selected task
@@ -864,7 +859,7 @@
 
     def on_quickadd_iconpress(self, widget, icon, event):
         """ Clear the text in quickadd field by clicking on 'clear' icon """
-        if icon == gtk.ENTRY_ICON_SECONDARY:
+        if icon == Gtk.EntryIconPosition.SECONDARY:
             self.quickadd_entry.set_text('')
 
     def on_tag_treeview_button_press_event(self, treeview, event):
@@ -897,38 +892,45 @@
                 selected_tags = self.get_selected_tags(nospecial=True)
                 selected_search = self.get_selected_search()
                 # popup menu for searches
+                # FIXME thos two branches could be simplified
+                # (there is no difference betweenn search and normal tag
                 if selected_search is not None:
                     my_tag = self.req.get_tag(selected_search)
                     self.tagpopup.set_tag(my_tag)
-                    self.tagpopup.popup(None, None, None, event.button, time)
+                    self.tagpopup.popup(None, None, None, None, event.button,
+                                        time)
                 elif len(selected_tags) > 0:
                     # Then we are looking at single, normal tag rather than
                     # the special 'All tags' or 'Tasks without tags'. We only
                     # want to popup the menu for normal tags.
                     my_tag = self.req.get_tag(selected_tags[0])
                     self.tagpopup.set_tag(my_tag)
-                    self.tagpopup.popup(None, None, None, event.button, time)
+                    self.tagpopup.popup(None, None, None, None, event.button,
+                                        time)
                 else:
                     self.reset_cursor()
             return True
 
     def on_tag_treeview_key_press_event(self, treeview, event):
-        keyname = gtk.gdk.keyval_name(event.keyval)
+        keyname = Gdk.keyval_name(event.keyval)
         is_shift_f10 = (keyname == "F10" and
-                        event.get_state() & gtk.gdk.SHIFT_MASK)
+                        event.get_state() & Gdk.ModifierType.SHIFT_MASK)
         if is_shift_f10 or keyname == "Menu":
             selected_tags = self.get_selected_tags(nospecial=True)
             selected_search = self.get_selected_search()
+            # FIXME thos two branches could be simplified (there is
+            # no difference betweenn search and normal tag
             # popup menu for searches
             if selected_search is not None:
-                self.searchpopup.popup(None, None, None, 0, event.time)
+                self.tagpopup.set_tag(selected_search)
+                self.tagpopup.popup(None, None, None, 0, event.time)
             elif len(selected_tags) > 0:
                 # Then we are looking at single, normal tag rather than
                 # the special 'All tags' or 'Tasks without tags'. We only
                 # want to popup the menu for normal tags.
                 selected_tag = self.req.get_tag(selected_tags[0])
                 self.tagpopup.set_tag(selected_tag)
-                self.tagpopup.popup(None, None, None, 0, event.time)
+                self.tagpopup.popup(None, None, None, None, 0, event.time)
             else:
                 self.reset_cursor()
             return True
@@ -952,13 +954,14 @@
                 else:
                     treeview.set_cursor(path, col, 0)
                 treeview.grab_focus()
-                self.taskpopup.popup(None, None, None, event.button, time)
+                self.taskpopup.popup(None, None, None, None, event.button,
+                                     time)
             return True
 
     def on_task_treeview_key_press_event(self, treeview, event):
-        keyname = gtk.gdk.keyval_name(event.keyval)
+        keyname = Gdk.keyval_name(event.keyval)
         is_shift_f10 = (keyname == "F10" and
-                        event.get_state() & gtk.gdk.SHIFT_MASK)
+                        event.get_state() & Gdk.ModifierType.SHIFT_MASK)
 
         if keyname == "Delete":
             self.on_delete_tasks()
@@ -981,9 +984,9 @@
             return True
 
     def on_closed_task_treeview_key_press_event(self, treeview, event):
-        keyname = gtk.gdk.keyval_name(event.keyval)
+        keyname = Gdk.keyval_name(event.keyval)
         is_shift_f10 = (keyname == "F10" and
-                        event.get_state() & gtk.gdk.SHIFT_MASK)
+                        event.get_state() & Gdk.ModifierType.SHIFT_MASK)
 
         if keyname == "Delete":
             self.on_delete_tasks()
@@ -1214,7 +1217,7 @@
             button.set_tooltip_text(settings["tooltip"])
 
         def update_menu_item(menu_item, settings):
-            image = gtk.image_new_from_icon_name(settings["icon-name"], 16)
+            image = Gtk.Image.new_from_icon_name(settings["icon-name"], 16)
             image.set_pixel_size(16)
             image.show()
             menu_item.set_image(image)
@@ -1367,8 +1370,8 @@
         """Adds a new page tab to the left panel.  The tab will
         be added as the last tab.  Also causes the tabs to be
         shown if they're not.
-        @param icon: a gtk.Image picture to display on the tab
-        @param page: gtk.Frame-based panel to be added
+        @param icon: a Gtk.Image picture to display on the tab
+        @param page: Gtk.Frame-based panel to be added
         """
         return self._add_page(self.sidebar_notebook, icon, page)
 
@@ -1377,23 +1380,24 @@
         will be added as the last tab.  Also causes the tabs to be
         shown.
         @param title: Short text to use for the tab label
-        @param page: gtk.Frame-based panel to be added
+        @param page: Gtk.Frame-based panel to be added
         """
-        return self._add_page(self.main_notebook, gtk.Label(title), page)
+        return self._add_page(self.main_notebook, Gtk.Label(label=title), page)
 
     def add_page_to_accessory_notebook(self, title, page):
         """Adds a new page tab to the lower right accessory panel.  The
         tab will be added as the last tab.  Also causes the tabs to be
         shown.
         @param title: Short text to use for the tab label
-        @param page: gtk.Frame-based panel to be added
+        @param page: Gtk.Frame-based panel to be added
         """
-        return self._add_page(self.accessory_notebook, gtk.Label(title), page)
+        return self._add_page(self.accessory_notebook, Gtk.Label(label=title),
+                              page)
 
     def remove_page_from_sidebar_notebook(self, page):
         """Removes a new page tab from the left panel.  If this leaves
         only one tab in the notebook, the tab selector will be hidden.
-        @param page: gtk.Frame-based panel to be removed
+        @param page: Gtk.Frame-based panel to be removed
         """
         return self._remove_page(self.sidebar_notebook, page)
 
@@ -1401,7 +1405,7 @@
         """Removes a new page tab from the top right main panel.  If
         this leaves only one tab in the notebook, the tab selector will
         be hidden.
-        @param page: gtk.Frame-based panel to be removed
+        @param page: Gtk.Frame-based panel to be removed
         """
         return self._remove_page(self.main_notebook, page)
 
@@ -1409,7 +1413,7 @@
         """Removes a new page tab from the lower right accessory panel.
         If this leaves only one tab in the notebook, the tab selector
         will be hidden.
-        @param page: gtk.Frame-based panel to be removed
+        @param page: Gtk.Frame-based panel to be removed
         """
         return self._remove_page(self.accessory_notebook, page)
 
@@ -1417,7 +1421,7 @@
         """ Hides the task browser """
         self.browser_shown = False
         self.window.hide()
-        gobject.idle_add(self.emit, "visibility-toggled")
+        GObject.idle_add(self.emit, "visibility-toggled")
 
     def show(self):
         """ Unhides the TaskBrowser """
@@ -1427,7 +1431,7 @@
         self.window.present()
         self.window.grab_focus()
         self.quickadd_entry.grab_focus()
-        gobject.idle_add(self.emit, "visibility-toggled")
+        GObject.idle_add(self.emit, "visibility-toggled")
 
     def iconify(self):
         """ Minimizes the TaskBrowser """
@@ -1469,7 +1473,7 @@
     def on_backend_failed(self, sender, backend_id, error_code):
         """
         Signal callback.
-        When a backend fails to work, loads a gtk.Infobar to alert the user
+        When a backend fails to work, loads a Gtk.Infobar to alert the user
 
         @param sender: not used, only here for signal compatibility
         @param backend_id: the id of the failing backend
@@ -1484,7 +1488,7 @@
         '''
         Signal callback.
         When a backend needs some kind of feedback from the user,
-        loads a gtk.Infobar to alert the user.
+        loads a Gtk.Infobar to alert the user.
         This is used, for example, to request confirmation after authenticating
         via OAuth.
 
@@ -1502,10 +1506,10 @@
 
     def __remove_backend_infobar(self, child, backend_id):
         '''
-        Helper function to remove an gtk.Infobar related to a backend
+        Helper function to remove an Gtk.Infobar related to a backend
 
-        @param child: a gtk.Infobar
-        @param backend_id: the id of the backend which gtk.Infobar should be
+        @param child: a Gtk.Infobar
+        @param backend_id: the id of the backend which Gtk.Infobar should be
                             removed.
         '''
         if isinstance(child, CustomInfoBar) and\
@@ -1516,10 +1520,10 @@
     def remove_backend_infobar(self, sender, backend_id):
         '''
         Signal callback.
-        Deletes the gtk.Infobars related to a backend
+        Deletes the Gtk.Infobars related to a backend
 
         @param sender: not used, only here for signal compatibility
-        @param backend_id: the id of the backend which gtk.Infobar should be
+        @param backend_id: the id of the backend which Gtk.Infobar should be
                             removed.
         '''
         backend = self.req.get_backend(backend_id)
@@ -1534,7 +1538,7 @@
         Helper function to create a new infobar for a backend
 
         @param backend_id: the backend for which we're creating the infobar
-        @returns gtk.Infobar: the created infobar
+        @returns Gtk.Infobar: the created infobar
         '''
         # remove old infobar related to backend_id, if any
         if not self.vbox_toolbars:
@@ -1542,7 +1546,7 @@
         self.vbox_toolbars.foreach(self.__remove_backend_infobar, backend_id)
         # add a new one
         infobar = CustomInfoBar(self.req, self, self.vmanager, backend_id)
-        self.vbox_toolbars.pack_start(infobar, True)
+        self.vbox_toolbars.pack_start(infobar, True, True, 0)
         return infobar
 
 #### SEARCH RELATED STUFF #####################################################
@@ -1570,7 +1574,7 @@
 
         self.search_actions = []
 
-        self.search_complete_store = gtk.ListStore(str)
+        self.search_complete_store = Gtk.ListStore(str)
         for tagname in self.req.get_all_tags():
             # only for regular tags
             if tagname.startswith("@"):
 
=== modified file 'GTG/gtk/browser/custominfobar.py'
--- GTG/gtk/browser/custominfobar.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/custominfobar.py	2014-01-12 07:15:48 +0000
@@ -17,7 +17,7 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gtk
 import threading
 
 from GTG import _
@@ -25,9 +25,9 @@
 from GTG.tools.networkmanager import is_connection_up
 
 
-class CustomInfoBar(gtk.InfoBar):
+class CustomInfoBar(Gtk.InfoBar):
     '''
-    A gtk.InfoBar specialized for displaying errors and requests for
+    A Gtk.InfoBar specialized for displaying errors and requests for
     interaction coming from the backends
     '''
 
@@ -61,19 +61,19 @@
     def get_backend_id(self):
         '''
         Getter function to return the id of the backend for which this
-        gtk.InfoBar was created
+        Gtk.InfoBar was created
         '''
         return self.backend_id
 
     def _populate(self):
         '''Setting up gtk widgets'''
-        content_hbox = self.get_content_area()
-        content_hbox.set_homogeneous(False)
-        self.label = gtk.Label()
+        content_box = self.get_content_area()
+        content_box.set_homogeneous(False)
+        self.label = Gtk.Label()
         self.label.set_line_wrap(True)
         self.label.set_alignment(0.5, 0.5)
-        self.label.set_justify(gtk.JUSTIFY_FILL)
-        content_hbox.pack_start(self.label, True, True)
+        self.label.set_justify(Gtk.Justification.FILL)
+        content_box.pack_start(self.label, True, True, 0)
 
     def _on_error_response(self, widget, event):
         '''
@@ -84,7 +84,7 @@
         @param event: the code of the gtk response
         '''
         self.hide()
-        if event == gtk.RESPONSE_ACCEPT:
+        if event == Gtk.ResponseType.ACCEPT:
             self.vmanager.configure_backend(backend_id=self.backend_id)
 
     def set_error_code(self, error_code):
@@ -99,24 +99,24 @@
         backend_name = self.backend.get_human_name()
 
         if error_code == BackendSignals.ERRNO_AUTHENTICATION:
-            self.set_message_type(gtk.MESSAGE_ERROR)
+            self.set_message_type(Gtk.MessageType.ERROR)
             self.label.set_markup(self.AUTHENTICATION_MESSAGE % backend_name)
             self.add_button(_('Configure synchronization service'),
-                            gtk.RESPONSE_ACCEPT)
-            self.add_button(_('Ignore'), gtk.RESPONSE_CLOSE)
+                            Gtk.ResponseType.ACCEPT)
+            self.add_button(_('Ignore'), Gtk.ResponseType.CLOSE)
 
         elif error_code == BackendSignals.ERRNO_NETWORK:
             if not is_connection_up():
                 return
-            self.set_message_type(gtk.MESSAGE_WARNING)
+            self.set_message_type(Gtk.MessageType.WARNING)
             self.label.set_markup(self.NETWORK_MESSAGE % backend_name)
             # FIXME: use gtk stock button instead
-            self.add_button(_('Ok'), gtk.RESPONSE_CLOSE)
+            self.add_button(_('Ok'), Gtk.ResponseType.CLOSE)
 
         elif error_code == BackendSignals.ERRNO_DBUS:
-            self.set_message_type(gtk.MESSAGE_WARNING)
+            self.set_message_type(Gtk.MessageType.WARNING)
             self.label.set_markup(self.DBUS_MESSAGE % backend_name)
-            self.add_button(_('Ok'), gtk.RESPONSE_CLOSE)
+            self.add_button(_('Ok'), Gtk.ResponseType.CLOSE)
 
         self.show_all()
 
@@ -132,14 +132,14 @@
         '''
         self._populate()
         self.callback = callback
-        self.set_message_type(gtk.MESSAGE_INFO)
+        self.set_message_type(Gtk.MessageType.INFO)
         self.label.set_markup(description)
         self.connect("response", self._on_interaction_response)
         self.interaction_type = interaction_type
         if interaction_type == BackendSignals().INTERACTION_CONFIRM:
-            self.add_button(_('Confirm'), gtk.RESPONSE_ACCEPT)
+            self.add_button(_('Confirm'), Gtk.ResponseType.ACCEPT)
         elif interaction_type == BackendSignals().INTERACTION_TEXT:
-            self.add_button(_('Continue'), gtk.RESPONSE_ACCEPT)
+            self.add_button(_('Continue'), Gtk.ResponseType.ACCEPT)
         self.show_all()
 
     def _on_interaction_response(self, widget, event):
@@ -150,10 +150,10 @@
         @param widget: not used, here for compatibility with signals callbacks
         @param event: the code of the gtk response
         '''
-        if event == gtk.RESPONSE_ACCEPT:
+        if event == Gtk.ResponseType.ACCEPT:
             if self.interaction_type == BackendSignals().INTERACTION_TEXT:
                 self._prepare_textual_interaction()
-                print "done"
+                print("done")
             elif self.interaction_type == BackendSignals().INTERACTION_CONFIRM:
                 self.hide()
                 threading.Thread(target=getattr(self.backend,
@@ -167,33 +167,33 @@
         title, description\
             = getattr(self.backend,
                       self.callback)("get_ui_dialog_text")
-        self.dialog = gtk.Window()  # type = gtk.WINDOW_POPUP)
+        self.dialog = Gtk.Window()  # type = Gtk.WindowType.POPUP
         self.dialog.set_title(title)
         self.dialog.set_transient_for(self.browser.window)
         self.dialog.set_destroy_with_parent(True)
-        self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
+        self.dialog.set_position(Gtk.WindowPosition.CENTER_ON_PARENT)
         self.dialog.set_modal(True)
         #        self.dialog.set_size_request(300,170)
-        vbox = gtk.VBox()
+        vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.dialog.add(vbox)
-        description_label = gtk.Label()
-        description_label.set_justify(gtk.JUSTIFY_FILL)
+        description_label = Gtk.Label()
+        description_label.set_justify(Gtk.Justification.FILL)
         description_label.set_line_wrap(True)
         description_label.set_markup(description)
-        align = gtk.Alignment(0.5, 0.5, 1, 1)
+        align = Gtk.Alignment.new(0.5, 0.5, 1, 1)
         align.set_padding(10, 0, 20, 20)
         align.add(description_label)
-        vbox.pack_start(align)
-        self.text_box = gtk.Entry()
+        vbox.pack_start(align, True, True, 0)
+        self.text_box = Gtk.Entry()
         self.text_box.set_size_request(-1, 40)
-        align = gtk.Alignment(0.5, 0.5, 1, 1)
+        align = Gtk.Alignment.new(0.5, 0.5, 1, 1)
         align.set_padding(20, 20, 20, 20)
         align.add(self.text_box)
-        vbox.pack_start(align)
-        button = gtk.Button(stock=gtk.STOCK_OK)
+        vbox.pack_start(align, True, True, 0)
+        button = Gtk.Button(stock=Gtk.STOCK_OK)
         button.connect("clicked", self._on_text_confirmed)
         button.set_size_request(-1, 40)
-        vbox.pack_start(button, False)
+        vbox.pack_start(button, False, True, 0)
         self.dialog.show_all()
         self.hide()
 
 
=== modified file 'GTG/gtk/browser/modifytags_dialog.py'
--- GTG/gtk/browser/modifytags_dialog.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/modifytags_dialog.py	2014-01-12 07:15:48 +0000
@@ -17,15 +17,18 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 """ A dialog for batch adding/removal of tags """
-import gtk
+
+from gi.repository import Gtk
 
 from GTG import _
 from GTG.gtk.browser import GnomeConfig
 from GTG.tools.tags import parse_tag_list
 
 
-class ModifyTagsDialog:
-    """ Dialog for batch adding/removal of tags """
+class ModifyTagsDialog(object):
+    """
+    Dialog for batch adding/removal of tags
+    """
 
     def __init__(self, tag_completion, req):
         self.req = req
@@ -39,9 +42,9 @@
         self.last_apply_to_subtasks = False
 
     def _init_dialog(self):
-        """ Init .glade file """
-        builder = gtk.Builder()
-        builder.add_from_file(GnomeConfig.MODIFYTAGS_GLADE_FILE)
+        """ Init GtkBuilder .ui file """
+        builder = Gtk.Builder()
+        builder.add_from_file(GnomeConfig.MODIFYTAGS_UI_FILE)
         builder.connect_signals({
             "on_modifytags_confirm":
             self.on_confirm,
@@ -97,3 +100,5 @@
         # Rember the last actions
         self.last_tag_entry = self.tag_entry.get_text()
         self.last_apply_to_subtasks = self.apply_to_subtasks.get_active()
+
+# -----------------------------------------------------------------------------
 
=== renamed file 'GTG/gtk/browser/modifytags_dialog.glade' => 'GTG/gtk/browser/modifytags_dialog.ui'
--- GTG/gtk/browser/modifytags_dialog.glade	2012-05-23 08:55:31 +0000
+++ GTG/gtk/browser/modifytags_dialog.ui	2014-01-12 07:15:48 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="modifytags_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -11,6 +11,7 @@
       <object class="GtkBox" id="modifytags_dialog_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area3">
 
=== modified file 'GTG/gtk/browser/simple_color_selector.py'
--- GTG/gtk/browser/simple_color_selector.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/simple_color_selector.py	2014-01-12 07:15:48 +0000
@@ -22,10 +22,8 @@
 from a palette. The widget also allows to define and add new colors.
 """
 
-import pygtk
-pygtk.require('2.0')
-import gobject
-import gtk
+from gi.repository import GObject, Gtk, Gdk
+
 import math
 
 from GTG import _
@@ -43,38 +41,42 @@
 BUTTON_HEIGHT = 24
 
 
-class SimpleColorSelectorPaletteItem(gtk.DrawingArea):
+class SimpleColorSelectorPaletteItem(Gtk.DrawingArea):
     """An item of the color selecctor palette"""
 
     def __init__(self, color=None):
-        gtk.DrawingArea.__init__(self)
-        self.__gobject_init__()
+        Gtk.DrawingArea.__init__(self)
         self.color = color
         self.selected = False
-        self.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+        self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
         # Connect callbacks
-        self.connect("expose_event", self.on_expose)
+        #FIXME
+        #self.connect("expose-event", self.on_expose)
+        self.connect("draw", self.on_expose)
         self.connect("configure_event", self.on_configure)
 
-    def __draw(self):
+    def __draw(self, cr):
         """Draws the widget"""
         alloc = self.get_allocation()
-        alloc_w, alloc_h = alloc[2], alloc[3]
+        #FIXME - why to use a special variables?
+        alloc_w, alloc_h = alloc.width, alloc.height
         # Drawing context
-        cr_ctxt = self.window.cairo_create()
-        gdkcontext = gtk.gdk.CairoContext(cr_ctxt)
+        #cr_ctxt    = self.window.cairo_create() # pylint: disable-msg=E1101
+        #gdkcontext = Gdk.CairoContext(cr_ctxt)
+        #FIXME
+        gdkcontext = cr
 
         # Draw rectangle
         if self.color is not None:
-            my_color = gtk.gdk.color_parse(self.color)
-            gdkcontext.set_source_color(my_color)
+            my_color = Gdk.color_parse(self.color)
+            Gdk.cairo_set_source_color(gdkcontext, my_color)
         else:
-            gdkcontext.set_source_rgba(0, 0, 0, 0)
+            Gdk.cairo_set_source_rgba(gdkcontext, Gdk.RGBA(0, 0, 0, 0))
         gdkcontext.rectangle(0, 0, alloc_w, alloc_h)
         gdkcontext.fill()
 
         # Outer line
-        gdkcontext.set_source_rgba(0, 0, 0, 0.30)
+        Gdk.cairo_set_source_rgba(gdkcontext, Gdk.RGBA(0, 0, 0, 0.30))
         gdkcontext.set_line_width(2.0)
         gdkcontext.rectangle(0, 0, alloc_w, alloc_h)
         gdkcontext.stroke()
@@ -84,16 +86,17 @@
             size = alloc_h * 0.50 - 3
             pos_x = math.floor((alloc_w - size) / 2)
             pos_y = math.floor((alloc_h - size) / 2)
-            gdkcontext.set_source_rgba(255, 255, 255, 0.80)
+            Gdk.cairo_set_source_rgba(gdkcontext,
+                                      Gdk.RGBA(255, 255, 255, 0.80))
             gdkcontext.arc(
                 alloc_w / 2, alloc_h / 2, size / 2 + 3, 0, 2 * math.pi)
             gdkcontext.fill()
             gdkcontext.set_line_width(1.0)
-            gdkcontext.set_source_rgba(0, 0, 0, 0.20)
+            Gdk.cairo_set_source_rgba(gdkcontext, Gdk.RGBA(0, 0, 0, 0.20))
             gdkcontext.arc(
                 alloc_w / 2, alloc_h / 2, size / 2 + 3, 0, 2 * math.pi)
             gdkcontext.stroke()
-            gdkcontext.set_source_rgba(0, 0, 0, 0.50)
+            Gdk.cairo_set_source_rgba(gdkcontext, Gdk.RGBA(0, 0, 0, 0.50))
             gdkcontext.set_line_width(3.0)
             gdkcontext.move_to(pos_x, pos_y + size / 2)
             gdkcontext.line_to(pos_x + size / 2, pos_y + size)
@@ -101,13 +104,14 @@
             gdkcontext.stroke()
 
     ### callbacks ###
-    def on_expose(self, widget, params):
+    def on_expose(self, widget, cr):
         """Callback: redraws the widget when it is exposed"""
-        self.__draw()
+        self.__draw(cr)
 
     def on_configure(self, widget, params):
         """Callback: redraws the widget when it is exposed"""
-        self.__draw()
+        #FIXME - missing cairo context
+        #self.__draw(cr)
 
     ### PUBLIC IF ###
     def set_color(self, color):
@@ -124,13 +128,12 @@
         return self.selected
 
 
-class SimpleColorSelector(gtk.VBox):
+class SimpleColorSelector(Gtk.Box):
     """Widget displaying a palette of colors, possibly with a button allowing
      to define new colors."""
 
     def __init__(self, width=9, colors=None, custom_colors=None):
-        gtk.VBox.__init__(self)
-        self.__gobject_init__()
+        Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL)
         self.width = width
         # widget model
         if colors is None:
@@ -168,16 +171,16 @@
         """Draws the palette of colors"""
         self.__reset_palette()
         # (re-)create the palette widget
-        self.palette = gtk.Alignment()
-        self.pack_start(self.palette)
+        self.palette = Gtk.Alignment()
+        self.pack_start(self.palette, True, True, 0)
         # Draw the palette
-        vbox = gtk.VBox()
+        vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.palette.add(vbox)
         vbox.set_spacing(4)
-        for i in xrange(len(self.colors)):
+        for i in range(len(self.colors)):
             if i % self.width == 0:
-                cur_hbox = gtk.HBox()
-                vbox.pack_start(cur_hbox)
+                cur_box = Gtk.Box()
+                vbox.pack_start(cur_box, True, True, 0)
             # add the color box
             img = SimpleColorSelectorPaletteItem()
             img.set_size_request(
@@ -186,8 +189,8 @@
             img.set_color(self.colors[i])
             self.buttons_lookup[self.colors[i]] = img
             self.buttons.append(img)
-            cur_hbox.pack_start(img, expand=False, fill=False)
-            cur_hbox.set_spacing(4)
+            cur_box.pack_start(img, False, False, 0)
+            cur_box.set_spacing(4)
         # make palette visible
         self.palette.show_all()
 
@@ -207,16 +210,16 @@
         """Draws the palette of custom colors"""
         self.__reset_custom_palette()
         # (re-)create the palette widget
-        self.custom_palette = gtk.Alignment(xscale=1.0)
+        self.custom_palette = Gtk.Alignment.new(0, 0, 1, 0)
         self.custom_palette.set_padding(10, 0, 0, 0)
-        self.pack_start(self.custom_palette)
+        self.pack_start(self.custom_palette, True, True, 0)
         # Draw the previous color palette: only one line
-        cc_vbox = gtk.VBox()
+        cc_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.custom_palette.add(cc_vbox)
         cc_vbox.set_spacing(4)
-        cc_hbox = gtk.HBox()
-        cc_vbox.pack_start(cc_hbox)
-        for i in xrange(len(self.custom_colors)):
+        cc_box = Gtk.Box()
+        cc_vbox.pack_start(cc_box, True, True, 0)
+        for i in range(len(self.custom_colors)):
             # add the color box
             img = SimpleColorSelectorPaletteItem()
             img.set_size_request(
@@ -225,15 +228,15 @@
             if i < len(self.custom_colors):
                 img.set_color(self.custom_colors[i])
                 self.buttons_lookup[self.custom_colors[i]] = img
-            cc_hbox.pack_start(img, expand=False, fill=False)
-            cc_hbox.set_spacing(4)
+            cc_box.pack_start(img, False, False, 0)
+            cc_box.set_spacing(4)
             self.cc_buttons.append(img)
         # Draw the add button
-        buttons_hbox = gtk.HBox()
+        buttons_hbox = Gtk.Box()
         cc_vbox.pack_start(buttons_hbox)
-        img = gtk.Image()
-        img.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_BUTTON)
-        self.add_button = gtk.Button()
+        img = Gtk.Image()
+        img.set_from_stock(Gtk.STOCK_ADD, Gtk.ICON_SIZE_BUTTON)
+        self.add_button = Gtk.Button()
         self.add_button.set_image(img)
         self.add_button.set_label(_("Add custom color"))
         buttons_hbox.pack_start(self.add_button, expand=True, fill=False)
@@ -284,16 +287,19 @@
     def on_color_add(self, widget):
         """Callback: when adding a new color, show the color definition
         window, update the model, notifies the parent."""
-        color_dialog = gtk.ColorSelectionDialog(_('Choose a color'))
-        colorsel = color_dialog.colorsel
+        color_dialog = Gtk.ColorSelectionDialog(_('Choose a color'))
+#FIXME
+        colorsel = color_dialog.get_color_selection()
         if self.selected_col is not None:
-            color = gtk.gdk.color_parse(self.selected_col.color)
+            color = Gdk.color_parse(self.selected_col.color)
             colorsel.set_current_color(color)
         response = color_dialog.run()
         new_color = colorsel.get_current_color()
         # Check response_id and set color if required
-        if response == gtk.RESPONSE_OK and new_color:
-            strcolor = gtk.color_selection_palette_to_string([new_color])
+        if response == Gtk.ResponseType.OK and new_color:
+#FIXME
+            #strcolor = Gtk.color_selection_palette_to_string([new_color])
+            strcolor = new_color.to_string()
             # Add the color to the palette and notify
             if strcolor not in self.colors:
                 self.add_custom_color(strcolor)
@@ -356,8 +362,8 @@
             self.selected_col = None
         self.clear_button.set_sensitive(False)
 
-gobject.type_register(SimpleColorSelector)
-gobject.signal_new("color-changed", SimpleColorSelector,
-                   gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
-gobject.signal_new("color-added", SimpleColorSelector,
-                   gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
+Gobject.type_register(SimpleColorSelector)
+Gobject.signal_new("color-changed", SimpleColorSelector,
+                   Gobject.SIGNAL_RUN_FIRST, Gobject.TYPE_NONE, ())
+Gobject.signal_new("color-added", SimpleColorSelector,
+                   Gobject.SIGNAL_RUN_FIRST, Gobject.TYPE_NONE, ())
 
=== modified file 'GTG/gtk/browser/tag_context_menu.py'
--- GTG/gtk/browser/tag_context_menu.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/tag_context_menu.py	2014-01-12 07:15:48 +0000
@@ -26,19 +26,16 @@
 like a color picker)
 """
 
-import pygtk
-pygtk.require('2.0')
-import gtk
+from gi.repository import Gtk
 
 from GTG import _
 
 
-class TagContextMenu(gtk.Menu):
+class TagContextMenu(Gtk.Menu):
     """Context menu fo the tag i the sidebar"""
 
     def __init__(self, req, vmanager, tag=None):
-        self.__gobject_init__()
-        gtk.Menu.__init__(self)
+        Gtk.Menu.__init__(self)
         self.req = req
         self.vmanager = vmanager
         self.tag = tag
@@ -54,12 +51,12 @@
             i.destroy()
         if self.tag is not None:
             # Color chooser FIXME: SHOULD BECOME A COLOR PICKER
-            self.mi_cc = gtk.MenuItem()
+            self.mi_cc = Gtk.MenuItem()
             self.mi_cc.set_label(_("Edit Tag..."))
             self.append(self.mi_cc)
             self.mi_cc.connect('activate', self.on_mi_cc_activate)
             if self.tag.is_search_tag():
-                self.mi_del = gtk.MenuItem()
+                self.mi_del = Gtk.MenuItem()
                 self.mi_del.set_label(_("Delete"))
                 self.append(self.mi_del)
                 self.mi_del.connect('activate', self.on_mi_del_activate)
 
=== modified file 'GTG/gtk/browser/tag_editor.py'
--- GTG/gtk/browser/tag_editor.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/tag_editor.py	2014-01-12 07:15:48 +0000
@@ -27,48 +27,48 @@
 for a tag.
 """
 
-import pygtk
-pygtk.require('2.0')
-import gobject
-import gtk
-import gtk.gdk as gdk
+from gi.repository import GObject, Gtk, Gdk, GdkPixbuf
 
 from GTG import _
 from GTG.tools.logger import Log
-from GTG.gtk.browser.simple_color_selector import SimpleColorSelector
-
-
-class TagIconSelector(gtk.Window):
+
+
+class TagIconSelector(Gtk.Window):
     """
     TagIconSelector is intended as a floating window that allows to select
     an icon for a tag. It display a list of icon in a popup window.
     """
 
     def __init__(self):
-        self.__gobject_init__(type=gtk.WINDOW_POPUP)
-        gtk.Window.__init__(self)
+        # FIXME
+        #self.__gobject_init__(type=Gtk.WindowType.POPUP)
+        #GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
+
         self.loaded = False
         self.selected_icon = None
         self.symbol_model = None
         # Build up the window
         self.__build_window()
         # Make it visible
-        self.hide_all()
+        #self.hide_all()
+        # FIXME
+        self.hide()
 
     def __build_window(self):
         """Build up the widget"""
-        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_POPUP_MENU)
-        vbox = gtk.VBox()
+        self.set_type_hint(Gdk.WindowTypeHint.POPUP_MENU)
+        vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.add(vbox)
         # icon list
-        scld_win = gtk.ScrolledWindow()
-        scld_win.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
-        scld_win.set_shadow_type(gtk.SHADOW_ETCHED_IN)
-        vbox.pack_start(scld_win, expand=True, fill=True)
-        self.symbol_iv = gtk.IconView()
+        scld_win = Gtk.ScrolledWindow()
+        scld_win.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.ALWAYS)
+        scld_win.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
+        vbox.pack_start(scld_win, True, True, 0)
+        self.symbol_iv = Gtk.IconView()
         self.symbol_iv.set_pixbuf_column(0)
-        self.symbol_iv.set_property("columns", 7)
-        self.symbol_iv.set_property("item-width", 32)
+        self.symbol_iv.set_columns(7)
+        self.symbol_iv.set_item_width(32)
         # IconView size:
         # --------------
         #  it seems that with the above parameters, a row width is about:
@@ -80,19 +80,19 @@
         self.symbol_iv.set_size_request(40 * 7 + 12, 38 * 4)
         scld_win.add(self.symbol_iv)
         # icon remove button
-        img = gtk.Image()
-        img.set_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_BUTTON)
-        self.remove_bt = gtk.Button()
+        img = Gtk.Image()
+        img.set_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.BUTTON)
+        self.remove_bt = Gtk.Button()
         self.remove_bt.set_image(img)
         self.remove_bt.set_label(_("Remove selected icon"))
-        vbox.pack_start(self.remove_bt, fill=False, expand=False)
+        vbox.pack_start(self.remove_bt, False, False, 0)
         # set the callbacks
         self.symbol_iv.connect("selection-changed", self.on_selection_changed)
         self.remove_bt.connect("clicked", self.on_remove_bt_clicked)
 
     def __focus_out(self, widget, event):
         """Hides the window if the user clicks out of it"""
-        win_ptr = self.window.get_pointer()
+        win_ptr = self.get_window().get_pointer()
         win_size = self.get_size()
         if not(0 <= win_ptr[0] <= win_size[0] and
                0 <= win_ptr[1] <= win_size[1]):
@@ -106,12 +106,12 @@
         libraries, e.g. bug #1079587. Gracefuly degradate and skip
         the loading of a corrupted icon.
         """
-        self.symbol_model = gtk.ListStore(gtk.gdk.Pixbuf, str)
-        for icon in gtk.icon_theme_get_default().list_icons(context="Emblems"):
+        self.symbol_model = Gtk.ListStore(GdkPixbuf.Pixbuf, str)
+        for icon in Gtk.IconTheme.get_default().list_icons(context="Emblems"):
             try:
-                img = gtk.icon_theme_get_default().load_icon(icon, 16, 0)
+                img = Gtk.IconTheme.get_default().load_icon(icon, 16, 0)
                 self.symbol_model.append([img, icon])
-            except gobject.GError:
+            except GObject.GError:
                 Log.error("Failed to load icon '%s'" % icon)
         self.symbol_iv.set_model(self.symbol_model)
         self.loaded = True
@@ -152,14 +152,22 @@
         self.move(pos_x, pos_y)
         self.grab_add()
         # We grab the pointer in the calendar
-        gdk.pointer_grab(self.window, True,
-                         gdk.BUTTON1_MASK | gdk.MOD2_MASK)
+# FIXME THIS DOES NOT WORK!!!!!!!
+        Gdk.pointer_grab(self.get_window(), True,
+                         # Gdk.ModifierType.BUTTON1_MASK |
+                         # Gdk.ModifierType.MOD2_MASK,
+                         # FIXME!!!! JUST GUESSING THE TYPE
+                         Gdk.EventMask.ALL_EVENTS_MASK,
+                         None,
+                         None,
+                         0,)
         self.connect('button-press-event', self.__focus_out)
 
     def close_selector(self):
         """Hides the window"""
         self.hide()
-        gtk.gdk.pointer_ungrab()
+#FIXME!!!
+        Gdk.pointer_ungrab(0)
         self.grab_remove()
 
     def get_selected_icon(self):
@@ -171,17 +179,17 @@
         self.symbol_iv.unselect_all()
 
 
-gobject.type_register(TagIconSelector)
-gobject.signal_new("selection-changed", TagIconSelector,
-                   gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
-
-
-class TagEditor(gtk.Window):
+GObject.type_register(TagIconSelector)
+GObject.signal_new("selection-changed", TagIconSelector,
+                   GObject.SignalFlags.RUN_FIRST, None, ())
+
+
+class TagEditor(Gtk.Window):
     """Window allowing to edit a tag's properties."""
 
     def __init__(self, req, vmanager, tag=None):
-        gtk.Window.__init__(self)
-        self.__gobject_init__()
+        Gtk.Window.__init__(self)
+
         self.req = req
         self.vmanager = vmanager
         self.tag = tag
@@ -193,7 +201,7 @@
         self.tis_selection_changed_hid = None
         self.tag_icon_selector = None
         # Build up the window
-        self.set_position(gtk.WIN_POS_CENTER)
+        self.set_position(Gtk.WindowPosition.CENTER)
         self.set_title('Edit tag')
         self.set_border_width(10)
         self.set_resizable(False)
@@ -206,57 +214,59 @@
     def __build_window(self):
         """Build up the widget"""
         # toplevel widget
-        self.top_vbox = gtk.VBox()
+        self.top_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.add(self.top_vbox)
-        # header line: icon, table with name and "hide in wv"
-        self.hdr_align = gtk.Alignment()
-        self.top_vbox.pack_start(self.hdr_align)
+        # header line: icon, grid with name and "hide in wv"
+        #FIXME
+        self.hdr_align = Gtk.Alignment()
+        self.top_vbox.pack_start(self.hdr_align, True, True, 0)
         self.hdr_align.set_padding(0, 25, 0, 0)
-        self.hdr_hbox = gtk.HBox()
-        self.hdr_align.add(self.hdr_hbox)
-        self.hdr_hbox.set_spacing(10)
+        self.hdr_box = Gtk.Box()
+        self.hdr_align.add(self.hdr_box)
+        self.hdr_box.set_spacing(10)
         # Button to tag icon selector
-        self.ti_bt = gtk.Button()
-        self.ti_bt_label = gtk.Label()
+        self.ti_bt = Gtk.Button()
+        self.ti_bt_label = Gtk.Label()
         self.ti_bt.add(self.ti_bt_label)
-        self.hdr_hbox.pack_start(self.ti_bt)
+        self.hdr_box.pack_start(self.ti_bt, True, True, 0)
         self.ti_bt.set_size_request(64, 64)
-        self.ti_bt.set_relief(gtk.RELIEF_HALF)
+        self.ti_bt.set_relief(Gtk.ReliefStyle.HALF)
         # vbox for tag name and hid in WV
-        self.tp_table = gtk.Table(2, 2)
-        self.hdr_hbox.pack_start(self.tp_table)
-        self.tp_table.set_col_spacing(0, 5)
-        self.tn_entry_lbl_align = gtk.Alignment(0, 0.5)
-        self.tp_table.attach(self.tn_entry_lbl_align, 0, 1, 0, 1)
-        self.tn_entry_lbl = gtk.Label()
+        self.tp_grid = Gtk.Grid()
+        self.hdr_box.pack_start(self.tp_grid, True, True, 0)
+        self.tp_grid.set_column_spacing(5)
+        self.tn_entry_lbl_align = Gtk.Alignment.new(0, 0.5, 0, 0)
+        self.tp_grid.add(self.tn_entry_lbl_align)
+        self.tn_entry_lbl = Gtk.Label()
         self.tn_entry_lbl.set_markup("<span weight='bold'>%s</span>"
                                      % _("Name : "))
         self.tn_entry_lbl_align.add(self.tn_entry_lbl)
-        self.tn_entry = gtk.Entry()
-        self.tp_table.attach(self.tn_entry, 1, 2, 0, 1)
+        self.tn_entry = Gtk.Entry()
         self.tn_entry.set_width_chars(20)
-        self.tn_cb_lbl_align = gtk.Alignment(0, 0.5)
-        self.tp_table.attach(self.tn_cb_lbl_align, 0, 1, 1, 2)
-        self.tn_cb_lbl = gtk.Label(_("Show Tag in Work View :"))
+        self.tp_grid.attach(self.tn_entry, 1, 0, 1, 1)
+        self.tn_cb_lbl_align = Gtk.Alignment.new(0, 0.5, 0, 0)
+        self.tp_grid.attach(self.tn_cb_lbl_align, 0, 1, 1, 1)
+        self.tn_cb_lbl = Gtk.Label(label=_("Show Tag in Work View :"))
         self.tn_cb_lbl_align.add(self.tn_cb_lbl)
-        self.tn_cb = gtk.CheckButton()
-        self.tp_table.attach(self.tn_cb, 1, 2, 1, 2)
+        self.tn_cb = Gtk.CheckButton()
+        self.tp_grid.attach(self.tn_cb, 1, 1, 1, 1)
         # Tag color
-        self.tc_vbox = gtk.VBox()
-        self.top_vbox.pack_start(self.tc_vbox)
-        self.tc_label_align = gtk.Alignment()
-        self.tc_vbox.pack_start(self.tc_label_align)
+        self.tc_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        self.top_vbox.pack_start(self.tc_vbox, True, True, 0)
+        self.tc_label_align = Gtk.Alignment()
+        self.tc_vbox.pack_start(self.tc_label_align, True, True, 0)
         self.tc_label_align.set_padding(0, 0, 0, 0)
-        self.tc_label = gtk.Label()
+        self.tc_label = Gtk.Label()
         self.tc_label_align.add(self.tc_label)
         self.tc_label.set_markup(
             "<span weight='bold'>%s</span>" % _("Select Tag Color:"))
         self.tc_label.set_alignment(0, 0.5)
         # Tag color chooser
-        self.tc_cc_align = gtk.Alignment(0.5, 0.5, 0, 0)
-        self.tc_vbox.pack_start(self.tc_cc_align)
+        self.tc_cc_align = Gtk.Alignment.new(0.5, 0.5, 0, 0)
+        self.tc_vbox.pack_start(self.tc_cc_align, True, True, 0)
         self.tc_cc_align.set_padding(15, 15, 10, 10)
-        self.tc_cc_colsel = SimpleColorSelector()
+        #self.tc_cc_colsel = SimpleColorSelector()
+        self.tc_cc_colsel = Gtk.ColorChooserWidget()
         self.tc_cc_align.add(self.tc_cc_colsel)
         # Icon selector
         self.tag_icon_selector = TagIconSelector()
@@ -272,15 +282,21 @@
             self.tn_entry.connect('changed', self.on_tn_entry_changed)
         self.tn_cb_clicked_hid = self.tn_cb.connect('clicked',
                                                     self.on_tn_cb_clicked)
-        self.tc_cc_colsel.connect('color-changed', self.on_tc_colsel_changed)
-        self.tc_cc_colsel.connect('color-added', self.on_tc_colsel_added)
+        #FIXME
+        #self.tc_cc_colsel.connect('color-changed', self.on_tc_colsel_changed)
+        #self.tc_cc_colsel.connect('color-added', self.on_tc_colsel_added)
+        self.tc_cc_colsel.connect('color-activated',
+                                  self.on_tc_colsel_activated)
         self.connect('delete-event', self.on_close)
 
         # allow fast closing by Escape key
-        agr = gtk.AccelGroup()
+        #FIXME
+        '''
+        agr = Gtk.AccelGroup()
         self.add_accel_group(agr)
-        key, modifier = gtk.accelerator_parse('Escape')
-        agr.connect_group(key, modifier, gtk.ACCEL_VISIBLE, self.on_close)
+        key, modifier = Gtk.accelerator_parse('Escape')
+        agr.connect_group(key, modifier, Gtk.AccelFlags.VISIBLE, self.on_close)
+        '''
 
     def __set_default_values(self):
         """Configure the widget components with their initial default values"""
@@ -291,7 +307,7 @@
         self.tag_icon_selector.handler_block(self.tis_selection_changed_hid)
         # Default icon
         markup = "<span size='small'>%s</span>" % _("Click To\nSet Icon")
-        self.ti_bt_label.set_justify(gtk.JUSTIFY_CENTER)
+        self.ti_bt_label.set_justify(Gtk.Justification.CENTER)
         self.ti_bt_label.set_markup(markup)
         self.ti_bt_label.show()
         self.__set_icon(None)
@@ -301,9 +317,13 @@
         self.tn_cb.set_active(True)
         # Name entry
         self.tn_entry.set_text(_("Enter tag name here"))
-        self.tn_entry.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, None)
+        self.tn_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY,
+                                          None)
         # Color selection
-        self.tc_cc_colsel.unselect_color()
+        #FIXME
+        #self.tc_cc_colsel.unselect_color()
+        self.tc_cc_colsel.set_use_alpha(False)
+        #self.tc_cc_colsel.set_rgba(self.tc_cc_colsel, None)
         # Custom colors
         self.custom_colors = self.config.get('custom_colors')
         if len(self.custom_colors) > 0:
@@ -321,8 +341,8 @@
         if icon is not None:
             for i in self.ti_bt:
                 self.ti_bt.remove(i)
-            ti_bt_img = gtk.image_new_from_icon_name(icon,
-                                                     gtk.ICON_SIZE_BUTTON)
+            ti_bt_img = Gtk.Image.new_from_icon_name(icon,
+                                                     Gtk.IconSize.BUTTON)
             ti_bt_img.show()
             self.ti_bt.add(ti_bt_img)
         else:
@@ -401,8 +421,11 @@
         """Callback: displays the tag icon selector widget next
         to the button."""
         rect = self.ti_bt.get_allocation()
-        pos_x, pos_y = \
-            self.ti_bt.window.get_origin()
+        # print self.ti_bt.get_window().get_origin()
+#FIXME
+        result, pos_x, pos_y = \
+            self.ti_bt.get_window().get_origin()
+            # self.ti_bt.window.get_origin()
         self.tag_icon_selector.show_at_position(
             pos_x + rect.x + rect.width + 2,
             pos_y + rect.y)
@@ -417,17 +440,18 @@
         self.tn_entry_last_recorded_value = self.tn_entry.get_text()
         # check validity
         if self.tn_entry_last_recorded_value.strip() == "":
-            self.tn_entry.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY,
-                                              gtk.STOCK_DIALOG_ERROR)
+            self.tn_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY,
+                                              Gtk.STOCK_DIALOG_ERROR)
         else:
-            self.tn_entry.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, None)
+            self.tn_entry.set_icon_from_stock(
+                Gtk.EntryIconPosition.SECONDARY, None)
         # filter out change requests to reduce commit overhead
         if self.tn_entry_watch_id is None:
             # There is no watchers for the text entry. Register one.
             # Also, wait 1 second before commiting the change in order to
             # reduce rename requests
             tn_entry_changes = self.watch_tn_entry_changes
-            self.tn_entry_watch_id = gobject.timeout_add(1000,
+            self.tn_entry_watch_id = GObject.timeout_add(1000,
                                                          tn_entry_changes)
 
     def on_tn_cb_clicked(self, widget):
@@ -448,6 +472,19 @@
             else:
                 self.tag.del_attribute('color')
 
+    def on_tc_colsel_activated(self, widget, color):
+        """Callback: update the tag color depending on the current color
+        selection"""
+        print("activated", widget, color, " <--- ignoring for now")
+        return
+        #color = self.tc_cc_colsel.get_rgba().to_color()
+        color = color.to_color()
+        if self.tag is not None:
+            if color is not None:
+                self.tag.set_attribute('color', color)
+            else:
+                self.tag.del_attribute('color')
+
     def on_tc_colsel_added(self, widget):
         """Callback: if a new color is added, we register it in the
         configuration"""
 
=== renamed file 'GTG/gtk/browser/taskbrowser.glade' => 'GTG/gtk/browser/taskbrowser.ui'
--- GTG/gtk/browser/taskbrowser.glade	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/taskbrowser.ui	2014-01-12 07:15:48 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="MainWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Getting Things GNOME!</property>
@@ -10,9 +9,10 @@
     <signal name="configure-event" handler="on_move" swapped="no"/>
     <signal name="size-allocate" handler="on_size_allocate" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="master_vbox">
+      <object class="GtkBox" id="master_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="browser_menu">
             <property name="visible">True</property>
@@ -21,7 +21,6 @@
               <object class="GtkMenuItem" id="bm_task">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Tasks</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -34,7 +33,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Create a new task</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">bm_img_task</property>
                         <property name="use_stock">False</property>
@@ -48,7 +46,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">bm_img_subtask</property>
                         <property name="use_stock">False</property>
@@ -62,7 +59,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -81,7 +77,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">bm_img_done</property>
                         <property name="use_stock">False</property>
@@ -95,7 +90,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">bm_img_dismiss</property>
                         <property name="use_stock">False</property>
@@ -109,7 +103,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -127,7 +120,6 @@
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -142,7 +134,6 @@
               <object class="GtkMenuItem" id="bm_edit">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -153,7 +144,6 @@
                       <object class="GtkImageMenuItem" id="edit_undo">
                         <property name="label">gtk-undo</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -163,7 +153,6 @@
                       <object class="GtkImageMenuItem" id="edit_redo">
                         <property name="label">gtk-redo</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -178,7 +167,6 @@
                       <object class="GtkMenuItem" id="plugins_mi">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label">P_lugins</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_plugins_activate" swapped="no"/>
@@ -188,7 +176,6 @@
                       <object class="GtkMenuItem" id="backends_mi">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label">_Synchronization Services</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_backends_activate" swapped="no"/>
@@ -205,7 +192,6 @@
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -220,7 +206,6 @@
               <object class="GtkMenuItem" id="menu_view">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -231,7 +216,6 @@
                       <object class="GtkCheckMenuItem" id="view_workview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Work View</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="on_view_workview_toggled" swapped="no"/>
@@ -247,7 +231,6 @@
                       <object class="GtkCheckMenuItem" id="view_sidebar">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Tags Sidebar</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="on_view_sidebar_toggled" swapped="no"/>
@@ -257,7 +240,6 @@
                       <object class="GtkCheckMenuItem" id="view_closed">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Closed Tasks Pane</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="on_view_closed_toggled" swapped="no"/>
@@ -267,7 +249,6 @@
                       <object class="GtkCheckMenuItem" id="view_toolbar">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">T_oolbar</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="on_view_toolbar_toggled" swapped="no"/>
@@ -277,7 +258,6 @@
                       <object class="GtkCheckMenuItem" id="view_quickadd">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Quick Add Entry</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="on_view_quickadd_toggled" swapped="no"/>
@@ -290,7 +270,6 @@
             <child>
               <object class="GtkMenuItem" id="plugin_mi">
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Plugins</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -305,7 +284,6 @@
               <object class="GtkMenuItem" id="help_mi">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -318,7 +296,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Open GTG help</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="image">image7</property>
                         <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
@@ -337,7 +314,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Help to translate GTG into your language</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -350,7 +326,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Report a problem to GTG developers</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -368,7 +343,6 @@
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -387,9 +361,10 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox_toolbars">
+          <object class="GtkBox" id="vbox_toolbars">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkToolbar" id="task_toolbar">
                 <property name="visible">True</property>
@@ -398,7 +373,6 @@
                   <object class="GtkToolButton" id="new_task_b">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">New Task</property>
                     <property name="icon_name">gtg-task-new</property>
@@ -412,7 +386,6 @@
                 <child>
                   <object class="GtkToolButton" id="new_subtask_b">
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">New Subtask</property>
                     <property name="icon_name">gtg-task-new</property>
                     <signal name="clicked" handler="on_add_subtask" swapped="no"/>
@@ -426,7 +399,6 @@
                   <object class="GtkToolButton" id="edit_b">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible_horizontal">False</property>
                     <property name="visible_vertical">False</property>
                     <property name="label" translatable="yes">Edit</property>
@@ -450,7 +422,6 @@
                 <child>
                   <object class="GtkToolButton" id="Undo">
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Undo</property>
                     <property name="stock_id">gtk-undo</property>
                   </object>
@@ -462,7 +433,6 @@
                 <child>
                   <object class="GtkToolButton" id="Redo">
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Redo</property>
                     <property name="stock_id">gtk-redo</property>
                   </object>
@@ -486,7 +456,6 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Mark as Done</property>
                     <property name="icon_name">gtg-task-done</property>
@@ -502,7 +471,6 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Dismiss</property>
                     <property name="icon_name">gtg-task-dismiss</property>
                     <signal name="clicked" handler="on_dismiss_task" swapped="no"/>
@@ -516,7 +484,6 @@
                   <object class="GtkToolButton" id="delete_b">
                     <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Delete</property>
                     <property name="icon_name">edit-delete</property>
                     <signal name="clicked" handler="on_delete_task" swapped="no"/>
@@ -540,7 +507,6 @@
                   <object class="GtkToggleToolButton" id="workview_toggle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Work View</property>
                     <property name="stock_id">gtk-index</property>
@@ -566,15 +532,16 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHPaned" id="hpaned1">
+          <object class="GtkPaned" id="hpaned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="sidebar_vbox">
+              <object class="GtkBox" id="sidebar_vbox">
                 <property name="width_request">75</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkHBox" id="hbox4">
+                  <object class="GtkBox" id="box4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -608,7 +575,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="relief">none</property>
                         <signal name="clicked" handler="on_view_sidebar_toggled" swapped="no"/>
                         <child>
@@ -643,8 +609,6 @@
                       <object class="GtkScrolledWindow" id="sidebar-scroll">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <placeholder/>
@@ -675,11 +639,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="main_vbox">
+              <object class="GtkBox" id="main_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkHBox" id="quickadd_pane">
+                  <object class="GtkBox" id="quickadd_pane">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -692,9 +657,6 @@
                         <property name="invisible_char">●</property>
                         <property name="secondary_icon_stock">gtk-clear</property>
                         <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">True</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
                         <signal name="changed" handler="on_quickadd_field_changed" swapped="no"/>
                         <signal name="activate" handler="on_quickadd_field_activate" swapped="no"/>
                         <signal name="icon-press" handler="on_quickadd_field_icon_press" swapped="no"/>
@@ -714,9 +676,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVPaned" id="vpaned1">
+                  <object class="GtkPaned" id="vpaned1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkNotebook" id="main_notebook">
                         <property name="visible">True</property>
@@ -728,7 +691,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hscrollbar_policy">never</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -794,9 +756,10 @@
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <property name="program_name" translatable="yes">Getting Things GNOME!</property>
+    <property name="program_name">Getting Things GNOME!</property>
     <property name="copyright" translatable="yes">Copyright © 2008-2013 Lionel Dricot, Bertrand Rousseau</property>
-    <property name="comments" translatable="yes">GTG is a personal tasks and TODO-list items organizer for the GNOME desktop environment.</property>
+    <property name="comments" translatable="yes">GTG is a personal tasks and TODO-list items
+organizer for the GNOME desktop environment.</property>
     <property name="website_label" translatable="yes">GTG website</property>
     <property name="license" translatable="yes">Getting Things GNOME! is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 
@@ -810,12 +773,13 @@
     <signal name="delete-event" handler="on_about_delete" swapped="no"/>
     <signal name="response" handler="on_about_close" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="about_dialog_vbox">
+      <object class="GtkBox" id="about_dialog_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -863,7 +827,6 @@
         <property name="label">gtk-edit</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -881,7 +844,6 @@
         <property name="label" translatable="yes">Mark as Not Done</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">ctcm_img_mark_not_done</property>
         <property name="use_stock">False</property>
@@ -894,7 +856,6 @@
         <property name="label" translatable="yes">Und_ismiss</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">tcm_img_undismiss</property>
         <property name="use_stock">False</property>
@@ -907,7 +868,6 @@
         <property name="label">gtk-delete</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -972,7 +932,6 @@
         <property name="label" translatable="yes">Add a subtask</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">tcm_img_add_subtask</property>
         <property name="use_stock">False</property>
@@ -985,7 +944,6 @@
         <property name="label">gtk-edit</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -1003,7 +961,6 @@
         <property name="label" translatable="yes">Mark as _Done</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">tcm_img_mark_done</property>
         <property name="use_stock">False</property>
@@ -1016,7 +973,6 @@
         <property name="label" translatable="yes">D_ismiss</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="image">tcm_img_dismiss</property>
         <property name="use_stock">False</property>
@@ -1029,7 +985,6 @@
         <property name="label">gtk-delete</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -1047,7 +1002,6 @@
         <property name="label" translatable="yes">_Set Start Date</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">False</property>
         <child type="submenu">
@@ -1059,7 +1013,6 @@
                 <property name="label" translatable="yes">T_oday</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_mark_as_started" swapped="no"/>
@@ -1070,7 +1023,6 @@
                 <property name="label" translatable="yes">_Tomorrow</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_start_for_tomorrow" swapped="no"/>
@@ -1081,7 +1033,6 @@
                 <property name="label" translatable="yes">Next _Week</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_start_for_next_week" swapped="no"/>
@@ -1092,7 +1043,6 @@
                 <property name="label" translatable="yes">Next _Month</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_start_for_next_month" swapped="no"/>
@@ -1103,7 +1053,6 @@
                 <property name="label" translatable="yes">Next _Year</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_start_for_next_year" swapped="no"/>
@@ -1120,7 +1069,6 @@
                 <property name="label" translatable="yes">_Clear Start Date</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_start_clear" swapped="no"/>
@@ -1135,7 +1083,6 @@
         <property name="label" translatable="yes">Set Due Date</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">False</property>
         <child type="submenu">
@@ -1147,7 +1094,6 @@
                 <property name="label" translatable="yes">T_oday</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_today" swapped="no"/>
@@ -1158,7 +1104,6 @@
                 <property name="label" translatable="yes">_Tomorrow</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_tomorrow" swapped="no"/>
@@ -1169,7 +1114,6 @@
                 <property name="label" translatable="yes">Next _Week</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_next_week" swapped="no"/>
@@ -1180,7 +1124,6 @@
                 <property name="label" translatable="yes">Next _Month</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_next_month" swapped="no"/>
@@ -1191,7 +1134,6 @@
                 <property name="label" translatable="yes">Next _Year</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_next_year" swapped="no"/>
@@ -1208,7 +1150,6 @@
                 <property name="label" translatable="yes">_Now</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_now" swapped="no"/>
@@ -1219,7 +1160,6 @@
                 <property name="label" translatable="yes">_Soon</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_soon" swapped="no"/>
@@ -1230,7 +1170,6 @@
                 <property name="label" translatable="yes">_Someday</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_someday" swapped="no"/>
@@ -1247,7 +1186,6 @@
                 <property name="label" translatable="yes">_Clear Due Date</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">False</property>
                 <signal name="activate" handler="on_set_due_clear" swapped="no"/>
@@ -1268,7 +1206,6 @@
         <property name="label" translatable="yes">Modify Tags...</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="image">image3</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_modify_tags" swapped="no"/>
 
=== modified file 'GTG/gtk/browser/treeview_factory.py'
--- GTG/gtk/browser/treeview_factory.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/browser/treeview_factory.py	2014-01-12 07:15:48 +0000
@@ -17,9 +17,7 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
-import gobject
-import pango
+from gi.repository import GObject, Gtk, Pango
 import xml.sax.saxutils as saxutils
 import locale
 
@@ -150,7 +148,9 @@
         return sort
 
     def title_sorting(self, task1, task2, order):
-        return cmp(task1.get_title(), task2.get_title())
+        t1 = task1.get_title()
+        t2 = task2.get_title()
+        return (t1 > t2) - (t1 < t2)
 
     def __date_comp(self, task1, task2, para, order):
         '''This is a quite complex method to sort tasks by date,
@@ -174,15 +174,15 @@
             else:
                 raise ValueError(
                     'invalid date comparison parameter: %s') % para
-            sort = cmp(t2, t1)
+            sort = (t2 > t1) - (t2 < t1)
         else:
             sort = 0
 
         # local function
         def reverse_if_descending(s):
-            """Make a cmp() result relative to the top instead of following
+            """Make a cmpare result relative to the top instead of following
                user-specified sort direction"""
-            if order == gtk.SORT_ASCENDING:
+            if order == Gtk.SortType.ASCENDING:
                 return s
             else:
                 return -1 * s
@@ -193,14 +193,16 @@
             t1_tags.sort()
             t2_tags = task2.get_tags_name()
             t2_tags.sort()
-            sort = reverse_if_descending(cmp(t1_tags, t2_tags))
+            cmp_tags = (t1_tags > t2_tags) - (t1_tags < t2_tags)
+            sort = reverse_if_descending(cmp_tags)
 
         if sort == 0:  # Break ties by sorting by title
             t1_title = task1.get_title()
             t2_title = task2.get_title()
             t1_title = locale.strxfrm(t1_title)
             t2_title = locale.strxfrm(t2_title)
-            sort = reverse_if_descending(cmp(t1_title, t2_title))
+            cmp_title = (t1_title > t2_title) - (t1_title < t2_title)
+            sort = reverse_if_descending(cmp_title)
 
         return sort
 
@@ -234,7 +236,7 @@
         t1_name = locale.strxfrm(t1.get_name())
         t2_name = locale.strxfrm(t2.get_name())
         if not t1_sp and not t2_sp:
-            return cmp(t1_name, t2_name)
+            return (t1_name > t2_name) - (t1_name < t2_name)
         elif not t1_sp and t2_sp:
             return 1
         elif t1_sp and not t2_sp:
@@ -242,7 +244,7 @@
         else:
             t1_order = t1.get_attribute("order")
             t2_order = t2.get_attribute("order")
-            return cmp(t1_order, t2_order)
+            return (t1_order > t2_order) - (t1_order < t2_order)
 
     def ontag_task_dnd(self, source, target):
         task = self.req.get_task(source)
@@ -262,7 +264,7 @@
         # Tag id
         col_name = 'tag_id'
         col = {}
-        col['renderer'] = ['markup', gtk.CellRendererText()]
+        col['renderer'] = ['markup', Gtk.CellRendererText()]
         col['value'] = [str, lambda node: node.get_id()]
         col['visible'] = False
         col['order'] = 0
@@ -276,7 +278,7 @@
         render_tags.set_property('ypad', 3)
         col['title'] = _("Tags")
         col['renderer'] = ['tag', render_tags]
-        col['value'] = [gobject.TYPE_PYOBJECT, lambda node: node]
+        col['value'] = [GObject.TYPE_PYOBJECT, lambda node: node]
         col['expandable'] = False
         col['resizable'] = False
         col['order'] = 1
@@ -285,7 +287,7 @@
         # Tag names
         col_name = 'tagname'
         col = {}
-        render_text = gtk.CellRendererText()
+        render_text = Gtk.CellRendererText()
         render_text.set_property('ypad', 3)
         col['renderer'] = ['markup', render_text]
         col['value'] = [str, self.tag_name]
@@ -297,7 +299,7 @@
         # Tag count
         col_name = 'tagcount'
         col = {}
-        render_text = gtk.CellRendererText()
+        render_text = Gtk.CellRendererText()
         render_text.set_property('xpad', 3)
         render_text.set_property('ypad', 3)
         render_text.set_property('xalign', 1.0)
@@ -369,7 +371,7 @@
         # invisible 'task_id' column
         col_name = 'task_id'
         col = {}
-        col['renderer'] = ['markup', gtk.CellRendererText()]
+        col['renderer'] = ['markup', Gtk.CellRendererText()]
         col['value'] = [str, lambda node: node.get_id()]
         col['visible'] = False
         col['order'] = 0
@@ -385,8 +387,8 @@
         # invisible 'title' column
         col_name = 'title'
         col = {}
-        render_text = gtk.CellRendererText()
-        render_text.set_property("ellipsize", pango.ELLIPSIZE_END)
+        render_text = Gtk.CellRendererText()
+        render_text.set_property("ellipsize", Pango.EllipsizeMode.END)
         col['renderer'] = ['markup', render_text]
         col['value'] = [str, self.task_title_column]
         col['visible'] = False
@@ -400,7 +402,7 @@
         render_tags = CellRendererTags()
         render_tags.set_property('xalign', 0.0)
         col['renderer'] = ['tag_list', render_tags]
-        col['value'] = [gobject.TYPE_PYOBJECT, self.task_tags_column]
+        col['value'] = [GObject.TYPE_PYOBJECT, self.task_tags_column]
         col['expandable'] = False
         col['resizable'] = False
         col['order'] = 1
@@ -410,8 +412,8 @@
         col_name = 'label'
         col = {}
         col['title'] = _("Title")
-        render_text = gtk.CellRendererText()
-        render_text.set_property("ellipsize", pango.ELLIPSIZE_END)
+        render_text = Gtk.CellRendererText()
+        render_text.set_property("ellipsize", Pango.EllipsizeMode.END)
         col['renderer'] = ['markup', render_text]
         col['value'] = [str, self.task_label_column]
         col['expandable'] = True
@@ -434,8 +436,10 @@
         treeview.set_rules_hint(False)
         treeview.set_multiple_selection(True)
         # Updating the unactive color (same for everyone)
-        self.unactive_color = \
-            treeview.style.text[gtk.STATE_INSENSITIVE].to_string()
+        color = treeview.get_style_context().get_color(
+            Gtk.StateFlags.INSENSITIVE)
+        # Convert color into #RRRGGGBBB
+        self.unactive_color = color.to_color().to_string()
         return treeview
 
     def build_tag_treeview(self, tree, desc):
@@ -448,8 +452,11 @@
         treeview.set_dnd_name('gtg/tag-iter-str')
         treeview.set_dnd_external('gtg/task-iter-str', self.ontag_task_dnd)
         # Updating the unactive color (same for everyone)
-        self.unactive_color = \
-            treeview.style.text[gtk.STATE_INSENSITIVE].to_string()
+        color = treeview.get_style_context().get_color(
+            Gtk.StateFlags.INSENSITIVE)
+        # Convert color into #RRRGGGBBB
+        self.unactive_color = color.to_color().to_string()
+
         treeview.set_sort_column('tag_id')
         self.tags_view = treeview
         return treeview
 
=== modified file 'GTG/gtk/colors.py'
--- GTG/gtk/colors.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/colors.py	2014-01-12 07:15:48 +0000
@@ -17,7 +17,8 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 # -----------------------------------------------------------------------------
 
-import gtk
+from gi.repository import Gdk
+from functools import reduce
 
 # Take list of Tags and give the background color that should be applied
 # The returned color might be None (in which case, the default is used)
@@ -25,7 +26,7 @@
 
 def background_color(tags, bgcolor=None):
     if not bgcolor:
-        bgcolor = gtk.gdk.color_parse("#FFFFFF")
+        bgcolor = Gdk.color_parse("#FFFFFF")
     # Compute color
     my_color = None
     color_count = 0.0
@@ -35,7 +36,7 @@
     for my_tag in tags:
         my_color_str = my_tag.get_attribute("color")
         if my_color_str:
-            my_color = gtk.gdk.color_parse(my_color_str)
+            my_color = Gdk.color_parse(my_color_str)
             color_count = color_count + 1
             red = red + my_color.red
             green = green + my_color.green
@@ -52,7 +53,7 @@
         green = int(green * alpha + bgcolor.green * (1 - alpha))
         blue = int(blue * alpha + bgcolor.blue * (1 - alpha))
 
-        my_color = gtk.gdk.Color(red, green, blue).to_string()
+        my_color = Gdk.Color(red, green, blue).to_string()
     return my_color
 
 
@@ -82,9 +83,11 @@
     '''
     Calls get_colored_tag_markup for each tag_name in tag_names
     '''
-    tag_markups = map(lambda t: get_colored_tag_markup(req, t), tag_names)
+    tag_markups = [get_colored_tag_markup(req, t) for t in tag_names]
     tags_txt = ""
     if tag_markups:
         # reduce crashes if applied to an empty list
         tags_txt = reduce(lambda a, b: a + ", " + b, tag_markups)
     return tags_txt
+
+# -----------------------------------------------------------------------------
 
=== modified file 'GTG/gtk/crashhandler.py'
--- GTG/gtk/crashhandler.py	2013-02-25 07:35:07 +0000
+++ GTG/gtk/crashhandler.py	2014-01-12 07:15:48 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright 2010 David D. Lowe
 # All rights reserved.
 #
@@ -23,9 +23,9 @@
 
 """GTK except hook for your applications.
 To use, simply import this module and call gtkcrashhandler.initialize().
-Import this module before calling gtk.main().
+Import this module before calling Gtk.main().
 
-If gtkcrashhandler cannot import gtk, pygtk, pango or gobject,
+If gtkcrashhandler cannot import Gtk, Pango or GObject,
 gtkcrashhandler will print a warning and use the default excepthook.
 
 If you're using multiple threads, use gtkcrashhandler_thread decorator."""
@@ -34,24 +34,22 @@
 import os
 import time
 import signal
+import traceback
+import threading
 from contextlib import contextmanager
 
 from GTG import info
 
 
 try:
-    import pygtk
-    pygtk.require("2.0")  # not tested on earlier versions
-    import gtk
-    import pango
-    import gobject
-    _gtk_initialized = True
+    from gi.repository import GObject, Gtk, Pango
 except Exception:
-    print >> sys.stderr, "gtkcrashhandler could not load GTK 2.0"
+    print("gtkcrashhandler could not load GTK 3.0", file=sys.stderr)
     _gtk_initialized = False
-import traceback
+else:
+    _gtk_initialized = True
+
 from gettext import gettext as _
-import threading
 
 APP_NAME = None
 MESSAGE = _("We're terribly sorry. Could you help us fix the problem by "
@@ -99,7 +97,7 @@
     if thread:
         if not isinstance(thread, threading._MainThread):
             tb = "Exception in thread %s:\n%s" % (thread.getName(), tb)
-    print >> sys.stderr, tb
+    print(tb, file=sys.stderr)
 
     # determine whether to add a "Report problem..." button
     add_apport_button = False
@@ -109,7 +107,7 @@
         try:
             from apport.fileutils import likely_packaged
             try:
-                filename = os.path.realpath(os.path.join(os.getcwdu(),
+                filename = os.path.realpath(os.path.join(os.getcwd(),
                                                          sys.argv[0]))
             except:
                 filename = os.path.realpath("/proc/%i/exe" % os.getpid())
@@ -176,17 +174,17 @@
     if dialog is not None:
         return 1
 
-    dialog = gtk.Dialog(title)
+    dialog = Gtk.Dialog(title)
 
     # title Label
-    label = gtk.Label()
+    label = Gtk.Label()
     label.set_markup("<b>%s</b>" % _("It looks like an error has occurred."))
     label.set_alignment(0, 0.5)
-    dialog.get_content_area().pack_start(label, False)
+    dialog.get_content_area().pack_start(label, False, True, 0)
 
     # message Label
     global MESSAGE
-    text_label = gtk.Label()
+    text_label = Gtk.Label()
     text_label.set_markup(MESSAGE)
     text_label.set_alignment(0, 0.5)
     text_label.set_line_wrap(True)
@@ -197,36 +195,36 @@
 
     text_label.connect("size-allocate", text_label_size_allocate)
     if not MESSAGE == "":
-        dialog.get_content_area().pack_start(text_label, False)
+        dialog.get_content_area().pack_start(text_label, False, True, 0)
 
     # TextView with error_string
-    buffer = gtk.TextBuffer()
+    buffer = Gtk.TextBuffer()
     buffer.set_text(error_string)
-    textview = gtk.TextView()
+    textview = Gtk.TextView()
     textview.set_buffer(buffer)
     textview.set_editable(False)
     try:
-        textview.modify_font(pango.FontDescription("monospace 8"))
+        textview.override_font(Pango.FontDescription("monospace 8"))
     except Exception:
-        print >> sys.stderr, "gtkcrashhandler: modify_font raised an exception"
+        print("gtkcrashhandler: override_font raised an exception", file=sys.stderr)
 
     # allow scrolling of textview
-    scrolled = gtk.ScrolledWindow()
-    scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+    scrolled = Gtk.ScrolledWindow()
+    scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
     scrolled.add_with_viewport(textview)
 
     # hide the textview in an Expander widget
-    expander = gtk.expander_new_with_mnemonic(_("_Details"))
+    expander = Gtk.expander_new_with_mnemonic(_("_Details"))
     expander.add(scrolled)
     expander.connect('activate', on_expanded)
-    dialog.get_content_area().pack_start(expander, True)
+    dialog.get_content_area().pack_start(expander, True, True, 0)
 
     # add buttons
     if add_apport_button:
         dialog.add_button(_("_Report this problem..."), 3)
     # If we're have multiple threads, or if we're in a GTK callback,
     # execution can continue normally in other threads, so add button
-    if gtk.main_level() > 0 or threading.activeCount() > 1:
+    if Gtk.main_level() > 0 or threading.activeCount() > 1:
         dialog.add_button(_("_Ignore the error"), 1)
     dialog.add_button(("_Close the program"), 2)
     dialog.set_default_response(2)
@@ -275,28 +273,28 @@
     def gtkcrashhandler_wrapped_run(*args, **kwargs):
         try:
             run(*args, **kwargs)
-        except Exception, ee:
+        except Exception as ee:
             lock = threading.Lock()
             lock.acquire()
             tb = sys.exc_info()[2]
-            if gtk.main_level() > 0:
-                gobject.idle_add(
+            if Gtk.main_level() > 0:
+                GObject.idle_add(
                     lambda ee=ee, tb=tb, thread=threading.currentThread():
                     _replacement_excepthook(ee.__class__, ee, tb,
                                             thread=thread))
             else:
                 time.sleep(0.1)  # ugly hack, seems like threads that are
-                                # started before running gtk.main() cause
+                                # started before running Gtk.main() cause
                                 # this one to crash.
-                                # This delay allows gtk.main() to initialize
+                                # This delay allows Gtk.main() to initialize
                                 # properly.
-                                # My advice: run gtk.main() before starting
-                                # any threads or don't run gtk.main() at all
+                                # My advice: run Gtk.main() before starting
+                                # any threads or don't run Gtk.main() at all
                 _replacement_excepthook(ee.__class__, ee, tb,
                                         thread=threading.currentThread())
             lock.release()
 
-    # return wrapped run if gtkcrashhandler has been initialized
+    # return wrapped run if Gtkcrashhandler has been initialized
     global _gtk_initialized, _old_sys_excepthook
     if _gtk_initialized and _old_sys_excepthook:
         return gtkcrashhandler_wrapped_run
@@ -307,7 +305,7 @@
     # throw test exception
     initialize(app_name="gtkcrashhandler", message="Don't worry, though. This "
                "is just a test. To use the code properly, call "
-               "gtkcrashhandler.initialize() in your PyGTK app to "
+               "gtkcrashhandler.initialize() in your GTK app to "
                "automatically catch any Python exceptions like this.")
 
     class DoNotRunException(Exception):
 
=== modified file 'GTG/gtk/dbuswrapper.py'
--- GTG/gtk/dbuswrapper.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/dbuswrapper.py	2014-01-12 07:15:48 +0000
@@ -38,7 +38,7 @@
     so these need to be converted into blank values D-Bus accepts.
     @return: Cleaned up dictionary
     """
-    for k, v in data.items():
+    for k, v in list(data.items()):
         # Manually specify an arbitrary content type for empty Python arrays
         # because D-Bus can't handle the type conversion for empty arrays
         if not v and isinstance(v, list):
 
=== modified file 'GTG/gtk/delete_dialog.py'
--- GTG/gtk/delete_dialog.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/delete_dialog.py	2014-01-12 07:15:48 +0000
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------------
 
 
-import gtk
+from gi.repository import Gtk
 
 from GTG import _, ngettext
 from GTG.gtk import ViewConfig
@@ -34,8 +34,8 @@
         # Tags which must be updated
         self.update_tags = []
         # Load window tree
-        self.builder = gtk.Builder()
-        self.builder.add_from_file(ViewConfig.DELETE_GLADE_FILE)
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file(ViewConfig.DELETE_UI_FILE)
         signals = {"on_delete_confirm": self.on_delete_confirm,
                    "on_delete_cancel": lambda x: x.hide, }
         self.builder.connect_signals(signals)
 
=== renamed file 'GTG/gtk/deletion.glade' => 'GTG/gtk/deletion.ui'
--- GTG/gtk/deletion.glade	2012-05-23 08:55:31 +0000
+++ GTG/gtk/deletion.ui	2014-01-12 07:15:48 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="confirm_delete">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -28,7 +28,7 @@
                 <property name="use_action_appearance">False</property>
                 <signal name="released" handler="on_delete_cancel" swapped="no"/>
                 <child>
-                  <object class="GtkHBox" id="cd-hbox2">
+                  <object class="GtkBox" id="cd-box2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -75,7 +75,7 @@
                 <signal name="activate" handler="on_delete_confirm" swapped="no"/>
                 <signal name="released" handler="on_delete_confirm" swapped="no"/>
                 <child>
-                  <object class="GtkHBox" id="cd-hbox3">
+                  <object class="GtkBox" id="cd-box3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -120,7 +120,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="cd-hbox1">
+          <object class="GtkBox" id="cd-box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -139,10 +139,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="cd-vbox2">
+              <object class="GtkBox" id="cd-vbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">16</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkLabel" id="cd-label2">
                     <property name="visible">True</property>
 
=== modified file 'GTG/gtk/editor/__init__.py'
--- GTG/gtk/editor/__init__.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/editor/__init__.py	2014-01-12 07:15:48 +0000
@@ -26,7 +26,7 @@
 
 class GnomeConfig:
     current_rep = os.path.dirname(os.path.abspath(__file__))
-    GLADE_FILE = os.path.join(current_rep, "taskeditor.glade")
+    EDITOR_UI_FILE = os.path.join(current_rep, "taskeditor.ui")
 
     MARK_DONE = _("Mark as Done")
     MARK_UNDONE = _("Mark as not Done")
 
=== modified file 'GTG/gtk/editor/calendar.py'
--- GTG/gtk/editor/calendar.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/editor/calendar.py	2014-01-12 07:15:48 +0000
@@ -19,31 +19,29 @@
 
 import datetime
 
-import gobject
-import gtk
-from gtk import gdk
+from gi.repository import GObject, Gdk
 
 from GTG.tools.dates import Date
 
 
-class GTGCalendar(gobject.GObject):
-    """ Wrapper around gtk.Calendar object """
+class GTGCalendar(GObject.GObject):
+    """ Wrapper around Gtk.Calendar object """
 
     # CONSTANTS
     DATE_KIND_DUE = "due"
     DATE_KIND_START = "start"
     DATE_KIND_CLOSED = "closed"
 
-    # Gobject signal description
-    __signal_type__ = (gobject.SIGNAL_RUN_FIRST,
-                       gobject.TYPE_NONE,
+    #Gobject signal description
+    __signal_type__ = (GObject.SignalFlags.RUN_FIRST,
+                       None,
                        [])
 
     __gsignals__ = {'date-changed': __signal_type__, }
 
-    def __init__(self, gtk_builder):
+    def __init__(self, Gtk_builder):
         super(GTGCalendar, self).__init__()
-        self.__builder = gtk_builder
+        self.__builder = Gtk_builder
         self.__date_kind = None
         self.__date = Date.no_date()
         self.__init_gtk__()
@@ -106,13 +104,13 @@
         else:
             # If marked day is 31th, and the next month does not have 31th day,
             # unmark_day raises a warning. Clear_marks() is clever way how
-            # to let PyGTK solve it's bussiness.
+            # to let GTK solve it's bussiness.
             self.__calendar.clear_marks()
 
     def move_calendar_inside(self, width, height, x, y):
         """ This method moves the calender inside the screen whenever part of
         it is displayed outside the screen """
-        screen_width = gtk.gdk.screen_width()
+        screen_width = Gdk.Screen.width()
         # To display calendar inside the screen when editor window is
         # outside leftside of the screen
         if x < width:
@@ -132,32 +130,49 @@
         # ones? question by invernizzi)
         self.move_calendar_inside(width, height, x, y)
         self.__window.grab_add()
-        # We grab the pointer in the calendar
-        gdk.pointer_grab(self.__window.window, True,
-                         gdk.BUTTON1_MASK | gdk.MOD2_MASK)
+
+        #We grab the pointer in the calendar
+        #Gdk.pointer_grab(
+            #self.__window.get_window(),
+            #True,
+            #Gdk.ModifierType.BUTTON1_MASK | Gdk.ModifierType.MOD2_MASK
+        #)
+#FIXME THIS DOES NOT WORK!!!!!!!
+        Gdk.pointer_grab(
+            self.get_window(),
+            True,
+            #Gdk.ModifierType.BUTTON1_MASK | Gdk.ModifierType.MOD2_MASK,
+#FIXME!!!! JUST GUESSING THE TYPE
+            Gdk.EventMask.ALL_EVENTS_MASK,
+            None,
+            None,
+            0,
+        )
+
         self.__window.connect('button-press-event', self.__focus_out)
         self.__sigid = self.__calendar.connect("day-selected",
                                                self.__day_selected,
-                                               "RealDate")
+                                               "RealDate",)
+
         self.__sigid_month = self.__calendar.connect("month-changed",
                                                      self.__month_changed)
-        # Problem: gtk.Calendar does not tell you directly if the
-        #         "day-selected" signal was caused by the user clicking on
-        #         a date, or just browsing the calendar.
+        # Problem: Gtk.Calendar does not tell you directly if the
+        #          "day-selected" signal was caused by the user clicking on
+        #          a date, or just browsing the calendar.
         # Solution: we track that in a variable
         self.__is_user_just_browsing_the_calendar = False
         self.__mark_today_in_bold()
 
     def __focus_out(self, w=None, e=None):
         # We should only close if the pointer click is out of the calendar !
-        p = self.__window.window.get_pointer()
+        p = self.__window.get_window().get_pointer()
         s = self.__window.get_size()
         if not(0 <= p[0] <= s[0] and 0 <= p[1] <= s[1]):
             self.close_calendar()
 
     def close_calendar(self, widget=None, e=None):
         self.__window.hide()
-        gtk.gdk.pointer_ungrab()
+        Gdk.pointer_ungrab(0)
         self.__window.grab_remove()
         if self.__sigid is not None:
             self.__calendar.disconnect(self.__sigid)
@@ -181,11 +196,11 @@
         else:
             # inform the Editor that the date has changed
             self.close_calendar()
-            gobject.idle_add(self.emit, "date-changed")
+            GObject.idle_add(self.emit, "date-changed")
 
     def __from_calendar_date_to_datetime(self, calendar_date):
         '''
-        gtk.Calendar uses a 0-based convention for counting months.
+        Gtk.Calendar uses a 0-based convention for counting months.
         The rest of the world, including the datetime module, starts from 1.
         This is a converter between the two. GTG follows the datetime
         convention.
 
=== modified file 'GTG/gtk/editor/editor.py'
--- GTG/gtk/editor/editor.py	2013-11-23 14:40:23 +0000
+++ GTG/gtk/editor/editor.py	2014-01-12 07:15:48 +0000
@@ -25,8 +25,7 @@
 """
 import time
 
-import pango
-import gtk
+from gi.repository import Gtk, Gdk, Pango
 
 from GTG import _, ngettext
 from GTG.gtk.editor import GnomeConfig
@@ -38,7 +37,7 @@
 from GTG.gtk.editor.calendar import GTGCalendar
 
 
-class TaskEditor:
+class TaskEditor(object):
 
     def __init__(self,
                  requester,
@@ -59,8 +58,8 @@
         self.config = taskconfig
         self.time = None
         self.clipboard = clipboard
-        self.builder = gtk.Builder()
-        self.builder.add_from_file(GnomeConfig.GLADE_FILE)
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file(GnomeConfig.EDITOR_UI_FILE)
         self.donebutton = self.builder.get_object("mark_as_done_editor")
         self.dismissbutton = self.builder.get_object("dismiss_editor")
         self.deletebutton = self.builder.get_object("delete_editor")
@@ -75,25 +74,25 @@
             "mark_as_done_clicked": self.change_status,
             "on_dismiss": self.dismiss,
             "delete_clicked": self.delete_task,
-            "on_duedate_pressed": (self.on_date_pressed,
-                                   GTGCalendar.DATE_KIND_DUE),
-            "on_startdate_pressed": (self.on_date_pressed,
-                                     GTGCalendar.DATE_KIND_START),
-            "on_closeddate_pressed": (self.on_date_pressed,
-                                      GTGCalendar.DATE_KIND_CLOSED),
+            "on_duedate_pressed": lambda w: self.on_date_pressed(
+                w, GTGCalendar.DATE_KIND_DUE),
+            "on_startdate_pressed": lambda w: self.on_date_pressed(
+                w, GTGCalendar.DATE_KIND_START),
+            "on_closeddate_pressed": lambda w: self.on_date_pressed(
+                w, GTGCalendar.DATE_KIND_CLOSED),
             "close_clicked": self.close,
-            "duedate_changed": (self.date_changed,
-                                GTGCalendar.DATE_KIND_DUE),
-            "duedate_focus_out": (self.date_focus_out,
-                                  GTGCalendar.DATE_KIND_DUE),
-            "startingdate_changed": (self.date_changed,
-                                     GTGCalendar.DATE_KIND_START),
-            "startdate_focus_out": (self.date_focus_out,
-                                    GTGCalendar.DATE_KIND_START),
-            "closeddate_changed": (self.date_changed,
-                                   GTGCalendar.DATE_KIND_CLOSED),
-            "closeddate_focus_out": (self.date_focus_out,
-                                     GTGCalendar.DATE_KIND_CLOSED),
+            "duedate_changed": lambda w: self.date_changed(
+                w, GTGCalendar.DATE_KIND_DUE),
+            "duedate_focus_out": lambda w, e: self.date_focus_out(
+                w, e, GTGCalendar.DATE_KIND_DUE),
+            "startingdate_changed": lambda w: self.date_changed(
+                w, GTGCalendar.DATE_KIND_START),
+            "startdate_focus_out": lambda w, e: self.date_focus_out(
+                w, e, GTGCalendar.DATE_KIND_START),
+            "closeddate_changed": lambda w: self.date_changed(
+                w, GTGCalendar.DATE_KIND_CLOSED),
+            "closeddate_focus_out": lambda w, e: self.date_focus_out(
+                w, e, GTGCalendar.DATE_KIND_CLOSED),
             "on_insert_subtask_clicked": self.insert_subtask,
             "on_inserttag_clicked": self.inserttag_clicked,
             "on_move": self.on_move,
@@ -115,7 +114,7 @@
         scrolled.add(self.textview)
         conf_font_value = self.browser_config.get("font_name")
         if conf_font_value != "":
-            self.textview.modify_font(pango.FontDescription(conf_font_value))
+            self.textview.override_font(Pango.FontDescription(conf_font_value))
         # Voila! it's done
         self.calendar = GTGCalendar(self.builder)
         self.duedate_widget = self.builder.get_object("duedate_entry")
@@ -189,38 +188,38 @@
     # Define accelerator-keys for this dialog
     # TODO: undo/redo
     def init_accelerators(self):
-        agr = gtk.AccelGroup()
+        agr = Gtk.AccelGroup()
         self.window.add_accel_group(agr)
 
         # Escape and Ctrl-W close the dialog. It's faster to call close