Merge lp:~mhr3/libzeitgeist/various-fixes into lp:libzeitgeist

[Michal Hruby]

Remove the GIO module, it's Ubuntu specific and its function is now overtaken by datahub.

[lp:~mhr3/libzeitgeist/various-fixes]

191. By Mikkel Kamstrup Erlandsen on 2011-02-09

Merge Michal's branch, lp:~mhr3/libzeitgeist/various-fixes, removing the giomodule. The same functionality has been implemented in lp:zeitgeist-datahub trunk.

=== modified file 'Makefile.am'
--- Makefile.am	2010-08-18 19:51:26 +0000
+++ Makefile.am	2011-02-08 11:56:54 +0000
@@ -5,10 +5,6 @@
   examples \
   tests
 
-if ENABLE_GIOMODULE
-SUBDIRS += module
-endif
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = zeitgeist-1.0.pc
 

=== modified file 'configure.ac'
--- configure.ac	2010-12-17 10:41:52 +0000
+++ configure.ac	2011-02-08 11:56:54 +0000
@@ -67,19 +67,6 @@
 AC_SUBST(MAINTAINER_CFLAGS)
 
 ####################################################################
-# Check whether to build GIO extension point module
-####################################################################
-AC_ARG_ENABLE([module],
-              AS_HELP_STRING([--enable-module=@<:@yes/no@:>@],[build GIO extension point module @<:@default=yes@:>@]),,
-              [enable_module=yes])
-
-if test "x$enable_module" = "xyes"; then
-        AC_DEFINE(ENABLE_GIOMODULE, 1, [build GIO extension point module])
-fi
-
-AM_CONDITIONAL(ENABLE_GIOMODULE, test "$enable_module" = "yes")
-
-####################################################################
 # Check library deps
 ####################################################################
 GLIB_REQUIRED=2.26
@@ -93,16 +80,6 @@
 AC_SUBST(ZEITGEIST_CFLAGS)
 AC_SUBST(ZEITGEIST_LIBS)
 
-ZEITGEIST_GIOMODULE_CFLAGS="$GLIB2_CFLAGS $GOBJECT2_CFLAGS $GIO2_CFLAGS $GIO_UNIX2_CFLAGS $ZEITGEIST_CFLAGS"
-ZEITGEIST_GIOMODULE_LIBS="$GLIB2_LIBS $GOBJECT2_LIBS $GIO2_LIBS $GIO_UNIX2_LIBS $ZEITGEIST_LIBS"
-AC_SUBST(ZEITGEIST_GIOMODULE_CFLAGS)
-AC_SUBST(ZEITGEIST_GIOMODULE_LIBS)
-
-# Make giomodulesdir honour 'prefix', so that distcheck works. 
-origgiomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
-giomodulesdir=`echo "$origgiomodulesdir" | sed 's|/usr|${prefix}|'`
-AC_SUBST(giomodulesdir)
-
 GTK_DOC_CHECK(1.0)
 
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
@@ -120,7 +97,6 @@
 examples/Makefile
 src/Makefile
 tests/Makefile
-module/Makefile
 ])
 
 AC_MSG_NOTICE([
@@ -132,8 +108,6 @@
 
   Build API docs   : ${enable_gtk_doc}
 
-  Build GIO module : ${enable_module}
-  
   Extra CFlags     : ${CPPFLAGS} $MAINTAINER_CFLAGS
 ])
 

=== removed directory 'module'
=== removed file 'module/Makefile.am'
--- module/Makefile.am	2010-11-17 14:48:02 +0000
+++ module/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-libdir = $(giomodulesdir)
-lib_LTLIBRARIES = libgiozeitgeist.la
-
-
-libgiozeitgeist_la_SOURCES =  \
-	gapplaunchhandlerzeitgeist.c \
-	gapplaunchhandlerzeitgeist.h  \
-	zeitgeist-module.c  \
-	$(NULL)
-
-libgiozeitgeist_la_CFLAGS =  \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	$(ZEITGEIST_GIOMODULE_CFLAGS)  \
-	-DG_LOG_DOMAIN=\"ZeitgeistGIOModule\" \
-	$(NULL)
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
-
-libgiozeitgeist_la_LDFLAGS = 	\
-	$(module_flags)         \
-	$(NULL)
-
-libgiozeitgeist_la_LIBADD  = \
-	$(ZEITGEIST_GIOMODULE_LIBS) \
-	$(top_builddir)/src/libzeitgeist-1.0.la \
-	$(NULL)
-

