Merge lp:~rainct/libzeitgeist/log_get_default into lp:libzeitgeist

[Siegfried Gevatter]

[lp:~rainct/libzeitgeist/log_get_default]

220. By Siegfried Gevatter on 2012-02-02

Give stuff the right name, even

[Mikkel Kamstrup Erlandsen (kamstrup)]

Just perfect!

review: Approve

=== modified file 'src/zeitgeist-log.c'
--- src/zeitgeist-log.c	2012-01-30 12:26:04 +0000
+++ src/zeitgeist-log.c	2012-02-02 15:11:19 +0000
@@ -120,6 +120,8 @@
                                         GAsyncResult          *res,
                                         gpointer               user_data);
 
+static ZeitgeistLog *zeitgeist_log_singleton = NULL;
+
 static void
 zeitgeist_log_init (ZeitgeistLog *self)
 {
@@ -310,6 +312,10 @@
  * until the connection is ready - at which point you will get a notify signal
  * on the #ZeitgeistLog:connected property.
  *
+ * It isn't recommended to call this function more than once. If you need to
+ * access #ZeitgeistLog from different parts of your codebase, consider using
+ * zeitgeist_log_get_default() instead.
+ *
  * Returns: A reference to a newly allocated log.
  */
 ZeitgeistLog*
@@ -324,6 +330,26 @@
 }
 
 /**
+ * zeitgeist_log_get_default:
+ * Get a unique instance of #ZeitgeistLog, that you can share in your
+ * application without caring about memory management.
+ *
+ * See zeitgeist_log_new() for more information.
+ *
+ * Returns: (transfer none): A unique #ZeitgeistLog. Do not ref or unref it.
+ *
+ * Since: 0.3.14
+ */
+ZeitgeistLog*
+zeitgeist_log_get_default (void)
+{
+  if (G_UNLIKELY (!zeitgeist_log_singleton))
+    zeitgeist_log_singleton = zeitgeist_log_new ();
+
+  return zeitgeist_log_singleton;
+}
+
+/**
  * zeitgeist_log_insert_events:
  * @self: The log logging the events
  * @cancellable: To cancel the operation or %NULL

=== modified file 'src/zeitgeist-log.h'
--- src/zeitgeist-log.h	2011-03-07 14:19:39 +0000
+++ src/zeitgeist-log.h	2012-02-02 15:11:19 +0000
@@ -60,6 +60,8 @@
 
 ZeitgeistLog* zeitgeist_log_new                 (void);
 
+ZeitgeistLog* zeitgeist_log_get_default         (void);
+
 void         zeitgeist_log_insert_events        (ZeitgeistLog        *self,
                                                  GCancellable        *cancellable,
                                                  GAsyncReadyCallback  callback,

=== modified file 'tests/test-log.c'
--- tests/test-log.c	2010-06-10 08:39:30 +0000
+++ tests/test-log.c	2012-02-02 15:11:19 +0000
@@ -198,6 +198,14 @@
   g_main_loop_run (fix->mainloop);
 }
 
+static void
+test_get_default (Fixture *fix, gconstpointer data) {
+    ZeitgeistLog *zeitgeist_log1, *zeitgeist_log2;
+    zeitgeist_log1 = zeitgeist_log_get_default ();
+    zeitgeist_log2 = zeitgeist_log_get_default ();
+    g_assert (zeitgeist_log1 == zeitgeist_log2);
+}
+
 int
 main (int   argc,
       char *argv[])
@@ -207,6 +215,8 @@
   
   g_test_add ("/Zeitgeist/Log/InsertGetDelete", Fixture, NULL,
               setup, test_insert_get_delete, teardown);
+  g_test_add ("/Zeitgeist/Log/GetDefault", Fixture, NULL,
+              NULL, test_get_default, NULL);
   
   return g_test_run();
 }