=== modified file 'zim/__init__.py'
--- zim/__init__.py	2010-02-18 18:16:31 +0000
+++ zim/__init__.py	2010-02-22 19:29:47 +0000
@@ -21,7 +21,6 @@
 import os
 import sys
 import gettext
-import gobject
 import logging
 
 from getopt import gnu_getopt, GetoptError
@@ -316,7 +315,7 @@
 
 
 
-class NotebookInterface(gobject.GObject):
+class NotebookInterface(object):
 	'''Application wrapper for a notebook. Base class for GtkInterface
 	and WWWInterface classes.
 
@@ -329,15 +328,9 @@
 	  Emitted to open a notebook in this interface
 	'''
 
-	# define signals we want to use - (closure type, return type and arg types)
-	__gsignals__ = {
-		'open-notebook': (gobject.SIGNAL_RUN_LAST, None, (object,)),
-	}
-
 	ui_type = None
 
 	def __init__(self, notebook=None):
-		gobject.GObject.__init__(self)
 		self.notebook = None
 		self.plugins = []
 
@@ -479,7 +472,3 @@
 		zim = Application((ZIM_EXECUTABLE,) + args)
 		zim.spawn()
 
-# Need to register classes defining gobject signals
-gobject.type_register(NotebookInterface)
-
-

=== modified file 'zim/gui/__init__.py'
--- zim/gui/__init__.py	2010-02-15 21:41:46 +0000
+++ zim/gui/__init__.py	2010-02-22 19:29:43 +0000
@@ -195,7 +195,7 @@
 			# T: Error message, %s will be the file path
 
 
-class GtkInterface(NotebookInterface):
+class GtkInterface(gobject.GObject, NotebookInterface):
 	'''Main class for the zim Gtk interface. This object wraps a single
 	notebook and provides actions to manipulate and access this notebook.
 
@@ -231,6 +231,7 @@
 	ui_type = 'gtk'
 
 	def __init__(self, notebook=None, page=None,
+		gobject.GObject.__init__(self)
 		fullscreen=False, geometry=None, usedaemon=False):
 		assert not (page and notebook is None), 'BUG: can not give page while notebook is None'
 		NotebookInterface.__init__(self)