Merge lp:~sao/ubuntu/saucy/diodon/new_ext_api_plugins into lp:ubuntu/saucy/diodon

[Oliver Sauder]

* This merge request currently disables the unity-lens to fix #1189154 so it compiles again. This is because of the scope api not 100& stable yet, but also due to the fact that upstream where there is quite a bit of changes going on which will affect the Lens resp. Scope as well. So this will be included in future releases again.
* This merge request also fixes #1197569 resp. ports zeitgeist to version 2.0.
* Valac dependency is now set to valac instead of valac-0.16

Sorry for the many changes in on merge request, just thought is the easiest to have all changes in one version and one go.

[Jeremy Bícha (jbicha)]

Thanks!

review: Approve

=== added directory '.pc/01_port-to-zeitgeist-2.0.patch'
=== added file '.pc/01_port-to-zeitgeist-2.0.patch/.timestamp'
=== added directory '.pc/01_port-to-zeitgeist-2.0.patch/plugins'
=== added directory '.pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist'
=== added file '.pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/wscript_build'
--- .pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/wscript_build	1970-01-01 00:00:00 +0000
+++ .pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/wscript_build	2013-07-06 21:39:24 +0000
@@ -0,0 +1,25 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# Oliver Sauder, 2012
+
+import os
+
+lib = bld.shlib (
+  features = 'c cshlib',
+  target = 'zeitgeist',
+  vapi_dirs = '../../vapi ../../libdiodon',
+  uselib = 'ZEITGEIST PEAS X11 GDKX',
+  use = 'libdiodon',
+  cflags = ['-include', 'config.h'],
+  install_binding = False,
+  packages = 'zeitgeist-1.0 libpeas-1.0 x11 gdk-x11-3.0',
+  source = bld.path.ant_glob (incl='**/*.vala'))
+
+lib.install_path = os.path.join(bld.env['PLUGINS_DIR'], lib.target)
+
+bld.new_task_gen (
+  features = 'intltool_in',
+  podir = '../../po',
+  source = 'zeitgeist.plugin.in',
+  flags = ["-d", "-q", "-u", "-c"],
+  install_path = lib.install_path)