=== removed file 'module/gapplaunchhandlerzeitgeist.c'
--- module/gapplaunchhandlerzeitgeist.c	2010-09-16 12:11:26 +0000
+++ module/gapplaunchhandlerzeitgeist.c	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library 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 Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <gio/gio.h>
-#include <gio/gdesktopappinfo.h>
-#include <zeitgeist.h>
-
-#include "gapplaunchhandlerzeitgeist.h"
-
-static ZeitgeistLog *log = NULL;
-static gpointer      log_w = NULL;
-
-struct _GAppLaunchHandlerZeitgeist {
-  GObject parent;
-
-};
-
-static void launch_handler_iface_init (GDesktopAppInfoLaunchHandlerIface *iface);
-static void g_app_launch_handler_zeitgeist_finalize (GObject *object);
-static void ensure_log (void);
-
-#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL \
-  }; \
-  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (GAppLaunchHandlerZeitgeist, g_app_launch_handler_zeitgeist, G_TYPE_OBJECT, 0,
-                                _G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER,
-                                                                launch_handler_iface_init))
-
-/* We lazily create the ZeitgeistLog lazily because it creates a dbus
- * connection, which if set up during the GIOModule registration phase
- * (ie inside g_app_launch_handler_zeitgeist_register()) might mess up the
- * gio module initialization process.
- *
- * Spurious deadlocks and segfaults have been observed without
- * lazy setup of the log.
- */
-static void
-ensure_log (void)
-{
-  if (log_w == NULL)
-    {
-      log = zeitgeist_log_new ();
-      log_w = log;
-      g_object_add_weak_pointer (G_OBJECT (log), &log_w);
-    }
-}
-
-static void
-g_app_launch_handler_zeitgeist_finalize (GObject *object)
-{
-  if (G_OBJECT_CLASS (g_app_launch_handler_zeitgeist_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_app_launch_handler_zeitgeist_parent_class)->finalize) (object);
-}
-
-static GObject *
-g_app_launch_handler_zeitgeist_constructor (GType                  type,
-                                            guint                  n_construct_properties,
-                                            GObjectConstructParam *construct_properties)
-{
-  GObject *object;
-  GAppLaunchHandlerZeitgeistClass *klass;
-  GObjectClass *parent_class;
-
-  object = NULL;
-
-  /* Invoke parent constructor. */
-  klass = G_APP_LAUNCH_HANDLER_ZEITGEIST_CLASS (g_type_class_peek (G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST));
-  parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
-  object = parent_class->constructor (type,
-                                      n_construct_properties,
-                                      construct_properties);
-
-  return object;
-}
-
-static void
-g_app_launch_handler_zeitgeist_init (GAppLaunchHandlerZeitgeist *lookup)
-{
-}
-
-static void
-g_app_launch_handler_zeitgeist_class_finalize (GAppLaunchHandlerZeitgeistClass *klass)
-{
-}
-
-
-static void
-g_app_launch_handler_zeitgeist_class_init (GAppLaunchHandlerZeitgeistClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->constructor = g_app_launch_handler_zeitgeist_constructor;
-  gobject_class->finalize = g_app_launch_handler_zeitgeist_finalize;
-}
-
-/*
-static void
-on_subject_info_ready (GFile *file,
-                       GAsyncResult *res,
-                       ZeitgeistEvent *ev)
-{
-  ZeitgeistSubject *su;
-  GError           *error;
-  GFileInfo        *info;
-  GFile            *parent_file;
-  gchar            *uri, *parent_uri;
-  const gchar      *display_name, *filesystem, *mimetype;
-
-  uri = g_file_get_uri (file);
-  
-  error = NULL;
-  info = g_file_query_info_finish (file, res, &error);
-  if (error != NULL)
-    {
-      // On anything but a file-not-found we complain in the log
-      if (error->code != G_IO_ERROR_NOT_FOUND)
-        g_warning ("Error querying file info for '%s': %s",
-                   uri, error->message);
-
-      g_free (uri);
-      g_object_unref (ev);
-      g_error_free (error);
-      return;
-    }
-
-  display_name = g_file_info_get_attribute_string (info,
-                                                   G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME);
-  filesystem = g_file_info_get_attribute_string (info,
-                                                 G_FILE_ATTRIBUTE_ID_FILESYSTEM);
-  mimetype = g_file_info_get_attribute_string (info,
-                                               G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
-
-  parent_file = g_file_get_parent (file);
-  parent_uri = g_file_get_uri (parent_file);
-  
-  // If we couldn't query the filesystem for the subject assume it was a
-  // residing online somwhere
-  filesystem = filesystem != NULL ? filesystem : "net";
-
-  su = zeitgeist_subject_new_full (uri,
-                                   zeitgeist_interpretation_for_mimetype (mimetype),
-                                   zeitgeist_manifestation_for_uri (uri),
-                                   mimetype,
-                                   parent_uri,
-                                   display_name,
-                                   filesystem);
-  zeitgeist_event_add_subject (ev, su);
-
-  // FIXME: Right now we actually insert one event for each subject.
-  //        We should rather collect all subject data (async) and
-  //        insert one event with all the subjects
-  zeitgeist_log_insert_events_no_reply (log, ev, NULL);
-
-  g_free (uri);
-  g_free (parent_uri);
-  g_object_unref (parent_file);
-  g_object_unref (info);
-}
-*/
-
-/* Create an application://app.desktop URI. Caller must g_free() the result
- * if it's != NULL */
-static gchar*
-get_application_uri (GDesktopAppInfo              *appinfo)
-{
-  gchar *app_id = NULL;
-
-  app_id = g_strdup (g_app_info_get_id (G_APP_INFO (appinfo)));
-
-  if (app_id != NULL)
-  {
-    app_id = g_strconcat ("application://", app_id, NULL);
-  }
-  else if (g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (appinfo)))
-  {
-    const gchar *path = g_desktop_app_info_get_filename (
-                                                G_DESKTOP_APP_INFO (appinfo));
-    gchar *basename = g_path_get_basename (path);
-    app_id = g_strconcat ("application://", basename, NULL);
-    g_free (basename);
-  }
-
-  return app_id;
-}
-
-/* Idle handler for logging the app launch event. We do this in an
- * idle call to make sure it's done in the mainloop in order to be
- * thread safe */
-static gboolean
-log_event (ZeitgeistEvent *event)
-{
-  ensure_log ();
-
-  g_return_val_if_fail (ZEITGEIST_IS_EVENT (event), FALSE);
-  g_return_val_if_fail (ZEITGEIST_IS_LOG (log), FALSE);
-
-  /* Send the event to Zeitgeist */
-  zeitgeist_log_insert_events_no_reply (log, event, NULL);
-  
-  return FALSE;
-}
-
-static void
-on_launched (GDesktopAppInfoLaunchHandler *launch_handler,
-             GDesktopAppInfo              *app_info,
-             GList                        *uris,
-             GAppLaunchContext            *launch_ctx,
-             gint                          pid)
-{
-  ZeitgeistEvent   *ev;
-  ZeitgeistSubject *su;
-  GFile            *file;
-  gchar            *subject_uri, *actor, *prgname;
-  
-  g_return_if_fail (G_IS_DESKTOP_APP_INFO (app_info));
-
-  /* Don't log stuff about apps not shown in user menus */
-  if (! g_app_info_should_show (G_APP_INFO (app_info)))
-    return;
-
-  ev = zeitgeist_event_new ();
-  su = zeitgeist_subject_new ();
-
-  subject_uri = get_application_uri (app_info);
-
-  if (subject_uri == NULL)
-  {
-    /* We where unable to figure out the launched app... */
-    g_object_unref (ev);
-    g_object_unref (su);
-    return;
-  }
-
-  /* Set event metadata */
-  prgname = g_get_prgname ();
-  zeitgeist_event_set_interpretation (ev, ZEITGEIST_ZG_ACCESS_EVENT);
-  zeitgeist_event_set_manifestation (ev, ZEITGEIST_ZG_USER_ACTIVITY);
-  actor = prgname ? g_strdup_printf ("application://%s.desktop", prgname) :
-                    g_strdup ("");
-  zeitgeist_event_set_actor (ev, actor);
-  g_free (actor);
-  
-  zeitgeist_event_add_subject (ev, su);
-  
-  zeitgeist_subject_set_uri (su, subject_uri);
-  zeitgeist_subject_set_interpretation (su, ZEITGEIST_NFO_SOFTWARE);
-  zeitgeist_subject_set_manifestation (su, ZEITGEIST_NFO_SOFTWARE_ITEM);
-  zeitgeist_subject_set_mimetype (su, "application/x-desktop");
-  zeitgeist_subject_set_text (su, g_app_info_get_display_name (
-                                                       G_APP_INFO (app_info)));
-  g_free (subject_uri);
-  // FIXME: subject origin and storage?
-
-  /* Do all DBus interactions in an idle handler to make sure
-   * we are thread safe. The floating ref on ev swallowed by idle
-   * handler log_event() */
-  g_idle_add ((GSourceFunc) log_event, ev);
-}
-
-static void
-launch_handler_iface_init (GDesktopAppInfoLaunchHandlerIface *iface)
-{
-  iface->on_launched = on_launched;
-}
-
-void
-g_app_launch_handler_zeitgeist_register (GIOModule *module)
-{
-  g_app_launch_handler_zeitgeist_register_type (G_TYPE_MODULE (module));
-  g_io_extension_point_implement (G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME,
-                                  G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST,
-                                  "zeitgeist",
-                                  10);
-}
-
-void
-g_app_launch_handler_zeitgeist_unregister (GIOModule *module)
-{
-  if (log_w != NULL)
-    g_object_unref (log);
-}

