dee

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

  1. quantal-compability
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 370
Merged at revision: 369
Proposed branch: lp:~mhr3/dee/quantal-compability
Merge into: lp:dee
Diff against target: 314 lines (+17/-24)
23 files modified
examples/master-model.c (+2/-0)
examples/peers.c (+3/-1)
examples/slave-model.c (+3/-1)
src/dee-client.c (+0/-2)
src/dee-filter-model.c (+2/-1)
src/dee-index.c (+4/-2)
src/dee-peer.c (+1/-1)
src/dee-sequence-model.h (+1/-1)
src/dee-shared-model.h (+1/-1)
tests/model-helper-add3rows.c (+0/-1)
tests/model-helper-append1.c (+0/-1)
tests/model-helper-clear3add5.c (+0/-1)
tests/model-helper-clear3rows.c (+0/-1)
tests/model-helper-clear6rows.c (+0/-1)
tests/model-helper-clone3rows.c (+0/-1)
tests/model-helper-insert1row.c (+0/-1)
tests/model-helper-introspect.c (+0/-1)
tests/model-helper-replace.c (+0/-1)
tests/model-helper-schemaless.c (+0/-1)
tests/peer-helper-1peer.c (+0/-1)
tests/server-helper-client.c (+0/-1)
tests/test-benchmark.c (+0/-1)
tests/test-dee.c (+0/-1)
To merge this branch: bzr merge lp:~mhr3/dee/quantal-compability
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+112358@code.launchpad.net

Commit message

Fix a few introspection annotations to unbreak quantal

Description of the change

Fix a few introspection annotations to unbreak compilation on quantal.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Works for me. Thanks for this fix!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

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 updated
370. By Michal Hruby