=== added file '.pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/zeitgeist-plugin.vala'
--- .pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/zeitgeist-plugin.vala	1970-01-01 00:00:00 +0000
+++ .pc/01_port-to-zeitgeist-2.0.patch/plugins/zeitgeist/zeitgeist-plugin.vala	2013-07-06 21:39:24 +0000
@@ -0,0 +1,177 @@
+/*
+ * Diodon - GTK+ clipboard manager.
+ * Copyright (C) 2012 Diodon Team <[e-mail]>
+ *
+ * This program 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 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Diodon.Plugins
+{
+    /**
+     * A Zeitgeist data provider for diodon
+     *
+     * @author Oliver Sauder <[e-mail]>
+     */
+    public class ZeitgeistPlugin : Peas.ExtensionBase, Peas.Activatable
+    {
+        private Zeitgeist.Log log;
+        public Object object { get; construct; }
+
+        public ZeitgeistPlugin()
+        {
+            Object();
+        }
+
+        public void activate()
+        {
+            Controller controller = object as Controller;
+           
+            if(log == null) {
+                log = new Zeitgeist.Log();
+            }
+            
+            controller.on_add_item.connect(add_clipboard_item);
+        }
+
+        public void deactivate()
+        {
+            Controller controller = object as Controller;
+            
+            controller.on_add_item.disconnect(add_clipboard_item);
+        }
+
+        public void update_state()
+        {
+        }
+        
+        private void add_clipboard_item(IClipboardItem item)
+        {
+            string interpretation = Zeitgeist.NFO_PLAIN_TEXT_DOCUMENT;
+            if(item is FileClipboardItem) {
+                interpretation = Zeitgeist.NFO_FILE_DATA_OBJECT;
+            }
+            else if (item is ImageClipboardItem) {
+                interpretation = Zeitgeist.NFO_IMAGE;
+            }
+        
+            string? origin = get_path_of_active_application();
+            
+            Zeitgeist.Subject subject = new Zeitgeist.Subject();
+            
+            subject.set_uri("clipboard://" + item.get_checksum());
+            subject.set_interpretation(interpretation);
+            subject.set_manifestation(Zeitgeist.NFO_DATA_CONTAINER);
+            subject.set_mimetype(item.get_mime_type());
+            if(origin != null) {
+                subject.set_origin(origin);
+            }
+            subject.set_text(item.get_label());
+            //subject.set_storage("");
+            
+            Zeitgeist.Event event = new Zeitgeist.Event();
+            //event.set_id(
+            event.set_interpretation(Zeitgeist.ZG_CREATE_EVENT);
+            event.set_manifestation(Zeitgeist.ZG_USER_ACTIVITY);
+            event.set_actor("application://diodon.desktop");
+            event.add_subject(subject);
+            // content should be added, however ignored as currently
+            // data is not being read
+            //event.set_payload();
+            
+            TimeVal cur_time = TimeVal();
+            int64 timestamp = Zeitgeist.Timestamp.from_timeval(cur_time);
+            event.set_timestamp(timestamp);
+            
+            log.insert_events_no_reply(event, null);
+        }
+        
+        private string? get_path_of_active_application()
+        {
+            X.Window window = get_active_window();
+            if(window != X.None) {
+                ulong pid = get_pid(window);
+                
+                if(pid != 0) {
+                    File file = File.new_for_path("/proc/" + pid.to_string() + "/exe");
+                    try {
+                        FileInfo info = file.query_info(FileAttribute.STANDARD_SYMLINK_TARGET, 
+                            FileQueryInfoFlags.NOFOLLOW_SYMLINKS);
+                        if(info != null) {
+                            string path = info.get_attribute_as_string(
+                                FileAttribute.STANDARD_SYMLINK_TARGET);
+                            debug("Path is %s", path);
+                            return path;
+                        }
+                    }
+                    catch(GLib.Error e) {
+                        debug("Error occured while reading %s: %s",
+                            file.get_path(), e.message);
+                    }
+                }
+            }
+            
+            return null;
+        }
+        
+        private X.Window get_active_window()
+        {
+            unowned Gdk.Screen screen = Gdk.Screen.get_default();
+            Gdk.Window active_window = screen.get_active_window();
+            if(active_window != null) {
+                X.Window xactive_window = Gdk.X11Window.get_xid(active_window);
+                debug("Active window %#x", (int)xactive_window);
+                return xactive_window;
+            }
+            
+            return X.None;
+        }
+        
+        private ulong get_pid(X.Window window)
+        {
+            unowned X.Display display = Gdk.x11_get_default_xdisplay();
+            X.Atom wm_pid = display.intern_atom("_NET_WM_PID", false);
+            
+            if(wm_pid != X.None) {
+                X.Atom actual_type_return;
+                int actual_format_return;
+                ulong nitems_return;
+                ulong bytes_after_return;
+                void* prop_return = null;
+
+                int status = display.get_window_property(window, wm_pid, 0,
+                    long.MAX, false, 0, out actual_type_return, out actual_format_return,
+                    out nitems_return, out bytes_after_return, out prop_return);
+                
+                if(status == X.Success) {
+                    if(prop_return != null) {
+                        ulong pid = *((ulong*)prop_return);
+                        debug("Copied by process with pid %lu", pid);
+                        return pid;
+                    }
+                }
+            }
+            
+            return 0;
+        }
+    }
+}
+
+[ModuleInit]
+public void peas_register_types (GLib.TypeModule module)
+{
+  Peas.ObjectModule objmodule = module as Peas.ObjectModule;
+  objmodule.register_extension_type (typeof (Peas.Activatable),
+                                     typeof (Diodon.Plugins.ZeitgeistPlugin));
+}
+

