Merge lp:~timo-jyrinki/bamf/revert-469-0.2 into lp:bamf/0.2

Proposed by Timo Jyrinki
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 485
Merged at revision: 484
Proposed branch: lp:~timo-jyrinki/bamf/revert-469-0.2
Merge into: lp:bamf/0.2
Diff against target: 796 lines (+115/-116)
12 files modified
lib/libbamf/Makefile.am (+2/-3)
lib/libbamf/bamf-application-private.h (+1/-1)
lib/libbamf/bamf-application.c (+12/-12)
lib/libbamf/bamf-factory.c (+12/-12)
lib/libbamf/bamf-factory.h (+15/-15)
lib/libbamf/bamf-indicator.c (+4/-4)
lib/libbamf/bamf-matcher.c (+28/-28)
lib/libbamf/bamf-tab-source.c (+1/-1)
lib/libbamf/bamf-tab.c (+1/-1)
lib/libbamf/bamf-view-private.h (+11/-11)
lib/libbamf/bamf-view.c (+15/-15)
lib/libbamf/bamf-window.c (+13/-13)
To merge this branch: bzr merge lp:~timo-jyrinki/bamf/revert-469-0.2
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+136378@code.launchpad.net

Commit message

Revert r469 - unsuitable for SRU and this branch is aimed for precise (was: remerge libbamf, Makefile: don't export private symbols (factory and matcher))

Description of the change

Revert r469 - unsuitable for SRU and this branch is aimed for precise (was: remerge libbamf, Makefile: don't export private symbols (factory and matcher))

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Small conflicts were in lib/libbamf/bamf-view.c, lib/libbamf/bamf-view-private.h and lib/libbamf/bamf-factory.c.

lp:~timo-jyrinki/bamf/revert-469-0.2 updated
485. By Timo Jyrinki on 2012-11-27

Keep the new function _bamf_view_set_closed as actually private instead of introducing another non-private function.

Łukasz Zemczak (sil2100) wrote :

Ok, it seems to look fine. And it builds. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/Makefile.am'
2--- lib/libbamf/Makefile.am 2012-07-31 15:51:02 +0000
3+++ lib/libbamf/Makefile.am 2012-11-27 11:57:27 +0000
4@@ -66,8 +66,7 @@
5 $(NULL)
6
7 libbamf_la_LDFLAGS = \
8- -shared \
9- -export-symbols-regex "^bamf_" \
10+ -shared -Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
11 $(NULL)
12
13 libbamf3_la_SOURCES = $(libbamf_la_SOURCES)
14@@ -80,7 +79,7 @@
15 $(NULL)
16
17 glib_marshal_list = bamf-marshal.list
18-glib_marshal_prefix = _bamf_marshal
19+glib_marshal_prefix = bamf_marshal
20
21 bamf-tab-source-glue.h: bamf-tab-source-glue.xml
22 $(AM_V_GEN)$(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_tab_source --mode=glib-server --output=$@ $<
23
24=== modified file 'lib/libbamf/bamf-application-private.h'
25--- lib/libbamf/bamf-application-private.h 2012-05-24 20:25:51 +0000
26+++ lib/libbamf/bamf-application-private.h 2012-11-27 11:57:27 +0000
27@@ -25,6 +25,6 @@
28
29 #include <libbamf/bamf-application.h>
30
31-GList *_bamf_application_get_cached_xids (BamfApplication *app);
32+GList *bamf_application_get_cached_xids (BamfApplication *app);
33
34 #endif
35
36=== modified file 'lib/libbamf/bamf-application.c'
37--- lib/libbamf/bamf-application.c 2012-07-01 18:13:55 +0000
38+++ lib/libbamf/bamf-application.c 2012-11-27 11:57:27 +0000
39@@ -93,7 +93,7 @@
40 if (priv->desktop_file)
41 return priv->desktop_file;
42
43- if (!_bamf_view_remote_ready (BAMF_VIEW (application)))
44+ if (!bamf_view_remote_ready (BAMF_VIEW (application)))
45 return NULL;
46
47 if (!dbus_g_proxy_call (priv->proxy,
48@@ -142,7 +142,7 @@
49 if (priv->application_type)
50 return priv->application_type;
51
52- if (!_bamf_view_remote_ready (BAMF_VIEW (application)))
53+ if (!bamf_view_remote_ready (BAMF_VIEW (application)))
54 return NULL;
55
56 if (!dbus_g_proxy_call (priv->proxy,
57@@ -180,7 +180,7 @@
58 g_return_val_if_fail (BAMF_IS_APPLICATION (application), FALSE);
59 priv = application->priv;
60
61- if (!_bamf_view_remote_ready (BAMF_VIEW (application)))
62+ if (!bamf_view_remote_ready (BAMF_VIEW (application)))
63 return NULL;
64
65 if (!dbus_g_proxy_call (priv->proxy,
66@@ -251,7 +251,7 @@
67
68 priv = application->priv;
69
70- if (!_bamf_view_remote_ready (BAMF_VIEW (application)))
71+ if (!bamf_view_remote_ready (BAMF_VIEW (application)))
72 return TRUE;
73
74 if (priv->show_stubs == -1)
75@@ -294,8 +294,8 @@
76
77 g_return_if_fail (BAMF_IS_APPLICATION (self));
78
79- factory = _bamf_factory_get_default ();
80- view = _bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
81+ factory = bamf_factory_get_default ();
82+ view = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
83
84 if (BAMF_IS_WINDOW (view))
85 {
86@@ -318,8 +318,8 @@
87
88 g_return_if_fail (BAMF_IS_APPLICATION (self));
89
90- factory = _bamf_factory_get_default ();
91- view = _bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
92+ factory = bamf_factory_get_default ();
93+ view = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
94
95 if (BAMF_IS_WINDOW (view))
96 {
97@@ -331,7 +331,7 @@
98 }
99
100 GList *
101-_bamf_application_get_cached_xids (BamfApplication *self)
102+bamf_application_get_cached_xids (BamfApplication *self)
103 {
104 g_return_val_if_fail (BAMF_IS_APPLICATION (self), NULL);
105
106@@ -501,7 +501,7 @@
107 }
108 }
109
110- _bamf_view_set_name (BAMF_VIEW (self), name);
111+ bamf_view_set_name (BAMF_VIEW (self), name);
112
113 gicon = g_app_info_get_icon (G_APP_INFO (desktop_info));
114 icon = g_icon_to_string (gicon);
115@@ -509,7 +509,7 @@
116 if (!icon)
117 icon = g_strdup ("application-default-icon");
118
119- _bamf_view_set_icon (BAMF_VIEW (self), icon);
120+ bamf_view_set_icon (BAMF_VIEW (self), icon);
121 g_free (icon);
122 g_key_file_free (keyfile);
123 g_free (name);
124@@ -574,7 +574,7 @@
125 BamfApplication *self;
126 self = g_object_new (BAMF_TYPE_APPLICATION, NULL);
127
128- _bamf_view_set_path (BAMF_VIEW (self), path);
129+ bamf_view_set_path (BAMF_VIEW (self), path);
130
131 return self;
132 }
133
134=== modified file 'lib/libbamf/bamf-factory.c'
135--- lib/libbamf/bamf-factory.c 2012-10-12 10:56:09 +0000
136+++ lib/libbamf/bamf-factory.c 2012-11-27 11:57:27 +0000
137@@ -95,7 +95,7 @@
138
139 g_return_if_fail (BAMF_IS_VIEW (view));
140
141- path = _bamf_view_get_path (view);
142+ path = bamf_view_get_path (view);
143 if (path)
144 g_hash_table_remove (self->priv->views, path);
145
146@@ -128,7 +128,7 @@
147 }
148
149 BamfApplication *
150-_bamf_factory_app_for_file (BamfFactory * factory,
151+bamf_factory_app_for_file (BamfFactory * factory,
152 const char * path,
153 gboolean create)
154 {
155@@ -190,24 +190,24 @@
156 }
157
158 BamfView *
159-_bamf_factory_view_for_path (BamfFactory * factory, const char * path)
160+bamf_factory_view_for_path (BamfFactory * factory, const char * path)
161 {
162- return _bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_NONE);
163+ return bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_NONE);
164 }
165
166 BamfView *
167-_bamf_factory_view_for_path_type_str (BamfFactory * factory, const char * path,
168+bamf_factory_view_for_path_type_str (BamfFactory * factory, const char * path,
169 const char * type)
170 {
171 g_return_val_if_fail (BAMF_IS_FACTORY (factory), NULL);
172 BamfFactoryViewType factory_type = compute_factory_type_by_str (type);
173
174- return _bamf_factory_view_for_path_type (factory, path, factory_type);
175+ return bamf_factory_view_for_path_type (factory, path, factory_type);
176 }
177
178 BamfView *
179-_bamf_factory_view_for_path_type (BamfFactory * factory, const char * path,
180- BamfFactoryViewType type)
181+bamf_factory_view_for_path_type (BamfFactory * factory, const char * path,
182+ BamfFactoryViewType type)
183 {
184 GHashTable *views;
185 BamfView *view;
186@@ -228,7 +228,7 @@
187 if (type == BAMF_FACTORY_NONE)
188 {
189 view = g_object_new (BAMF_TYPE_VIEW, NULL);
190- _bamf_view_set_path (view, path);
191+ bamf_view_set_path (view, path);
192 type = compute_factory_type_by_str (bamf_view_get_view_type (view));
193 g_object_unref (view);
194 view = NULL;
195@@ -283,7 +283,7 @@
196 if (!list_desktop_file && !matched_view)
197 {
198 GList *list_children, *ll;
199- list_children = _bamf_application_get_cached_xids (list_app);
200+ list_children = bamf_application_get_cached_xids (list_app);
201
202 for (ll = local_children; ll; ll = ll->next)
203 {
204@@ -332,7 +332,7 @@
205 g_object_unref (view);
206
207 view = matched_view;
208- _bamf_view_set_path (view, path);
209+ bamf_view_set_path (view, path);
210 g_object_ref_sink (view);
211 }
212
213@@ -351,7 +351,7 @@
214 }
215
216 BamfFactory *
217-_bamf_factory_get_default (void)
218+bamf_factory_get_default (void)
219 {
220
221 if (BAMF_IS_FACTORY (factory))
222
223=== modified file 'lib/libbamf/bamf-factory.h'
224--- lib/libbamf/bamf-factory.h 2012-05-24 20:25:51 +0000
225+++ lib/libbamf/bamf-factory.h 2012-11-27 11:57:27 +0000
226@@ -75,24 +75,24 @@
227 GObjectClass parent_class;
228 };
229
230-GType bamf_factory_get_type (void) G_GNUC_CONST;
231-
232-BamfView * _bamf_factory_view_for_path (BamfFactory * factory,
233- const char * path);
234-
235-BamfView * _bamf_factory_view_for_path_type (BamfFactory * factory,
236- const char * path,
237- BamfFactoryViewType type);
238-
239-BamfView * _bamf_factory_view_for_path_type_str (BamfFactory * factory,
240- const char * path,
241- const char * type);
242-
243-BamfApplication * _bamf_factory_app_for_file (BamfFactory * factory,
244+GType bamf_factory_get_type (void) G_GNUC_CONST;
245+
246+BamfView * bamf_factory_view_for_path (BamfFactory * factory,
247+ const char * path);
248+
249+BamfView * bamf_factory_view_for_path_type (BamfFactory * factory,
250+ const char * path,
251+ BamfFactoryViewType type);
252+
253+BamfView * bamf_factory_view_for_path_type_str (BamfFactory * factory,
254+ const char * path,
255+ const char * type);
256+
257+BamfApplication * bamf_factory_app_for_file (BamfFactory * factory,
258 const char * path,
259 gboolean create);
260
261-BamfFactory * _bamf_factory_get_default (void);
262+BamfFactory * bamf_factory_get_default (void);
263
264 G_END_DECLS
265
266
267=== modified file 'lib/libbamf/bamf-indicator.c'
268--- lib/libbamf/bamf-indicator.c 2012-05-24 20:25:51 +0000
269+++ lib/libbamf/bamf-indicator.c 2012-11-27 11:57:27 +0000
270@@ -70,7 +70,7 @@
271 if (priv->dbus_menu)
272 return priv->dbus_menu;
273
274- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
275+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
276 return NULL;
277
278 proxy = dbus_g_proxy_new_for_name (priv->connection,
279@@ -113,7 +113,7 @@
280 if (priv->path)
281 return priv->path;
282
283- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
284+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
285 return NULL;
286
287 if (!dbus_g_proxy_call (priv->proxy,
288@@ -147,7 +147,7 @@
289 if (priv->address)
290 return priv->address;
291
292- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
293+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
294 return NULL;
295
296 if (!dbus_g_proxy_call (priv->proxy,
297@@ -267,7 +267,7 @@
298 BamfIndicator *self;
299 self = g_object_new (BAMF_TYPE_INDICATOR, NULL);
300
301- _bamf_view_set_path (BAMF_VIEW (self), path);
302+ bamf_view_set_path (BAMF_VIEW (self), path);
303
304 return self;
305 }
306
307=== modified file 'lib/libbamf/bamf-matcher.c'
308--- lib/libbamf/bamf-matcher.c 2012-07-02 14:41:12 +0000
309+++ lib/libbamf/bamf-matcher.c 2012-11-27 11:57:27 +0000
310@@ -114,7 +114,7 @@
311 G_OBJECT_CLASS_TYPE (klass),
312 0,
313 0, NULL, NULL,
314- _bamf_marshal_VOID__OBJECT_OBJECT,
315+ bamf_marshal_VOID__OBJECT_OBJECT,
316 G_TYPE_NONE, 2,
317 G_TYPE_OBJECT, G_TYPE_OBJECT);
318
319@@ -123,7 +123,7 @@
320 G_OBJECT_CLASS_TYPE (klass),
321 0,
322 0, NULL, NULL,
323- _bamf_marshal_VOID__OBJECT_OBJECT,
324+ bamf_marshal_VOID__OBJECT_OBJECT,
325 G_TYPE_NONE, 2,
326 G_TYPE_OBJECT, G_TYPE_OBJECT);
327
328@@ -144,9 +144,9 @@
329 BamfMatcher *matcher)
330 {
331 BamfView *view;
332- BamfFactory *factory = _bamf_factory_get_default ();
333+ BamfFactory *factory = bamf_factory_get_default ();
334
335- view = _bamf_factory_view_for_path_type_str (factory, path, type);
336+ view = bamf_factory_view_for_path_type_str (factory, path, type);
337
338 if (!BAMF_IS_VIEW (view))
339 return;
340@@ -163,9 +163,9 @@
341 BamfMatcher *matcher)
342 {
343 BamfView *view;
344- BamfFactory *factory = _bamf_factory_get_default ();
345+ BamfFactory *factory = bamf_factory_get_default ();
346
347- view = _bamf_factory_view_for_path_type_str (factory, path, type);
348+ view = bamf_factory_view_for_path_type_str (factory, path, type);
349
350 if (!BAMF_IS_VIEW (view))
351 return;
352@@ -184,9 +184,9 @@
353 BamfView *old_view;
354 BamfView *new_view;
355
356- BamfFactory *factory = _bamf_factory_get_default ();
357- old_view = _bamf_factory_view_for_path_type (factory, old_path, BAMF_FACTORY_APPLICATION);
358- new_view = _bamf_factory_view_for_path_type (factory, new_path, BAMF_FACTORY_APPLICATION);
359+ BamfFactory *factory = bamf_factory_get_default ();
360+ old_view = bamf_factory_view_for_path_type (factory, old_path, BAMF_FACTORY_APPLICATION);
361+ new_view = bamf_factory_view_for_path_type (factory, new_path, BAMF_FACTORY_APPLICATION);
362
363 g_signal_emit (matcher, matcher_signals[ACTIVE_APPLICATION_CHANGED], 0, old_view, new_view);
364 }
365@@ -200,9 +200,9 @@
366 BamfView *old_view;
367 BamfView *new_view;
368
369- BamfFactory *factory = _bamf_factory_get_default ();
370- old_view = _bamf_factory_view_for_path_type (factory, old_path, BAMF_FACTORY_WINDOW);
371- new_view = _bamf_factory_view_for_path_type (factory, new_path, BAMF_FACTORY_WINDOW);
372+ BamfFactory *factory = bamf_factory_get_default ();
373+ old_view = bamf_factory_view_for_path_type (factory, old_path, BAMF_FACTORY_WINDOW);
374+ new_view = bamf_factory_view_for_path_type (factory, new_path, BAMF_FACTORY_WINDOW);
375
376 g_signal_emit (matcher, matcher_signals[ACTIVE_WINDOW_CHANGED], 0, old_view, new_view);
377 }
378@@ -240,7 +240,7 @@
379 g_error ("Unable to get org.ayatana.bamf.matcher matcher");
380 }
381
382- dbus_g_object_register_marshaller ((GClosureMarshal) _bamf_marshal_VOID__STRING_STRING,
383+ dbus_g_object_register_marshaller ((GClosureMarshal) bamf_marshal_VOID__STRING_STRING,
384 G_TYPE_NONE,
385 G_TYPE_STRING, G_TYPE_STRING,
386 G_TYPE_INVALID);
387@@ -403,8 +403,8 @@
388 if (!app)
389 return NULL;
390
391- BamfFactory *factory = _bamf_factory_get_default ();
392- view = _bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
393+ BamfFactory *factory = bamf_factory_get_default ();
394+ view = bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
395 g_free (app);
396
397 if (!BAMF_IS_APPLICATION (view))
398@@ -453,8 +453,8 @@
399 if (!win)
400 return NULL;
401
402- BamfFactory *factory = _bamf_factory_get_default ();
403- view = _bamf_factory_view_for_path_type (factory, win, BAMF_FACTORY_WINDOW);
404+ BamfFactory *factory = bamf_factory_get_default ();
405+ view = bamf_factory_view_for_path_type (factory, win, BAMF_FACTORY_WINDOW);
406 g_free (win);
407
408 if (!BAMF_IS_WINDOW (view))
409@@ -527,8 +527,8 @@
410 if (!app)
411 return NULL;
412
413- BamfFactory *factory = _bamf_factory_get_default ();
414- view = _bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
415+ BamfFactory *factory = bamf_factory_get_default ();
416+ view = bamf_factory_view_for_path_type (factory, app, BAMF_FACTORY_APPLICATION);
417
418 g_free (app);
419
420@@ -606,11 +606,11 @@
421 if (!array)
422 return NULL;
423
424- BamfFactory *factory = _bamf_factory_get_default ();
425+ BamfFactory *factory = bamf_factory_get_default ();
426 len = g_strv_length (array);
427 for (i = len-1; i >= 0; i--)
428 {
429- view = _bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
430+ view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
431
432 if (BAMF_IS_APPLICATION (view))
433 result = g_list_prepend (result, view);
434@@ -657,11 +657,11 @@
435 if (!array)
436 return NULL;
437
438- BamfFactory *factory = _bamf_factory_get_default ();
439+ BamfFactory *factory = bamf_factory_get_default ();
440 len = g_strv_length (array);
441 for (i = len-1; i >= 0; i--)
442 {
443- view = _bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_WINDOW);
444+ view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_WINDOW);
445
446 if (BAMF_IS_WINDOW (view))
447 result = g_list_prepend (result, view);
448@@ -712,11 +712,11 @@
449 if (!array)
450 return NULL;
451
452- BamfFactory *factory = _bamf_factory_get_default ();
453+ BamfFactory *factory = bamf_factory_get_default ();
454 len = g_strv_length (array);
455 for (i = len-1; i >= 0; i--)
456 {
457- view = _bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_WINDOW);
458+ view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_WINDOW);
459
460 if (BAMF_IS_WINDOW (view))
461 result = g_list_prepend (result, view);
462@@ -788,11 +788,11 @@
463 if (!array)
464 return NULL;
465
466- BamfFactory *factory = _bamf_factory_get_default ();
467+ BamfFactory *factory = bamf_factory_get_default ();
468 len = g_strv_length (array);
469 for (i = len-1; i >= 0; i--)
470 {
471- view = _bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
472+ view = bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
473
474 if (BAMF_IS_APPLICATION (view))
475 result = g_list_prepend (result, view);
476@@ -850,7 +850,7 @@
477 BamfApplication *app;
478 const gchar ** favs;
479
480- app = _bamf_factory_app_for_file (_bamf_factory_get_default (), desktop_file_path, create_if_not_found);
481+ app = bamf_factory_app_for_file (bamf_factory_get_default (), desktop_file_path, create_if_not_found);
482 if (app)
483 {
484 favs = g_malloc0 (sizeof (gchar *) * 2),
485
486=== modified file 'lib/libbamf/bamf-tab-source.c'
487--- lib/libbamf/bamf-tab-source.c 2012-05-24 20:25:51 +0000
488+++ lib/libbamf/bamf-tab-source.c 2012-11-27 11:57:27 +0000
489@@ -220,7 +220,7 @@
490 G_SIGNAL_RUN_FIRST,
491 0,
492 NULL, NULL,
493- _bamf_marshal_VOID__STRING_STRING_STRING,
494+ bamf_marshal_VOID__STRING_STRING_STRING,
495 G_TYPE_NONE, 3,
496 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
497
498
499=== modified file 'lib/libbamf/bamf-tab.c'
500--- lib/libbamf/bamf-tab.c 2012-05-24 20:25:51 +0000
501+++ lib/libbamf/bamf-tab.c 2012-11-27 11:57:27 +0000
502@@ -194,7 +194,7 @@
503 G_SIGNAL_RUN_FIRST,
504 G_STRUCT_OFFSET (BamfTabClass, uri_changed),
505 NULL, NULL,
506- _bamf_marshal_VOID__STRING_STRING,
507+ bamf_marshal_VOID__STRING_STRING,
508 G_TYPE_NONE, 2,
509 G_TYPE_STRING, G_TYPE_STRING);
510
511
512=== modified file 'lib/libbamf/bamf-view-private.h'
513--- lib/libbamf/bamf-view-private.h 2012-06-13 14:32:42 +0000
514+++ lib/libbamf/bamf-view-private.h 2012-11-27 11:57:27 +0000
515@@ -25,17 +25,17 @@
516
517 #include <libbamf/bamf-view.h>
518
519-void _bamf_view_set_path (BamfView *view, const char *dbus_path);
520-
521-const char * _bamf_view_get_path (BamfView *view);
522-
523-gboolean _bamf_view_remote_ready (BamfView *view);
524-
525-void _bamf_view_reset_flags (BamfView *view);
526-
527-void _bamf_view_set_name (BamfView *view, const char *name);
528-
529-void _bamf_view_set_icon (BamfView *view, const char *icon);
530+void bamf_view_set_path (BamfView *view, const char *dbus_path);
531+
532+const char * bamf_view_get_path (BamfView *view);
533+
534+gboolean bamf_view_remote_ready (BamfView *view);
535+
536+void bamf_view_reset_flags (BamfView *view);
537+
538+void bamf_view_set_name (BamfView *view, const char *name);
539+
540+void bamf_view_set_icon (BamfView *view, const char *icon);
541
542 void _bamf_view_set_closed (BamfView *view, gboolean closed);
543
544
545=== modified file 'lib/libbamf/bamf-view.c'
546--- lib/libbamf/bamf-view.c 2012-07-01 18:13:55 +0000
547+++ lib/libbamf/bamf-view.c 2012-11-27 11:57:27 +0000
548@@ -165,7 +165,7 @@
549 if (BAMF_VIEW_GET_CLASS (view)->get_children)
550 return BAMF_VIEW_GET_CLASS (view)->get_children (view);
551
552- if (!_bamf_view_remote_ready (view))
553+ if (!bamf_view_remote_ready (view))
554 return NULL;
555
556 priv = view->priv;
557@@ -192,7 +192,7 @@
558
559 for (i = len-1; i >= 0; i--)
560 {
561- view = _bamf_factory_view_for_path (_bamf_factory_get_default (), children[i]);
562+ view = bamf_factory_view_for_path (bamf_factory_get_default (), children[i]);
563 results = g_list_prepend (results, g_object_ref (view));
564 }
565
566@@ -213,7 +213,7 @@
567 if (bamf_view_flag_is_set (self, flag))
568 return bamf_view_get_flag (self, flag);
569
570- if (!_bamf_view_remote_ready (self))
571+ if (!bamf_view_remote_ready (self))
572 return FALSE;
573
574 if (!dbus_g_proxy_call (priv->proxy,
575@@ -316,7 +316,7 @@
576 }
577
578 void
579-_bamf_view_set_name (BamfView *view, const char *name)
580+bamf_view_set_name (BamfView *view, const char *name)
581 {
582 g_return_if_fail (BAMF_IS_VIEW (view));
583
584@@ -336,7 +336,7 @@
585 }
586
587 void
588-_bamf_view_set_icon (BamfView *view, const char *icon)
589+bamf_view_set_icon (BamfView *view, const char *icon)
590 {
591 g_return_if_fail (BAMF_IS_VIEW (view));
592
593@@ -395,7 +395,7 @@
594 if (BAMF_VIEW_GET_CLASS (self)->get_icon)
595 return BAMF_VIEW_GET_CLASS (self)->get_icon (self);
596
597- if (!_bamf_view_remote_ready (self))
598+ if (!bamf_view_remote_ready (self))
599 return g_strdup (priv->local_icon);
600
601 if (!dbus_g_proxy_call (priv->proxy,
602@@ -439,7 +439,7 @@
603 if (BAMF_VIEW_GET_CLASS (self)->get_name)
604 return BAMF_VIEW_GET_CLASS (self)->get_name (self);
605
606- if (!_bamf_view_remote_ready (self))
607+ if (!bamf_view_remote_ready (self))
608 return g_strdup (priv->local_name);
609
610 if (!dbus_g_proxy_call (priv->proxy,
611@@ -465,7 +465,7 @@
612 }
613
614 gboolean
615-_bamf_view_remote_ready (BamfView *view)
616+bamf_view_remote_ready (BamfView *view)
617 {
618 if (BAMF_IS_VIEW (view) && view->priv->proxy)
619 return !view->priv->is_closed;
620@@ -531,7 +531,7 @@
621 BamfView *view;
622 BamfViewPrivate *priv;
623
624- view = _bamf_factory_view_for_path (_bamf_factory_get_default (), path);
625+ view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
626 priv = self->priv;
627
628 if (priv->cached_children)
629@@ -548,7 +548,7 @@
630 {
631 BamfView *view;
632 BamfViewPrivate *priv;
633- view = _bamf_factory_view_for_path (_bamf_factory_get_default (), path);
634+ view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
635 priv = self->priv;
636
637 if (priv->cached_children)
638@@ -792,7 +792,7 @@
639 }
640
641 const char *
642-_bamf_view_get_path (BamfView *view)
643+bamf_view_get_path (BamfView *view)
644 {
645 g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
646
647@@ -800,7 +800,7 @@
648 }
649
650 void
651-_bamf_view_reset_flags (BamfView *view)
652+bamf_view_reset_flags (BamfView *view)
653 {
654 BamfViewPrivate *priv;
655 g_return_if_fail (BAMF_IS_VIEW (view));
656@@ -834,7 +834,7 @@
657 }
658
659 void
660-_bamf_view_set_path (BamfView *view, const char *path)
661+bamf_view_set_path (BamfView *view, const char *path)
662 {
663 BamfViewPrivate *priv;
664
665@@ -958,7 +958,7 @@
666
667 if (bamf_view_is_sticky (view))
668 {
669- _bamf_view_reset_flags (view);
670+ bamf_view_reset_flags (view);
671 }
672
673 if (BAMF_VIEW_GET_CLASS (view)->set_path)
674@@ -1074,7 +1074,7 @@
675 G_OBJECT_CLASS_TYPE (klass),
676 0,
677 0, NULL, NULL,
678- _bamf_marshal_VOID__STRING_STRING,
679+ bamf_marshal_VOID__STRING_STRING,
680 G_TYPE_NONE, 2,
681 G_TYPE_STRING,
682 G_TYPE_STRING);
683
684=== modified file 'lib/libbamf/bamf-window.c'
685--- lib/libbamf/bamf-window.c 2012-07-01 18:13:55 +0000
686+++ lib/libbamf/bamf-window.c 2012-11-27 11:57:27 +0000
687@@ -92,7 +92,7 @@
688 g_return_val_if_fail (BAMF_IS_WINDOW (self), FALSE);
689 priv = self->priv;
690
691- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
692+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
693 return NULL;
694
695 if (!dbus_g_proxy_call (priv->proxy,
696@@ -110,8 +110,8 @@
697 if (!path)
698 return NULL;
699
700- BamfFactory *factory = _bamf_factory_get_default ();
701- transient = _bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
702+ BamfFactory *factory = bamf_factory_get_default ();
703+ transient = bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
704 g_free (path);
705
706 if (!BAMF_IS_WINDOW (transient))
707@@ -129,7 +129,7 @@
708 g_return_val_if_fail (BAMF_IS_WINDOW (self), FALSE);
709 priv = self->priv;
710
711- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
712+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
713 return 0;
714
715 if (!dbus_g_proxy_call (priv->proxy,
716@@ -159,7 +159,7 @@
717 if (priv->pid != 0)
718 return priv->pid;
719
720- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
721+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
722 return 0;
723
724 if (!dbus_g_proxy_call (priv->proxy,
725@@ -189,7 +189,7 @@
726 if (priv->xid != 0)
727 return priv->xid;
728
729- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
730+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
731 return 0;
732
733 if (!dbus_g_proxy_call (priv->proxy,
734@@ -283,7 +283,7 @@
735 priv->monitor = bamf_window_get_monitor (self);
736 priv->maximized = bamf_window_maximized (self);
737
738- dbus_g_object_register_marshaller ((GClosureMarshal) _bamf_marshal_VOID__INT_INT,
739+ dbus_g_object_register_marshaller ((GClosureMarshal) bamf_marshal_VOID__INT_INT,
740 G_TYPE_NONE,
741 G_TYPE_INT, G_TYPE_INT,
742 G_TYPE_INVALID);
743@@ -321,7 +321,7 @@
744 g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL);
745 priv = self->priv;
746
747- if (!_bamf_view_remote_ready (BAMF_VIEW (self)))
748+ if (!bamf_view_remote_ready (BAMF_VIEW (self)))
749 return NULL;
750
751 if (!dbus_g_proxy_call (priv->proxy,
752@@ -357,7 +357,7 @@
753 g_return_val_if_fail (BAMF_IS_WINDOW (self), -1);
754 priv = self->priv;
755
756- if (priv->monitor != -2 || !_bamf_view_remote_ready (BAMF_VIEW (self)))
757+ if (priv->monitor != -2 || !bamf_view_remote_ready (BAMF_VIEW (self)))
758 {
759 return priv->monitor;
760 }
761@@ -388,7 +388,7 @@
762 g_return_val_if_fail (BAMF_IS_WINDOW (self), -1);
763 priv = self->priv;
764
765- if (priv->maximized != -1 || !_bamf_view_remote_ready (BAMF_VIEW (self)))
766+ if (priv->maximized != -1 || !bamf_view_remote_ready (BAMF_VIEW (self)))
767 {
768 return priv->maximized;
769 }
770@@ -439,7 +439,7 @@
771 G_SIGNAL_RUN_FIRST,
772 G_STRUCT_OFFSET (BamfWindowClass, monitor_changed),
773 NULL, NULL,
774- _bamf_marshal_VOID__INT_INT,
775+ bamf_marshal_VOID__INT_INT,
776 G_TYPE_NONE, 2,
777 G_TYPE_INT, G_TYPE_INT);
778
779@@ -449,7 +449,7 @@
780 G_SIGNAL_RUN_FIRST,
781 G_STRUCT_OFFSET (BamfWindowClass, maximized_changed),
782 NULL, NULL,
783- _bamf_marshal_VOID__INT_INT,
784+ bamf_marshal_VOID__INT_INT,
785 G_TYPE_NONE, 2,
786 G_TYPE_INT, G_TYPE_INT);
787 }
788@@ -484,7 +484,7 @@
789 BamfWindow *self;
790 self = g_object_new (BAMF_TYPE_WINDOW, NULL);
791
792- _bamf_view_set_path (BAMF_VIEW (self), path);
793+ bamf_view_set_path (BAMF_VIEW (self), path);
794
795 return self;
796 }

Subscribers

People subscribed via source and target branches

to all changes: