BAMF

Merge lp:~ricotz/bamf/type-fixes into lp:bamf/0.4

  1. type-fixes
  2. Merge into 0.4
Proposed by Rico Tzschichholz on 2012-10-08
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-10-08
Approved revision: 489
Merged at revision: 489
Proposed branch: lp:~ricotz/bamf/type-fixes
Merge into: lp:bamf/0.4
Diff against target: 90 lines (+9/-8)
3 files modified
lib/libbamf/bamf-matcher.c (+5/-5)
lib/libbamf/bamf-view.c (+3/-2)
lib/libbamf/bamf-view.h (+1/-1)
To merge this branch: bzr merge lp:~ricotz/bamf/type-fixes
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-10-08 Approve on 2012-10-08
Review via email: mp+128472@code.launchpad.net

Commit Message

Libbamf: Some signal, type and annotation fixes

Description of the Change

Some signal, type and annotation fixes

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/bamf-matcher.c'
2--- lib/libbamf/bamf-matcher.c 2012-08-21 22:02:12 +0000
3+++ lib/libbamf/bamf-matcher.c 2012-10-08 11:45:25 +0000
4@@ -97,7 +97,7 @@
5 0, NULL, NULL,
6 g_cclosure_marshal_VOID__OBJECT,
7 G_TYPE_NONE, 1,
8- G_TYPE_OBJECT);
9+ BAMF_TYPE_VIEW);
10
11 matcher_signals [VIEW_CLOSED] =
12 g_signal_new ("view-closed",
13@@ -106,7 +106,7 @@
14 0, NULL, NULL,
15 g_cclosure_marshal_VOID__OBJECT,
16 G_TYPE_NONE, 1,
17- G_TYPE_OBJECT);
18+ BAMF_TYPE_VIEW);
19
20
21 matcher_signals [ACTIVE_APPLICATION_CHANGED] =
22@@ -116,7 +116,7 @@
23 0, NULL, NULL,
24 _bamf_marshal_VOID__OBJECT_OBJECT,
25 G_TYPE_NONE, 2,
26- G_TYPE_OBJECT, G_TYPE_OBJECT);
27+ BAMF_TYPE_VIEW, BAMF_TYPE_VIEW);
28
29 matcher_signals [ACTIVE_WINDOW_CHANGED] =
30 g_signal_new ("active-window-changed",
31@@ -125,7 +125,7 @@
32 0, NULL, NULL,
33 _bamf_marshal_VOID__OBJECT_OBJECT,
34 G_TYPE_NONE, 2,
35- G_TYPE_OBJECT, G_TYPE_OBJECT);
36+ BAMF_TYPE_VIEW, BAMF_TYPE_VIEW);
37
38 matcher_signals [STACKING_ORDER_CHANGED] =
39 g_signal_new ("stacking-order-changed",
40@@ -729,7 +729,7 @@
41 /**
42 * bamf_matcher_register_favorites:
43 * @matcher: a #BamfMatcher
44- * @favorites: an array of strings, each containing an absolute path to a .desktop file
45+ * @favorites: (array): an array of strings, each containing an absolute path to a .desktop file
46 *
47 * Used to effect how bamf performs matching. Desktop files passed to this method will
48 * be prefered by bamf to system desktop files.
49
50=== modified file 'lib/libbamf/bamf-view.c'
51--- lib/libbamf/bamf-view.c 2012-08-21 22:02:12 +0000
52+++ lib/libbamf/bamf-view.c 2012-10-08 11:45:25 +0000
53@@ -1062,7 +1062,7 @@
54 g_signal_new ("child-moved",
55 G_OBJECT_CLASS_TYPE (klass),
56 G_SIGNAL_RUN_FIRST,
57- 0,
58+ G_STRUCT_OFFSET (BamfViewClass, child_moved),
59 NULL, NULL,
60 g_cclosure_marshal_VOID__OBJECT,
61 G_TYPE_NONE, 1,
62@@ -1102,7 +1102,8 @@
63 g_signal_new ("name-changed",
64 G_OBJECT_CLASS_TYPE (klass),
65 0,
66- 0, NULL, NULL,
67+ G_STRUCT_OFFSET (BamfViewClass, name_changed),
68+ NULL, NULL,
69 _bamf_marshal_VOID__STRING_STRING,
70 G_TYPE_NONE, 2,
71 G_TYPE_STRING,
72
73=== modified file 'lib/libbamf/bamf-view.h'
74--- lib/libbamf/bamf-view.h 2012-07-01 18:13:55 +0000
75+++ lib/libbamf/bamf-view.h 2012-10-08 11:45:25 +0000
76@@ -95,13 +95,13 @@
77 void (*urgent_changed) (BamfView *view, gboolean urgent);
78 void (*user_visible_changed) (BamfView *view, gboolean user_visible);
79 void (*name_changed) (BamfView *view, gchar* old_name, gchar* new_name);
80+ void (*child_moved) (BamfView *view, BamfView *child);
81
82 /*< private >*/
83 void (*_view_padding1) (void);
84 void (*_view_padding2) (void);
85 void (*_view_padding3) (void);
86 void (*_view_padding4) (void);
87- void (*_view_padding5) (void);
88 };
89
90 GType bamf_view_get_type (void) G_GNUC_CONST;

Subscribers

People subscribed via source and target branches