=== added file '.pc/01_port-to-zeitgeist-2.0.patch/wscript'
--- .pc/01_port-to-zeitgeist-2.0.patch/wscript	1970-01-01 00:00:00 +0000
+++ .pc/01_port-to-zeitgeist-2.0.patch/wscript	2013-07-06 21:39:24 +0000
@@ -0,0 +1,169 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# Oliver Sauder, 2010
+
+import subprocess, os, traceback, waflib
+import Options, Logs
+from waflib.Tools import waf_unit_test
+
+NAME = 'Diodon'
+VERSION = '1.0.2'
+APPNAME = 'diodon'
+WEBSITE = 'https://launchpad.net/diodon'
+COPYRIGHT = 'Copyright \xc2\xa9 2010 Diodon Team'
+BUSNAME = 'net.launchpad.Diodon'
+BUSOBJECTPATH = '/net/launchpad/diodon'
+
+VERSION_MAJOR_MINOR = '.'.join (VERSION.split ('.')[0:2])
+VERSION_MAJOR = '.'.join (VERSION.split ('.')[0:1])
+top = '.'
+out = '_build_'
+
+def options(opt):
+    opt.tool_options('compiler_c')
+    opt.tool_options('waf_unit_test')
+    opt.tool_options('vala')
+    opt.tool_options('gnu_dirs')
+    opt.tool_options('intltool')
+    opt.tool_options('glib2')
+    opt.add_option('--update-po',                action='store_true', default=False, dest='update_po', help='Update localization files')
+    opt.add_option('--debug',                    action='store_true', default=False, dest='debug',     help='Debug mode')
+    opt.add_option('--disable-indicator-plugin', action='store_true', default=False, dest='disable_indicator', help='Disable build of indicator plugin')
+    opt.add_option('--enable-unitylens-plugin',  action='store_true', default=False, dest='enable_unitylens', help='Enable build of unity lens plugin')
+    opt.add_option('--enable-zeitgeist-plugin',  action='store_true', default=False, dest='enable_zeitgeist', help='Enable build of zeitgeist plugin')
+    opt.add_option('--build-doc',                action='store_true', default=False, dest='doc', help='Build the api documentation')
+    opt.add_option('--skiptests',                action='store_true', default=False, dest='skiptests', help='Skip unit tests')
+
+def configure(conf):
+    conf.load('compiler_c intltool gnu_dirs glib2 waf_unit_test')
+    if Options.options.doc:
+    	conf.load('valadoc')
+    
+    conf.load('vala', funs='')
+    conf.check_vala(min_version=(0,16,0))
+    
+    conf.check_cfg(package='gdk-3.0',           uselib_store='GDK',          atleast_version='3.0.8',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='gdk-x11-3.0',       uselib_store='GDKX',         atleast_version='3.0.8',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='gee-1.0',           uselib_store='GEE',          atleast_version='0.5.0',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='libpeas-1.0',       uselib_store='PEAS',         atleast_version='1.1.0',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='libpeas-gtk-1.0',   uselib_store='PEASGTK',      atleast_version='1.1.0',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='gio-2.0',           uselib_store='GIO',          atleast_version='2.32.0', mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='gio-unix-2.0',      uselib_store='GIOUNIX',      atleast_version='2.32.0', mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='glib-2.0',          uselib_store='GLIB',         atleast_version='2.32.0', mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='gtk+-3.0',          uselib_store='GTK',          atleast_version='3.0.8',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='libxml-2.0',        uselib_store='XML',          atleast_version='2.7.6',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='unique-3.0',        uselib_store='UNIQUE',       atleast_version='3.0.0',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='x11',               uselib_store='X11',          atleast_version='1.3.2',  mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='xtst',              uselib_store='XTST',         atleast_version='1.2.0',  mandatory=1, args='--cflags --libs')
+    
+    # FIXME: waf throws up when assigning an empty string
+    # we need a better way of configuring plugins which are enabled
+    # by default anyway
+    ACTIVE_PLUGINS = ' '
+    # check if indicator plugin should be built
+    conf.env['INDICATOR'] = not(Options.options.disable_indicator)
+    if not(Options.options.disable_indicator):
+        conf.check_cfg(package='appindicator3-0.1', uselib_store='APPINDICATOR', atleast_version='0.3.0',  mandatory=1, args='--cflags --libs')
+        ACTIVE_PLUGINS = "'indicator'"
+        
+    # check if unity lens plugin should be built
+    conf.env['UNITYLENS'] = Options.options.enable_unitylens
+    if Options.options.enable_unitylens:
+        conf.check_cfg(package='unity',   uselib_store='UNITY', atleast_version='5.8.0',  mandatory=1, args='--cflags --libs')
+        conf.check_cfg(package='dee-1.0', uselib_store='DEE',   atleast_version='0.5.18', mandatory=1, args='--cflags --libs')
+      
+    conf.env['ZEITGEIST'] = Options.options.enable_zeitgeist
+    if Options.options.enable_zeitgeist:
+        conf.check_cfg(package='zeitgeist-1.0', uselib_store='ZEITGEIST', atleast_version='0.3.12', mandatory=1, args='--cflags --libs')    
+
+    # FIXME: conf.env and conf.define should not both be needed?
+    conf.define('PACKAGE_NAME', APPNAME)
+    conf.env['PACKAGE_NAME'] = APPNAME
+    conf.define('ACTIVE_PLUGINS', ACTIVE_PLUGINS)
+    conf.env['ACTIVE_PLUGINS'] = ACTIVE_PLUGINS
+    conf.define('GETTEXT_PACKAGE', APPNAME)
+    conf.env['GETTEXT_PACKAGE'] = APPNAME
+    conf.define('VERSION', VERSION)
+    conf.env['VERSION'] = VERSION
+    conf.define('COPYRIGHT', COPYRIGHT)
+    conf.define('WEBSITE', WEBSITE)
+    conf.define('APPNAME', NAME)
+    conf.define('BUSNAME', BUSNAME)
+    conf.env['BUSNAME'] = BUSNAME
+    conf.define('BUSOBJECTPATH', BUSOBJECTPATH)
+    conf.env['BUSOBJECTPATH'] = BUSOBJECTPATH
+    conf.define('SHAREDIR', os.path.join(conf.env['DATADIR'], APPNAME))
+    conf.define('LIBDIR', os.path.join(conf.env['LIBDIR'], APPNAME))
+    conf.define('PLUGINS_DIR', os.path.join(conf.env['LIBDIR'], APPNAME, 'plugins'))
+    conf.env['PLUGINS_DIR'] = os.path.join(conf.env['LIBDIR'], APPNAME, 'plugins')
+    conf.define('PLUGINS_DATA_DIR', os.path.join(conf.env['DATADIR'], APPNAME, 'plugins'))
+      
+    # set 'default' variant
+    conf.define ('DEBUG', 0)
+    conf.env['CFLAGS']=['-O2']
+    conf.env['VALAFLAGS'] = ['--disable-assert']
+    
+    # set some debug relevant config values
+    if Options.options.debug:
+        conf.define ('DEBUG', 1)
+        conf.env['CFLAGS'] = ['-O0', '-g3']
+        conf.env['VALAFLAGS'] = ['-g', '-v', '--enable-checking']
+
+    conf.write_config_header ('config.h', remove=False)
+
+def build(ctx):
+    ctx.add_subdirs('po data libdiodon plugins diodon')
+    
+    if not Options.options.skiptests:
+        ctx.add_subdirs('tests')
+        
+    if ctx.env['VALADOC']:
+    	ctx.add_subdirs('doc')
+    ctx.add_post_fun(post)
+    
+    # to execute all tests:
+	# $ waf --alltests
+	# to set this behaviour permanenly:    
+    ctx.options.all_tests = True
+
+def post(ctx):
+    waf_unit_test.summary(ctx)
+    
+    # Tests have to pass
+    lst = getattr(ctx, 'utest_results', [])
+    if lst:
+        tfail = len([x for x in lst if x[1]])
+        if tfail:
+            ctx.fatal("Some test failed.")
+	
+    if ctx.cmd == 'install':
+        ctx.exec_command('/sbin/ldconfig')
+
+def dist(ctx):
+    # set the compression type to gzip (default is bz2)
+    ctx.algo = "tar.gz"
+  
+def shutdown(self):
+    if Options.options.update_po:
+        os.chdir('./po')
+        try:
+            try:
+                size_old = os.stat (APPNAME + '.pot').st_size
+            except:
+                size_old = 0
+            subprocess.call (['intltool-update', '-p', '-g', APPNAME])
+            size_new = os.stat (APPNAME + '.pot').st_size
+            if size_new <> size_old:
+                Logs.info("Updated po template.")
+                try:
+                    command = 'intltool-update -r -g %s' % APPNAME
+                    self.exec_command (command)
+                    Logs.info("Updated translations.")
+                except:
+                    Logs.error("Failed to update translations.")
+        except:
+            traceback.print_exc(file=open("errlog.txt","a"))
+            Logs.error("Failed to generate po template.")
+            Logs.errors("Make sure intltool is installed.")
+        os.chdir ('..')
+

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-01-04 23:54:44 +0000
+++ .pc/applied-patches	2013-07-06 21:39:24 +0000
@@ -0,0 +1,1 @@
+01_port-to-zeitgeist-2.0.patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-19 22:41:39 +0000
+++ debian/changelog	2013-07-06 21:39:24 +0000
@@ -1,3 +1,12 @@
+diodon (1.0.2-0ubuntu2) saucy; urgency=low
+
+  * Deactivate unitylens-plugin (LP: #1189154)
+  * debian/patches/01_port-to-zeitgeist-2.0.patch
+    - Port to zeitgeist-2.0 (LP: #1197569)
+  * Using valac dependency instead of valac-0.16
+
+ -- Oliver Sauder <[e-mail]>  Sat, 06 Jul 2013 14:58:19 +0300
+
 diodon (1.0.2-0ubuntu1) raring; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2013-01-04 23:54:44 +0000
+++ debian/control	2013-07-06 21:39:24 +0000
@@ -14,13 +14,12 @@
                libgtk-3-dev (>=3.0.8),
                libpeas-dev (>=1.1.1),
                libunique-3.0-dev (>=3.0.0),
-               libunity-dev (>= 5.8.0),
                libx11-dev (>= 1.3.2),
                libxml2-dev (>= 2.7.6),
                libxtst-dev (>= 1.2.0),
-               libzeitgeist-dev (>= 0.3.12),
+               libzeitgeist-2.0-dev (>= 0.9.14),
                python,
-               valac-0.16 (>=0.16.0)
+               valac (>=0.16.0)
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/diodon
 
@@ -103,4 +102,4 @@
  Diodon is also extensible through its plugin system.
  .
  This package contains following additional plugins:
-  * Unity Lens
+ Zeitgeist Data-Source

=== modified file 'debian/diodon-plugins.install'
--- debian/diodon-plugins.install	2013-01-04 23:54:44 +0000
+++ debian/diodon-plugins.install	2013-07-06 21:39:24 +0000
@@ -1,3 +1,1 @@
-usr/lib/*/diodon/plugins/unitylens
 usr/lib/*/diodon/plugins/zeitgeist
-usr/share/unity

=== added directory 'debian/patches'
=== added file 'debian/patches/01_port-to-zeitgeist-2.0.patch'
--- debian/patches/01_port-to-zeitgeist-2.0.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_port-to-zeitgeist-2.0.patch	2013-07-06 21:39:24 +0000
@@ -0,0 +1,91 @@
+Index: new_ext_api_plugins/wscript
+===================================================================
+--- new_ext_api_plugins.orig/wscript	2013-07-06 22:50:14.616516000 +0300
++++ new_ext_api_plugins/wscript	2013-07-06 22:52:34.836653606 +0300
+@@ -74,7 +74,7 @@
+       
+     conf.env['ZEITGEIST'] = Options.options.enable_zeitgeist
+     if Options.options.enable_zeitgeist:
+-        conf.check_cfg(package='zeitgeist-1.0', uselib_store='ZEITGEIST', atleast_version='0.3.12', mandatory=1, args='--cflags --libs')    
++        conf.check_cfg(package='zeitgeist-2.0', uselib_store='ZEITGEIST', atleast_version='0.9.14', mandatory=1, args='--cflags --libs')
+ 
+     # FIXME: conf.env and conf.define should not both be needed?
+     conf.define('PACKAGE_NAME', APPNAME)
+Index: new_ext_api_plugins/plugins/zeitgeist/wscript_build
+===================================================================
+--- new_ext_api_plugins.orig/plugins/zeitgeist/wscript_build	2013-07-06 22:50:14.616516000 +0300
++++ new_ext_api_plugins/plugins/zeitgeist/wscript_build	2013-07-07 00:19:52.708792613 +0300
+@@ -12,7 +12,7 @@
+   use = 'libdiodon',
+   cflags = ['-include', 'config.h'],
+   install_binding = False,
+-  packages = 'zeitgeist-1.0 libpeas-1.0 x11 gdk-x11-3.0',
++  packages = 'zeitgeist-2.0 libpeas-1.0 x11 gdk-x11-3.0',
+   source = bld.path.ant_glob (incl='**/*.vala'))
+ 
+ lib.install_path = os.path.join(bld.env['PLUGINS_DIR'], lib.target)
+Index: new_ext_api_plugins/plugins/zeitgeist/zeitgeist-plugin.vala
+===================================================================
+--- new_ext_api_plugins.orig/plugins/zeitgeist/zeitgeist-plugin.vala	2013-07-06 23:53:02.556749881 +0300
++++ new_ext_api_plugins/plugins/zeitgeist/zeitgeist-plugin.vala	2013-07-07 00:20:14.784793199 +0300
+@@ -57,33 +57,33 @@
+         
+         private void add_clipboard_item(IClipboardItem item)
+         {
+-            string interpretation = Zeitgeist.NFO_PLAIN_TEXT_DOCUMENT;
++            string interpretation = Zeitgeist.NFO.PLAIN_TEXT_DOCUMENT;
+             if(item is FileClipboardItem) {
+-                interpretation = Zeitgeist.NFO_FILE_DATA_OBJECT;
++                interpretation = Zeitgeist.NFO.FILE_DATA_OBJECT;
+             }
+             else if (item is ImageClipboardItem) {
+-                interpretation = Zeitgeist.NFO_IMAGE;
++                interpretation = Zeitgeist.NFO.IMAGE;
+             }
+         
+             string? origin = get_path_of_active_application();
+             
+             Zeitgeist.Subject subject = new Zeitgeist.Subject();
+             
+-            subject.set_uri("clipboard://" + item.get_checksum());
+-            subject.set_interpretation(interpretation);
+-            subject.set_manifestation(Zeitgeist.NFO_DATA_CONTAINER);
+-            subject.set_mimetype(item.get_mime_type());
++            subject.uri = "clipboard://" + item.get_checksum();
++            subject.interpretation = interpretation;
++            subject.manifestation = Zeitgeist.NFO.DATA_CONTAINER;
++            subject.mimetype = item.get_mime_type();
+             if(origin != null) {
+-                subject.set_origin(origin);
++                subject.origin = origin;
+             }
+-            subject.set_text(item.get_label());
++            subject.text = item.get_label();
+             //subject.set_storage("");
+             
+             Zeitgeist.Event event = new Zeitgeist.Event();
+             //event.set_id(
+-            event.set_interpretation(Zeitgeist.ZG_CREATE_EVENT);
+-            event.set_manifestation(Zeitgeist.ZG_USER_ACTIVITY);
+-            event.set_actor("application://diodon.desktop");
++            event.interpretation = Zeitgeist.ZG.CREATE_EVENT;
++            event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
++            event.actor = "application://diodon.desktop";
+             event.add_subject(subject);
+             // content should be added, however ignored as currently
+             // data is not being read
+@@ -91,9 +91,12 @@
+             
+             TimeVal cur_time = TimeVal();
+             int64 timestamp = Zeitgeist.Timestamp.from_timeval(cur_time);
+-            event.set_timestamp(timestamp);
++            event.timestamp = timestamp;
+             
+-            log.insert_events_no_reply(event, null);
++            GenericArray<Zeitgeist.Event> events = new GenericArray<Zeitgeist.Event>();
++            events.add(event);
++
++            log.insert_events_no_reply(events);
+         }
+         
+         private string? get_path_of_active_application()

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-07-06 21:39:24 +0000
@@ -0,0 +1,1 @@
+01_port-to-zeitgeist-2.0.patch

=== modified file 'debian/rules'
--- debian/rules	2013-02-19 22:41:39 +0000
+++ debian/rules	2013-07-06 21:39:24 +0000
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/waf.mk
 
-DEB_WAF_CONFIGURE_OPTIONS_ALL = --sysconfdir /etc --enable-unitylens-plugin --enable-zeitgeist-plugin --libdir /usr/lib/$(DEB_HOST_MULTIARCH)
+DEB_WAF_CONFIGURE_OPTIONS_ALL = --sysconfdir /etc --enable-zeitgeist-plugin --libdir /usr/lib/$(DEB_HOST_MULTIARCH)
 
 # remove pyc files created by waf while building
 clean::

=== modified file 'plugins/zeitgeist/wscript_build'
--- plugins/zeitgeist/wscript_build	2013-01-04 23:54:44 +0000
+++ plugins/zeitgeist/wscript_build	2013-07-06 21:39:24 +0000
@@ -12,7 +12,7 @@
   use = 'libdiodon',
   cflags = ['-include', 'config.h'],
   install_binding = False,
-  packages = 'zeitgeist-1.0 libpeas-1.0 x11 gdk-x11-3.0',
+  packages = 'zeitgeist-2.0 libpeas-1.0 x11 gdk-x11-3.0',
   source = bld.path.ant_glob (incl='**/*.vala'))
 
 lib.install_path = os.path.join(bld.env['PLUGINS_DIR'], lib.target)

=== modified file 'plugins/zeitgeist/zeitgeist-plugin.vala'
--- plugins/zeitgeist/zeitgeist-plugin.vala	2013-01-04 23:54:44 +0000
+++ plugins/zeitgeist/zeitgeist-plugin.vala	2013-07-06 21:39:24 +0000
@@ -57,33 +57,33 @@
         
         private void add_clipboard_item(IClipboardItem item)
         {
-            string interpretation = Zeitgeist.NFO_PLAIN_TEXT_DOCUMENT;
+            string interpretation = Zeitgeist.NFO.PLAIN_TEXT_DOCUMENT;
             if(item is FileClipboardItem) {
-                interpretation = Zeitgeist.NFO_FILE_DATA_OBJECT;
+                interpretation = Zeitgeist.NFO.FILE_DATA_OBJECT;
             }
             else if (item is ImageClipboardItem) {
-                interpretation = Zeitgeist.NFO_IMAGE;
+                interpretation = Zeitgeist.NFO.IMAGE;
             }
         
             string? origin = get_path_of_active_application();
             
             Zeitgeist.Subject subject = new Zeitgeist.Subject();
             
-            subject.set_uri("clipboard://" + item.get_checksum());
-            subject.set_interpretation(interpretation);
-            subject.set_manifestation(Zeitgeist.NFO_DATA_CONTAINER);
-            subject.set_mimetype(item.get_mime_type());
+            subject.uri = "clipboard://" + item.get_checksum();
+            subject.interpretation = interpretation;
+            subject.manifestation = Zeitgeist.NFO.DATA_CONTAINER;
+            subject.mimetype = item.get_mime_type();
             if(origin != null) {
-                subject.set_origin(origin);
+                subject.origin = origin;
             }
-            subject.set_text(item.get_label());
+            subject.text = item.get_label();
             //subject.set_storage("");
             
             Zeitgeist.Event event = new Zeitgeist.Event();
             //event.set_id(
-            event.set_interpretation(Zeitgeist.ZG_CREATE_EVENT);
-            event.set_manifestation(Zeitgeist.ZG_USER_ACTIVITY);
-            event.set_actor("application://diodon.desktop");
+            event.interpretation = Zeitgeist.ZG.CREATE_EVENT;
+            event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
+            event.actor = "application://diodon.desktop";
             event.add_subject(subject);
             // content should be added, however ignored as currently
             // data is not being read
@@ -91,9 +91,12 @@
             
             TimeVal cur_time = TimeVal();
             int64 timestamp = Zeitgeist.Timestamp.from_timeval(cur_time);
-            event.set_timestamp(timestamp);
+            event.timestamp = timestamp;
             
-            log.insert_events_no_reply(event, null);
+            GenericArray<Zeitgeist.Event> events = new GenericArray<Zeitgeist.Event>();
+            events.add(event);
+
+            log.insert_events_no_reply(events);
         }
         
         private string? get_path_of_active_application()

=== modified file 'wscript'
--- wscript	2013-02-19 22:41:39 +0000
+++ wscript	2013-07-06 21:39:24 +0000
@@ -74,7 +74,7 @@
       
     conf.env['ZEITGEIST'] = Options.options.enable_zeitgeist
     if Options.options.enable_zeitgeist:
-        conf.check_cfg(package='zeitgeist-1.0', uselib_store='ZEITGEIST', atleast_version='0.3.12', mandatory=1, args='--cflags --libs')    
+        conf.check_cfg(package='zeitgeist-2.0', uselib_store='ZEITGEIST', atleast_version='0.9.14', mandatory=1, args='--cflags --libs')
 
     # FIXME: conf.env and conf.define should not both be needed?
     conf.define('PACKAGE_NAME', APPNAME)