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

[Michal Hruby]

Fixes DataSourceRegistry class.

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

189. By Mikkel Kamstrup Erlandsen on 2011-02-07

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

 * Fixes some bad casts in src/zeitgeist-data-source-registry.c

 * Fix unpacking of variants in src/zeitgeist-data-source-registry.c

 * Add new method zeitgeist_data_source_to_variant_full()

=== modified file 'src/zeitgeist-data-source-registry.c'
--- src/zeitgeist-data-source-registry.c	2010-11-17 09:27:57 +0000
+++ src/zeitgeist-data-source-registry.c	2011-02-03 13:31:55 +0000
@@ -209,14 +209,14 @@
 
   if (g_strcmp0 (signal_name, "DataSourceRegistered") == 0)
     {
-      src = zeitgeist_data_source_new_from_variant (parameters); // FIXME: ref?
+      src = zeitgeist_data_source_new_from_variant (g_variant_get_child_value (parameters, 0)); // FIXME: ref?
       g_signal_emit (self, _registry_signals[SOURCE_REGISTERED],
                      0, src);
       g_object_unref (src);
     }
   else if (g_strcmp0 (signal_name, "DataSourceDisconnected") == 0)
     {
-      src = zeitgeist_data_source_new_from_variant (parameters); // FIXME: ref?
+      src = zeitgeist_data_source_new_from_variant (g_variant_get_child_value (parameters, 0)); // FIXME: ref?
       g_signal_emit (self, _registry_signals[SOURCE_DISCONNECTED],
                      0, src);
       g_object_unref (src);
@@ -533,7 +533,7 @@
     }
 
   /* Grab a ref on the GDBusConnection as well */
-  priv->connection = G_DBUS_CONNECTION (g_object_ref (source_object));
+  priv->connection = G_DBUS_CONNECTION (g_object_ref (g_dbus_proxy_get_connection (priv->registry)));
 
   /* Connect to all DBus signals from the data source registry */
   priv->dbus_signals_id = g_dbus_connection_signal_subscribe (

=== modified file 'src/zeitgeist-data-source.c'
--- src/zeitgeist-data-source.c	2010-11-16 12:59:30 +0000
+++ src/zeitgeist-data-source.c	2011-02-03 13:31:55 +0000
@@ -111,11 +111,12 @@
 /**
  * zeitgeist_data_source_new_from_variant:
  * @event: A #GVariant with signature defined in
- *         #ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE. If @src is a floating
- *         reference the floating reference will be consumed.
+ *         #ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE.
+ *         If @src is a floating reference the floating reference
+ *         will be consumed.
  *
  * Parse the data in a #GVariant and build a #ZeitgeistDataSource from it.
- * The reverse operation of this is zeitgeist_data_source_to_variant().
+ * The reverse operation of this is zeitgeist_data_source_to_variant_full().
  *
  * Returns: A newly allocated #ZeitgeistDataSource filled with the metadata and
  *          event templates described by @src. The returned data source will
@@ -138,7 +139,7 @@
 
   /* Parse the variant */
   g_variant_ref_sink (src);
-  g_variant_get (src, ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE,
+  g_variant_get (src, ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE,
                  &unique_id, &name, &description,
                  NULL, &running, &timestamp, &enabled);
 
@@ -405,6 +406,53 @@
 }
 
 /**
+ * zeitgeist_data_source_to_variant_full:
+ * @events: A #ZeitgeistDataSource. If this is a
+ *          floating reference it will be consumed
+ *
+ * Convert a #ZeitgeistDataSource to a #GVariant with signature
+ * #ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE.
+ *
+ * Returns: A floating reference to a #GVariant as described above. Unless the
+ *          floating reference is consumed somewhere you must free it with
+ *          g_variant_unref().
+ */
+GVariant*
+zeitgeist_data_source_to_variant_full (ZeitgeistDataSource *src)
+{
+  GVariantBuilder      b;
+  GPtrArray           *event_templates;
+  GVariant            *vevent_templates;
+  const gchar         *str;
+
+  g_return_val_if_fail (ZEITGEIST_IS_DATA_SOURCE (src), NULL);
+
+  g_object_ref_sink (src);
+  g_variant_builder_init (&b, ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_TYPE);
+
+  /* Add static metadata */
+  g_variant_builder_add (&b, "s", (str = zeitgeist_data_source_get_unique_id(src), str  ? str : ""));
+  g_variant_builder_add (&b, "s", (str = zeitgeist_data_source_get_name(src), str  ? str : ""));
+  g_variant_builder_add (&b, "s", (str = zeitgeist_data_source_get_description(src), str  ? str : ""));
+
+  /* Add event templates */
+  event_templates = g_ptr_array_ref (
+                               zeitgeist_data_source_get_event_templates (src));
+  vevent_templates = zeitgeist_events_to_variant (event_templates);
+  g_variant_builder_add_value (&b, vevent_templates /* own ref */);
+
+  /* Add volatile metadata */
+  g_variant_builder_add (&b, "b", zeitgeist_data_source_is_running(src));
+  g_variant_builder_add (&b, "x", zeitgeist_data_source_get_timestamp(src));
+  g_variant_builder_add (&b, "b", zeitgeist_data_source_is_enabled(src));
+
+  /* Clean up */
+  g_object_unref (src);
+
+  return g_variant_builder_end (&b);
+}
+
+/**
  * zeitgeist_data_source_to_variant:
  * @events: A #ZeitgeistDataSource. If this is a
  *          floating reference it will be consumed
@@ -440,11 +488,6 @@
   vevent_templates = zeitgeist_events_to_variant (event_templates);
   g_variant_builder_add_value (&b, vevent_templates /* own ref */);
 
