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

[Michal Hruby]

Implements ZeitgeistLog:connected property.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good - can you rename the getter method to is_connected () in stead? That seems more natural, with that change I'll approve this.

review: Needs Fixing

[Michal Hruby (mhr3)]

At first I wanted to call it "is-connected", but I looked on Gtk+ API, they don't do is-sensitive / is-enabled... not to mention zeitgeist_log_get_is_connected looks a bit weird...

[Mikkel Kamstrup Erlandsen (kamstrup)]

Oh - You misunderstood me :-)

The method is zeitgeist_log_is_connected(), but the property is still called just "connected"

[Michal Hruby (mhr3)]

Changed to zeitgeist_log_is_connected.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Mmmmm.... sorry to be picky... :-) But did you read my second comment?

I meant that the method is called zeitgeist_log_is_connected() and the property name is just "connected", _not_ "is-connected"... Gtk+ does it this way many places as well.

[Michal Hruby (mhr3)]

Oh, guess I'm blind, sorry about that...

[Mikkel Kamstrup Erlandsen (kamstrup)]

Super. Approved!

review: Approve

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

148. By Mikkel Kamstrup Erlandsen <kamstrup@hardback> on 2010-07-23

Merge branch lp:~mhr3/libzeitgeist/various-fixes from Michal Hruby:

 * Adds a "connected" property to ZeitgeistLog telling you whether or not the Zeitgeist daemon is running

 * Clean up some of the VAPI and GI stuff

 * Remove _finish() functions from VAPI

=== modified file 'bindings/generate_vapi'
--- bindings/generate_vapi	2010-04-22 12:33:05 +0000
+++ bindings/generate_vapi	2010-07-22 17:11:00 +0000
@@ -8,3 +8,7 @@
 cd $(dirname $0)
 vala-gen-introspect zeitgeist-1.0 .
 vapigen --pkg gobject-2.0 --pkg glib-2.0 --pkg gio-2.0 --library zeitgeist-1.0 zeitgeist-1.0.gi zeitgeist-1.0-custom.vala
+# nasty hack to force usage of PtrArray in recent versions of vapigen
+sed -i 's/GenericArray/PtrArray/g' zeitgeist-1.0.vapi
+# workaround a bug introduced in vapigen 0.9.3
+sed -i 's/void \(insert_events_from_ptrarray\)\(.*\);/GLib.Array \1\2 throws GLib.Error;/' zeitgeist-1.0.vapi
 
=== modified file 'bindings/zeitgeist-1.0.gi'
--- bindings/zeitgeist-1.0.gi	2010-06-17 14:11:59 +0000
+++ bindings/zeitgeist-1.0.gi	2010-07-22 17:11:00 +0000
@@ -63,6 +63,18 @@
 				<parameter name="tv" type="GTimeVal*"/>
 			</parameters>
 		</function>
+		<function name="timestamp_next_midnight" symbol="zeitgeist_timestamp_next_midnight">
+			<return-type type="gint64"/>
+			<parameters>
+				<parameter name="timestamp" type="gint64"/>
+			</parameters>
+		</function>
+		<function name="timestamp_prev_midnight" symbol="zeitgeist_timestamp_prev_midnight">
+			<return-type type="gint64"/>
+			<parameters>
+				<parameter name="timestamp" type="gint64"/>
+			</parameters>
+		</function>
 		<function name="timestamp_to_date" symbol="zeitgeist_timestamp_to_date">
 			<return-type type="void"/>
 			<parameters>
@@ -438,6 +450,12 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="is_connected" symbol="zeitgeist_log_is_connected">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="ZeitgeistLog*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="zeitgeist_log_new">
 				<return-type type="ZeitgeistLog*"/>
 			</constructor>
@@ -476,6 +494,7 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<property name="connected" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 		</object>
 		<object name="ZeitgeistMonitor" parent="GObject" type-name="ZeitgeistMonitor" get-type="zeitgeist_monitor_get_type">
 			<implements>
@@ -830,12 +849,6 @@
 		<constant name="ZEITGEIST_NMO_MAILBOX_DATA_OBJECT" type="char*" value="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MailboxDataObject"/>
 		<constant name="ZEITGEIST_NMO_MESSAGE" type="char*" value="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#Message"/>
 		<constant name="ZEITGEIST_NMO_MIME_ENTITY" type="char*" value="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MimeEntity"/>
-		<constant name="ZEITGEIST_TIMESTAMP_DAY" type="int" value="86400000"/>
-		<constant name="ZEITGEIST_TIMESTAMP_HOUR" type="int" value="3600000"/>
-		<constant name="ZEITGEIST_TIMESTAMP_MINUTE" type="int" value="60000"/>
-		<constant name="ZEITGEIST_TIMESTAMP_SECOND" type="int" value="1000"/>
-		<constant name="ZEITGEIST_TIMESTAMP_WEEK" type="int" value="604800000"/>
-		<constant name="ZEITGEIST_TIMESTAMP_YEAR" type="int" value="2147483647"/>
 		<constant name="ZEITGEIST_ZG_ACCESS_EVENT" type="char*" value="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AccessEvent"/>
 		<constant name="ZEITGEIST_ZG_CREATE_EVENT" type="char*" value="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#CreateEvent"/>
 		<constant name="ZEITGEIST_ZG_DELETE_EVENT" type="char*" value="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#DeleteEvent"/>
 
=== modified file 'bindings/zeitgeist-1.0.vapi'
--- bindings/zeitgeist-1.0.vapi	2010-06-23 09:43:18 +0000
+++ bindings/zeitgeist-1.0.vapi	2010-07-22 17:11:00 +0000
@@ -24,18 +24,18 @@
 		public static int64 from_iso8601 (string datetime);
 		[CCode (cheader_filename = "zeitgeist.h")]
 		public static int64 from_timeval (GLib.TimeVal tv);
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 next_midnight (int64 timestamp);
 		[CCode (cname = "zeitgeist_timestamp_for_now", cheader_filename = "zeitgeist.h")]
 		public static int64 now ();
 		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 prev_midnight (int64 timestamp);
+		[CCode (cheader_filename = "zeitgeist.h")]
 		public static int64 to_date (int64 timestamp, out GLib.Date date);
 		[CCode (cheader_filename = "zeitgeist.h")]
 		public static string to_iso8601 (int64 timestamp);
 		[CCode (cheader_filename = "zeitgeist.h")]
 		public static int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);
-		[CCode (cheader_filename = "zeitgeist.h")]
-		public static int64 next_midnight (int64 timestamp);
-		[CCode (cheader_filename = "zeitgeist.h")]
-		public static int64 prev_midnight (int64 timestamp);
 	}
 	[CCode (cheader_filename = "zeitgeist.h")]
 	public class Event : GLib.InitiallyUnowned {
@@ -67,37 +67,28 @@
 		[CCode (has_construct_function = false)]
 		public Index ();
 		public async Zeitgeist.ResultSet search (string query, Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, uint32 offset, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
-		public Zeitgeist.ResultSet search_finish (GLib.AsyncResult res) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "zeitgeist.h")]
 	public class Log : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Log ();
 		public async bool delete_events (owned GLib.Array event_ids, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool delete_events_finish (GLib.AsyncResult res) throws GLib.Error;
 		public async bool delete_log (GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool delete_log_finish (GLib.AsyncResult res) throws GLib.Error;
 		public async GLib.Array find_event_ids (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
-		public GLib.Array find_event_ids_finish (GLib.AsyncResult res) throws GLib.Error;
 		public async Zeitgeist.ResultSet find_events (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
-		public Zeitgeist.ResultSet find_events_finish (GLib.AsyncResult res) throws GLib.Error;
 		[CCode (array_length = false, array_null_terminated = true)]
 		public async string[] find_related_uris (Zeitgeist.TimeRange time_range, owned GLib.PtrArray event_templates, owned GLib.PtrArray result_event_templates, Zeitgeist.StorageState storage_state, uint32 num_events, Zeitgeist.ResultType result_type, GLib.Cancellable? cancellable) throws GLib.Error;
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] find_related_uris_finish (GLib.AsyncResult res) throws GLib.Error;
 		public async Zeitgeist.ResultSet get_events (owned GLib.Array event_ids, GLib.Cancellable? cancellable) throws GLib.Error;
-		public Zeitgeist.ResultSet get_events_finish (GLib.AsyncResult res) throws GLib.Error;
 		public async GLib.Array insert_events (GLib.Cancellable? cancellable, ...) throws GLib.Error;
-		public GLib.Array insert_events_finish (GLib.AsyncResult res) throws GLib.Error;
 		[CCode (finish_name = "zeitgeist_log_insert_events_finish")]
 		public async GLib.Array insert_events_from_ptrarray (owned GLib.PtrArray events, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void insert_events_no_reply (...);
 		public async bool install_monitor (Zeitgeist.Monitor monitor, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool install_monitor_finish (GLib.AsyncResult res) throws GLib.Error;
+		public bool is_connected ();
 		public async bool quit (GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool quit_finish (GLib.AsyncResult res) throws GLib.Error;
 		public async bool remove_monitor (Zeitgeist.Monitor monitor, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool remove_monitor_finish (GLib.AsyncResult res) throws GLib.Error;
+		[NoAccessorMethod]
+		public bool connected { get; }
 	}
 	[CCode (cheader_filename = "zeitgeist.h")]
 	public class Monitor : GLib.Object, Zeitgeist.EggZeitgeistMonitor {
 
=== modified file 'src/zeitgeist-log.c'
--- src/zeitgeist-log.c	2010-06-26 12:46:27 +0000
+++ src/zeitgeist-log.c	2010-07-22 17:11:00 +0000
@@ -54,6 +54,8 @@
   EggDBusObjectProxy *log_proxy;
   EggZeitgeistLog    *log;
 
+  gboolean            connected;
+
   /* Hash set of ZeitgeistMonitors we've installed. We actually store
    * a map of (monitor, log) because this is most convenient for use with
    * _zeitgeist_monitor_weak_unref() casted to a GHFunc */
@@ -65,6 +67,8 @@
 {
 	PROP_0,
 
+	PROP_CONNECTED,
+
 	LAST_PROPERTY
 };
 
@@ -122,6 +126,7 @@
 {
   ZeitgeistLogPrivate *priv;
   EggDBusConnection   *conn;
+  gchar               *name_owner;
 
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   
@@ -138,6 +143,13 @@
   priv->log = EGG_ZEITGEIST_QUERY_INTERFACE_LOG (priv->log_proxy);
   g_object_unref (conn);
 
+  name_owner = egg_dbus_object_proxy_get_name_owner (priv->log_proxy);
+  priv->connected = name_owner != NULL;
+  if (name_owner)
+    {
+      g_free (name_owner);
+    }
+
   /* We need to detect if the Zeitgeist daemon leaves/enters the bus */
   g_signal_connect_swapped (priv->log_proxy, "notify::name-owner",
                             G_CALLBACK (_zeitgeist_log_on_name_owner_changed),
@@ -214,7 +226,20 @@
   object_class->finalize     = zeitgeist_log_finalize;
   object_class->get_property = zeitgeist_log_get_property;
   object_class->set_property = zeitgeist_log_set_property;
-  
+
+  /**
+   * ZeitgeistLog:connected:
+   *
+   * Determines if this Log instance is currently connected to Zeitgeist
+   * daemon.
+   */
+  pspec = g_param_spec_boolean ("connected",
+                                "Connected",
+                                "Whether this instance is connected to Zeitgeist",
+                                FALSE,
+                                G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_CONNECTED, pspec);
+
   g_type_class_add_private (object_class, sizeof (ZeitgeistLogPrivate));
 }
 
@@ -1060,10 +1085,13 @@
 {
   ZeitgeistLogPrivate *priv;
   gchar               *name_owner;
+  gboolean             has_owner;
   
   priv = ZEITGEIST_LOG_GET_PRIVATE (self);
   g_object_get (priv->log_proxy, "name-owner", &name_owner, NULL);
-  
+
+  has_owner = name_owner != NULL;
+
   if (name_owner == NULL)
     {
       /* The Zeitgeist daemon disconnected. Do nothing */
@@ -1081,5 +1109,21 @@
                                           NULL, NULL, NULL);
         }
       g_free (name_owner);
-    }    
-}
+    }
+
+  if (has_owner != priv->connected)
+    {
+      priv->connected = has_owner;
+      g_object_notify (G_OBJECT (self), "connected");
+    }
+}
+
+gboolean
+zeitgeist_log_is_connected (ZeitgeistLog *self)
+{
+  ZeitgeistLogPrivate *priv;
+
+  priv = ZEITGEIST_LOG_GET_PRIVATE (self);
+  return priv->connected;
+}
+
 
=== modified file 'src/zeitgeist-log.h'
--- src/zeitgeist-log.h	2010-06-10 08:07:41 +0000
+++ src/zeitgeist-log.h	2010-07-22 17:11:00 +0000
@@ -189,6 +189,8 @@
                                                   GAsyncResult       *res,
                                                   GError            **error);
 
+gboolean     zeitgeist_log_is_connected         (ZeitgeistLog *self);
+
 G_END_DECLS
 
 #endif /* _ZEITGEIST_LOG_H_ */