=== removed file 'module/gapplaunchhandlerzeitgeist.h'
--- module/gapplaunchhandlerzeitgeist.h	2010-08-18 19:51:26 +0000
+++ module/gapplaunchhandlerzeitgeist.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library 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 Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
- */
-
-#ifndef __G_APP_LAUNCH_HANDLER_ZEITGEIST_H__
-#define __G_APP_LAUNCH_HANDLER_ZEITGEIST_H__
-
-#include <glib-object.h>
-#include <gio/gio.h>
-#include <gio/gdesktopappinfo.h>
-
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST        (g_app_launch_handler_zeitgeist_get_type ())
-#define G_APP_LAUNCH_HANDLER_ZEITGEIST(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST, GAppLaunchHandlerZeitgeist))
-#define G_APP_LAUNCH_HANDLER_ZEITGEIST_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST, GAppLaunchHandlerZeitgeistClass))
-#define G_IS_APP_LAUNCH_HANDLER_ZEITGEIST(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST))
-#define G_IS_APP_LAUNCH_HANDLER_ZEITGEIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_HANDLER_ZEITGEIST))
-
-typedef struct _GAppLaunchHandlerZeitgeist GAppLaunchHandlerZeitgeist;
-typedef struct _GAppLaunchHandlerZeitgeistClass GAppLaunchHandlerZeitgeistClass;
-
-struct _GAppLaunchHandlerZeitgeistClass {
-  GObjectClass parent_class;
-};
-
-GType g_app_launch_handler_zeitgeist_get_type   (void) G_GNUC_CONST;
-void  g_app_launch_handler_zeitgeist_register   (GIOModule *module);
-void  g_app_launch_handler_zeitgeist_unregister (GIOModule *module);
-
-G_END_DECLS
-
-#endif /* __G_APP_LAUNCH_HANDLER_ZEITGEIST_H__ */

=== removed file 'module/zeitgeist-module.c'
--- module/zeitgeist-module.c	2010-08-19 11:57:08 +0000
+++ module/zeitgeist-module.c	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library 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 Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <gmodule.h>
-#include <gio/gio.h>
-#include <zeitgeist.h>
-
-#include "gapplaunchhandlerzeitgeist.h"
-
-void
-g_io_module_load (GIOModule *module)
-{
-  g_app_launch_handler_zeitgeist_register (module);	
-}
-
-void
-g_io_module_unload (GIOModule *module)
-{
-  g_app_launch_handler_zeitgeist_unregister (module);
-}
-