-  /* Add volatile metadata */
-  g_variant_builder_add (&b, "b", zeitgeist_data_source_is_running(src));
-  g_variant_builder_add (&b, "x", zeitgeist_data_source_get_timestamp(src));
-  g_variant_builder_add (&b, "b", zeitgeist_data_source_is_enabled(src));
-
   /* Clean up */
   g_object_unref (src);
 
@@ -482,7 +525,7 @@
     {
       src = ZEITGEIST_DATA_SOURCE (g_ptr_array_index (sources, i));
       g_object_ref_sink (src);
-      vsrc = zeitgeist_data_source_to_variant (src);
+      vsrc = zeitgeist_data_source_to_variant_full (src);
       g_variant_builder_add_value (&b, vsrc);
       g_object_unref (src);
     }
@@ -498,8 +541,9 @@
 /**
  * zeitgeist_data_sources_from_variant:
  * @sources: A #GVariant  with signature as an array of
- *          #ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE. If @sources is floating
- *          this method will consume the floating reference.
+ *          #ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE.
+ *          If @sources is floating this method will consume
+ *          the floating reference.
  *
  * Returns: A reference to a #GPtrArray of #ZeitgeistDataSource<!-- -->s.
  *          All the events will be floating references, and the

=== modified file 'src/zeitgeist-data-source.h'
--- src/zeitgeist-data-source.h	2010-11-16 12:59:30 +0000
+++ src/zeitgeist-data-source.h	2011-02-03 13:31:55 +0000
@@ -99,7 +99,8 @@
 void         zeitgeist_data_source_set_enabled (ZeitgeistDataSource *src,
                                                 gboolean enabled);
 
-GVariant*    zeitgeist_data_source_to_variant  (ZeitgeistDataSource *src);
+GVariant*    zeitgeist_data_source_to_variant       (ZeitgeistDataSource *src);
+GVariant*    zeitgeist_data_source_to_variant_full  (ZeitgeistDataSource *src);
 
 GVariant*    zeitgeist_data_sources_to_variant  (GPtrArray *sources);
 
@@ -110,15 +111,29 @@
  *
  * The #GVariant signature for a serialized #ZeitgeistDataSource
  */
-#define ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE "(sssa(asaasay)bxb)"
+#define ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE "(sssa(asaasay))"
 
 /**
  * ZEITGEIST_DATA_SOURCE_VARIANT_TYPE:
  *
- * The #GVariantType of #ZEITGEIST_DATA_SOURCE_SIGNATURE
+ * The #GVariantType of #ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE
  */
 #define ZEITGEIST_DATA_SOURCE_VARIANT_TYPE G_VARIANT_TYPE(ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE)
 
+/**
+ * ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE:
+ *
+ * The #GVariant signature for a serialized #ZeitgeistDataSource
+ */
+#define ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE "(sssa(asaasay)bxb)"
+
+/**
+ * ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_TYPE:
+ *
+ * The #GVariantType of #ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE
+ */
+#define ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_TYPE G_VARIANT_TYPE(ZEITGEIST_DATA_SOURCE_WITH_INFO_VARIANT_SIGNATURE)
+
 G_END_DECLS
 
 #endif /* _ZEITGEIST_DATA_SOURCE_H_ */