Merge lp:~mhr3/dee/quantal-compability into lp:dee

[Michal Hruby]

Fix a few introspection annotations to unbreak quantal

Fix a few introspection annotations to unbreak compilation on quantal.

[Łukasz Zemczak (sil2100)]

Works for me. Thanks for this fix!

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee/69/console reported an error when processing this lp:~mhr3/dee/quantal-compability branch.
Not merging it.

[lp:~mhr3/dee/quantal-compability]

370. By Michal Hruby on 2012-06-27

Remove deprecated g_thread_init

=== modified file 'examples/master-model.c'
--- examples/master-model.c	2011-01-31 09:01:53 +0000
+++ examples/master-model.c	2012-06-27 14:27:18 +0000
@@ -52,7 +52,9 @@
   DeeModel *model;
   
   g_type_init ();
+#if !GLIB_CHECK_VERSION(2, 32, 0)
   g_thread_init (NULL);
+#endif
 
   model = dee_shared_model_new ("com.canonical.Dee.Model.Example");
   dee_model_set_schema (model, "i", "s", NULL);

=== modified file 'examples/peers.c'
--- examples/peers.c	2010-11-24 11:41:54 +0000
+++ examples/peers.c	2012-06-27 14:27:18 +0000
@@ -54,8 +54,10 @@
   GMainLoop *loop;
   DeePeer  *peer;
   
-  g_type_init (); 
+  g_type_init ();
+#if !GLIB_CHECK_VERSION(2, 32, 0)
   g_thread_init (NULL);
+#endif
 
   peer = g_object_new (DEE_TYPE_PEER,
                        "swarm-name", "com.canonical.DeePeer.Test",

=== modified file 'examples/slave-model.c'
--- examples/slave-model.c	2011-02-09 03:44:27 +0000
+++ examples/slave-model.c	2012-06-27 14:27:18 +0000
@@ -65,8 +65,10 @@
   DeeModel *model;
   const gchar *model_name;
   
-  g_type_init (); 
+  g_type_init ();
+#if !GLIB_CHECK_VERSION(2, 32, 0)
   g_thread_init (NULL);
+#endif
 
   if (argc < 2)
     model_name = "com.canonical.Dee.Model.Example";

=== modified file 'src/dee-client.c'
--- src/dee-client.c	2012-01-26 14:08:54 +0000
+++ src/dee-client.c	2012-06-27 14:27:18 +0000
@@ -243,7 +243,6 @@
 
 /**
  * dee_client_new:
- *
  * @swarm_name: Name of swarm to join.
  *
  * Creates a new instance of #DeeClient and tries to connect to #DeeServer
@@ -263,7 +262,6 @@
 
 /**
  * dee_client_new_for_address:
- *
  * @swarm_name: Name of swarm to join.
  * @bus_address: D-Bus address to use when connecting to the server.
  *

=== modified file 'src/dee-filter-model.c'
--- src/dee-filter-model.c	2012-01-09 14:31:36 +0000
+++ src/dee-filter-model.c	2012-06-27 14:27:18 +0000
@@ -298,9 +298,10 @@
   /**
    * DeeFilterModel:filter:
    *
-   * Type: DeeFilter
    * Property holding the #DeeFilter used to filter the model
    * defined in the #DeeFilterModel:back-end property.
+   * 
+   * Type: DeeFilter
    */
   pspec = g_param_spec_pointer ("filter", "Filter",
                                 "Filtering rules applied to the original model",

=== modified file 'src/dee-index.c'
--- src/dee-index.c	2011-11-25 08:06:36 +0000
+++ src/dee-index.c	2012-06-27 14:27:18 +0000
@@ -172,8 +172,9 @@
   /**
    * DeeIndex:analyzer:
    *
+   * The #DeeAnalyzer used to analyze terms extracted by the model reader
+   *
    * Type: DeeAnalyzer
-   * The #DeeAnalyzer used to analyze terms extracted by the model reader
    */
   pspec = g_param_spec_object("analyzer", "Analyzer",
                                "Analyzing terms extracted by the reader",
@@ -185,8 +186,9 @@
   /**
      * DeeIndex:reader:
      *
+     * The #DeeModelReader used to extract terms from rows in the model
+     *
      * Type: DeeModelReader
-     * The #DeeModelReader used to extract terms from rows in the model
      */
     pspec = g_param_spec_pointer("reader", "Reader",
                                  "The reader extracting terms for each row",

=== modified file 'src/dee-peer.c'
--- src/dee-peer.c	2012-02-28 10:56:27 +0000
+++ src/dee-peer.c	2012-06-27 14:27:18 +0000
@@ -784,7 +784,7 @@
 /* Public Methods */
 
 /**
- * dee_peer_new
+ * dee_peer_new:
  * @swarm_name: The name of the swarm to join.
  *              Fx &quot;org.example.DataProviders&quot;
  *

=== modified file 'src/dee-sequence-model.h'
--- src/dee-sequence-model.h	2011-08-01 13:46:03 +0000
+++ src/dee-sequence-model.h	2012-06-27 14:27:18 +0000
@@ -68,7 +68,7 @@
 };
 
 /**
- * DBUS_INTERFACE_SEQUENCE_MODEL
+ * DEE_SEQUENCE_MODEL_DBUS_IFACE:
  *
  * String constant defining the name of the DBus Model interface.
  */

=== modified file 'src/dee-shared-model.h'
--- src/dee-shared-model.h	2012-02-28 10:56:27 +0000
+++ src/dee-shared-model.h	2012-06-27 14:27:18 +0000
@@ -69,7 +69,7 @@
 };
 
 /**
- * DBUS_INTERFACE_SHARED_MODEL
+ * DEE_SHARED_MODEL_DBUS_IFACE:
  *
  * String constant defining the name of the DBus Model interface.
  */

=== modified file 'tests/model-helper-add3rows.c'
--- tests/model-helper-add3rows.c	2012-01-05 19:27:06 +0000
+++ tests/model-helper-add3rows.c	2012-06-27 14:27:18 +0000
@@ -58,7 +58,6 @@
   GSList        *rows_added;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/model-helper-append1.c'
--- tests/model-helper-append1.c	2012-02-27 19:20:57 +0000
+++ tests/model-helper-append1.c	2012-06-27 14:27:18 +0000
@@ -32,7 +32,6 @@
   DeeModel     *model;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/model-helper-clear3add5.c'
--- tests/model-helper-clear3add5.c	2012-02-03 11:34:32 +0000
+++ tests/model-helper-clear3add5.c	2012-06-27 14:27:18 +0000
@@ -58,7 +58,6 @@
   GSList       *added;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/model-helper-clear3rows.c'
--- tests/model-helper-clear3rows.c	2012-01-05 19:27:06 +0000
+++ tests/model-helper-clear3rows.c	2012-06-27 14:27:18 +0000
@@ -57,7 +57,6 @@
   GSList        *removed;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/model-helper-clear6rows.c'
--- tests/model-helper-clear6rows.c	2012-02-26 23:10:58 +0000
+++ tests/model-helper-clear6rows.c	2012-06-27 14:27:18 +0000
@@ -59,7 +59,6 @@
   GSList        *removed;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/model-helper-clone3rows.c'
--- tests/model-helper-clone3rows.c	2012-04-05 11:44:38 +0000
+++ tests/model-helper-clone3rows.c	2012-06-27 14:27:18 +0000
@@ -41,7 +41,6 @@
   gint          num_added;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   g_set_prgname ("model-helper");
 

=== modified file 'tests/model-helper-insert1row.c'
--- tests/model-helper-insert1row.c	2011-12-14 14:09:58 +0000
+++ tests/model-helper-insert1row.c	2012-06-27 14:27:18 +0000
@@ -41,7 +41,6 @@
   GSList        *rows_added;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/model-helper-introspect.c'
--- tests/model-helper-introspect.c	2010-12-15 13:10:51 +0000
+++ tests/model-helper-introspect.c	2012-06-27 14:27:18 +0000
@@ -50,7 +50,6 @@
   GVariant        *introspection_value;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   error = NULL;
   conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);

=== modified file 'tests/model-helper-replace.c'
--- tests/model-helper-replace.c	2012-02-27 18:50:45 +0000
+++ tests/model-helper-replace.c	2012-06-27 14:27:18 +0000
@@ -34,7 +34,6 @@
   DeeModel     *model;
   
   g_type_init ();
-  g_thread_init (NULL);
 
   if (argc == 2)
     {

=== modified file 'tests/model-helper-schemaless.c'
--- tests/model-helper-schemaless.c	2011-12-14 14:09:58 +0000
+++ tests/model-helper-schemaless.c	2012-06-27 14:27:18 +0000
@@ -33,7 +33,6 @@
   DeeModel     *model;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   if (argc == 2)
     model = dee_shared_model_new (argv[1]);

=== modified file 'tests/peer-helper-1peer.c'
--- tests/peer-helper-1peer.c	2012-01-02 15:59:19 +0000
+++ tests/peer-helper-1peer.c	2012-06-27 14:27:18 +0000
@@ -46,7 +46,6 @@
   DeePeer      *peer;
   
   g_type_init (); 
-  g_thread_init (NULL);
 
   peer = dee_peer_new (argv[1]);
   

=== modified file 'tests/server-helper-client.c'
--- tests/server-helper-client.c	2012-01-06 10:35:30 +0000
+++ tests/server-helper-client.c	2012-06-27 14:27:18 +0000
@@ -82,7 +82,6 @@
   int num_clients, i;
   
   g_type_init ();
-  g_thread_init (NULL);
 
   if (argc < 3) g_error ("Invalid invocation");
 

=== modified file 'tests/test-benchmark.c'
--- tests/test-benchmark.c	2012-02-28 13:21:42 +0000
+++ tests/test-benchmark.c	2012-06-27 14:27:18 +0000
@@ -541,7 +541,6 @@
 main (gint argc, gchar *argv[])
 {
   g_type_init ();
-  g_thread_init (NULL);
   g_test_init (&argc, &argv, NULL);
   
   /* Extract NULL terminated array of prefixes from arguments */

=== modified file 'tests/test-dee.c'
--- tests/test-dee.c	2012-03-16 11:48:56 +0000
+++ tests/test-dee.c	2012-06-27 14:27:18 +0000
@@ -52,7 +52,6 @@
 main (gint argc, gchar *argv[])
 {
   g_type_init (); 
-  g_thread_init (NULL);
 
   g_test_init (&argc, &argv, NULL);
   setlocale (LC_ALL, "");