Remove deprecated g_thread_init

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/master-model.c'
2--- examples/master-model.c 2011-01-31 09:01:53 +0000
3+++ examples/master-model.c 2012-06-27 14:27:18 +0000
4@@ -52,7 +52,9 @@
5 DeeModel *model;
6
7 g_type_init ();
8+#if !GLIB_CHECK_VERSION(2, 32, 0)
9 g_thread_init (NULL);
10+#endif
11
12 model = dee_shared_model_new ("com.canonical.Dee.Model.Example");
13 dee_model_set_schema (model, "i", "s", NULL);
14
15=== modified file 'examples/peers.c'
16--- examples/peers.c 2010-11-24 11:41:54 +0000
17+++ examples/peers.c 2012-06-27 14:27:18 +0000
18@@ -54,8 +54,10 @@
19 GMainLoop *loop;
20 DeePeer *peer;
21
22- g_type_init ();
23+ g_type_init ();
24+#if !GLIB_CHECK_VERSION(2, 32, 0)
25 g_thread_init (NULL);
26+#endif
27
28 peer = g_object_new (DEE_TYPE_PEER,
29 "swarm-name", "com.canonical.DeePeer.Test",
30
31=== modified file 'examples/slave-model.c'
32--- examples/slave-model.c 2011-02-09 03:44:27 +0000
33+++ examples/slave-model.c 2012-06-27 14:27:18 +0000
34@@ -65,8 +65,10 @@
35 DeeModel *model;
36 const gchar *model_name;
37
38- g_type_init ();
39+ g_type_init ();
40+#if !GLIB_CHECK_VERSION(2, 32, 0)
41 g_thread_init (NULL);
42+#endif
43
44 if (argc < 2)
45 model_name = "com.canonical.Dee.Model.Example";
46
47=== modified file 'src/dee-client.c'
48--- src/dee-client.c 2012-01-26 14:08:54 +0000
49+++ src/dee-client.c 2012-06-27 14:27:18 +0000
50@@ -243,7 +243,6 @@
51
52 /**
53 * dee_client_new:
54- *
55 * @swarm_name: Name of swarm to join.
56 *
57 * Creates a new instance of #DeeClient and tries to connect to #DeeServer
58@@ -263,7 +262,6 @@
59
60 /**
61 * dee_client_new_for_address:
62- *
63 * @swarm_name: Name of swarm to join.
64 * @bus_address: D-Bus address to use when connecting to the server.
65 *
66
67=== modified file 'src/dee-filter-model.c'
68--- src/dee-filter-model.c 2012-01-09 14:31:36 +0000
69+++ src/dee-filter-model.c 2012-06-27 14:27:18 +0000
70@@ -298,9 +298,10 @@
71 /**
72 * DeeFilterModel:filter:
73 *
74- * Type: DeeFilter
75 * Property holding the #DeeFilter used to filter the model
76 * defined in the #DeeFilterModel:back-end property.
77+ *
78+ * Type: DeeFilter
79 */
80 pspec = g_param_spec_pointer ("filter", "Filter",
81 "Filtering rules applied to the original model",
82
83=== modified file 'src/dee-index.c'
84--- src/dee-index.c 2011-11-25 08:06:36 +0000
85+++ src/dee-index.c 2012-06-27 14:27:18 +0000
86@@ -172,8 +172,9 @@
87 /**
88 * DeeIndex:analyzer:
89 *
90+ * The #DeeAnalyzer used to analyze terms extracted by the model reader
91+ *
92 * Type: DeeAnalyzer
93- * The #DeeAnalyzer used to analyze terms extracted by the model reader
94 */
95 pspec = g_param_spec_object("analyzer", "Analyzer",
96 "Analyzing terms extracted by the reader",
97@@ -185,8 +186,9 @@
98 /**
99 * DeeIndex:reader:
100 *
101+ * The #DeeModelReader used to extract terms from rows in the model
102+ *
103 * Type: DeeModelReader
104- * The #DeeModelReader used to extract terms from rows in the model
105 */
106 pspec = g_param_spec_pointer("reader", "Reader",
107 "The reader extracting terms for each row",
108
109=== modified file 'src/dee-peer.c'
110--- src/dee-peer.c 2012-02-28 10:56:27 +0000
111+++ src/dee-peer.c 2012-06-27 14:27:18 +0000
112@@ -784,7 +784,7 @@
113 /* Public Methods */
114
115 /**
116- * dee_peer_new
117+ * dee_peer_new:
118 * @swarm_name: The name of the swarm to join.
119 * Fx &quot;org.example.DataProviders&quot;
120 *
121
122=== modified file 'src/dee-sequence-model.h'
123--- src/dee-sequence-model.h 2011-08-01 13:46:03 +0000
124+++ src/dee-sequence-model.h 2012-06-27 14:27:18 +0000
125@@ -68,7 +68,7 @@
126 };
127
128 /**
129- * DBUS_INTERFACE_SEQUENCE_MODEL
130+ * DEE_SEQUENCE_MODEL_DBUS_IFACE:
131 *
132 * String constant defining the name of the DBus Model interface.
133 */
134
135=== modified file 'src/dee-shared-model.h'
136--- src/dee-shared-model.h 2012-02-28 10:56:27 +0000
137+++ src/dee-shared-model.h 2012-06-27 14:27:18 +0000
138@@ -69,7 +69,7 @@
139 };
140
141 /**
142- * DBUS_INTERFACE_SHARED_MODEL
143+ * DEE_SHARED_MODEL_DBUS_IFACE:
144 *
145 * String constant defining the name of the DBus Model interface.
146 */
147
148=== modified file 'tests/model-helper-add3rows.c'
149--- tests/model-helper-add3rows.c 2012-01-05 19:27:06 +0000
150+++ tests/model-helper-add3rows.c 2012-06-27 14:27:18 +0000
151@@ -58,7 +58,6 @@
152 GSList *rows_added;
153
154 g_type_init ();
155- g_thread_init (NULL);
156
157 if (argc == 2)
158 model = dee_shared_model_new (argv[1]);
159
160=== modified file 'tests/model-helper-append1.c'
161--- tests/model-helper-append1.c 2012-02-27 19:20:57 +0000
162+++ tests/model-helper-append1.c 2012-06-27 14:27:18 +0000
163@@ -32,7 +32,6 @@
164 DeeModel *model;
165
166 g_type_init ();
167- g_thread_init (NULL);
168
169 if (argc == 2)
170 model = dee_shared_model_new (argv[1]);
171
172=== modified file 'tests/model-helper-clear3add5.c'
173--- tests/model-helper-clear3add5.c 2012-02-03 11:34:32 +0000
174+++ tests/model-helper-clear3add5.c 2012-06-27 14:27:18 +0000
175@@ -58,7 +58,6 @@
176 GSList *added;
177
178 g_type_init ();
179- g_thread_init (NULL);
180
181 if (argc == 2)
182 model = dee_shared_model_new (argv[1]);
183
184=== modified file 'tests/model-helper-clear3rows.c'
185--- tests/model-helper-clear3rows.c 2012-01-05 19:27:06 +0000
186+++ tests/model-helper-clear3rows.c 2012-06-27 14:27:18 +0000
187@@ -57,7 +57,6 @@
188 GSList *removed;
189
190 g_type_init ();
191- g_thread_init (NULL);
192
193 if (argc == 2)
194 model = dee_shared_model_new (argv[1]);
195
196=== modified file 'tests/model-helper-clear6rows.c'
197--- tests/model-helper-clear6rows.c 2012-02-26 23:10:58 +0000
198+++ tests/model-helper-clear6rows.c 2012-06-27 14:27:18 +0000
199@@ -59,7 +59,6 @@
200 GSList *removed;
201
202 g_type_init ();
203- g_thread_init (NULL);
204
205 if (argc == 2)
206 model = dee_shared_model_new (argv[1]);
207
208=== modified file 'tests/model-helper-clone3rows.c'
209--- tests/model-helper-clone3rows.c 2012-04-05 11:44:38 +0000
210+++ tests/model-helper-clone3rows.c 2012-06-27 14:27:18 +0000
211@@ -41,7 +41,6 @@
212 gint num_added;
213
214 g_type_init ();
215- g_thread_init (NULL);
216
217 g_set_prgname ("model-helper");
218
219
220=== modified file 'tests/model-helper-insert1row.c'
221--- tests/model-helper-insert1row.c 2011-12-14 14:09:58 +0000
222+++ tests/model-helper-insert1row.c 2012-06-27 14:27:18 +0000
223@@ -41,7 +41,6 @@
224 GSList *rows_added;
225
226 g_type_init ();
227- g_thread_init (NULL);
228
229 if (argc == 2)
230 model = dee_shared_model_new (argv[1]);
231
232=== modified file 'tests/model-helper-introspect.c'
233--- tests/model-helper-introspect.c 2010-12-15 13:10:51 +0000
234+++ tests/model-helper-introspect.c 2012-06-27 14:27:18 +0000
235@@ -50,7 +50,6 @@
236 GVariant *introspection_value;
237
238 g_type_init ();
239- g_thread_init (NULL);
240
241 error = NULL;
242 conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
243
244=== modified file 'tests/model-helper-replace.c'
245--- tests/model-helper-replace.c 2012-02-27 18:50:45 +0000
246+++ tests/model-helper-replace.c 2012-06-27 14:27:18 +0000
247@@ -34,7 +34,6 @@
248 DeeModel *model;
249
250 g_type_init ();
251- g_thread_init (NULL);
252
253 if (argc == 2)
254 {
255
256=== modified file 'tests/model-helper-schemaless.c'
257--- tests/model-helper-schemaless.c 2011-12-14 14:09:58 +0000
258+++ tests/model-helper-schemaless.c 2012-06-27 14:27:18 +0000
259@@ -33,7 +33,6 @@
260 DeeModel *model;
261
262 g_type_init ();
263- g_thread_init (NULL);
264
265 if (argc == 2)
266 model = dee_shared_model_new (argv[1]);
267
268=== modified file 'tests/peer-helper-1peer.c'
269--- tests/peer-helper-1peer.c 2012-01-02 15:59:19 +0000
270+++ tests/peer-helper-1peer.c 2012-06-27 14:27:18 +0000
271@@ -46,7 +46,6 @@
272 DeePeer *peer;
273
274 g_type_init ();
275- g_thread_init (NULL);
276
277 peer = dee_peer_new (argv[1]);
278
279
280=== modified file 'tests/server-helper-client.c'
281--- tests/server-helper-client.c 2012-01-06 10:35:30 +0000
282+++ tests/server-helper-client.c 2012-06-27 14:27:18 +0000
283@@ -82,7 +82,6 @@
284 int num_clients, i;
285
286 g_type_init ();
287- g_thread_init (NULL);
288
289 if (argc < 3) g_error ("Invalid invocation");
290
291
292=== modified file 'tests/test-benchmark.c'
293--- tests/test-benchmark.c 2012-02-28 13:21:42 +0000
294+++ tests/test-benchmark.c 2012-06-27 14:27:18 +0000
295@@ -541,7 +541,6 @@
296 main (gint argc, gchar *argv[])
297 {
298 g_type_init ();
299- g_thread_init (NULL);
300 g_test_init (&argc, &argv, NULL);
301
302 /* Extract NULL terminated array of prefixes from arguments */
303
304=== modified file 'tests/test-dee.c'
305--- tests/test-dee.c 2012-03-16 11:48:56 +0000
306+++ tests/test-dee.c 2012-06-27 14:27:18 +0000
307@@ -52,7 +52,6 @@
308 main (gint argc, gchar *argv[])
309 {
310 g_type_init ();
311- g_thread_init (NULL);
312
313 g_test_init (&argc, &argv, NULL);
314 setlocale (LC_ALL, "");

Subscribers

People subscribed via source and target branches

to all changes: