Merge lp:~cimi/overlay-scrollbar/coding-style-on-pointers-and-removed-whitelist into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 245
Merged at revision: 246
Proposed branch: lp:~cimi/overlay-scrollbar/coding-style-on-pointers-and-removed-whitelist
Merge into: lp:overlay-scrollbar
Diff against target: 195 lines (+36/-44)
5 files modified
os/os-animation.c (+17/-17)
os/os-log.c (+3/-3)
os/os-private.h (+13/-13)
os/os-utils.c (+2/-8)
os/os-utils.h (+1/-3)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/coding-style-on-pointers-and-removed-whitelist
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+64006@code.launchpad.net

Description of the change

as in the commit message

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-animation.c'
2--- os/os-animation.c 2011-05-18 18:25:13 +0000
3+++ os/os-animation.c 2011-06-09 12:48:00 +0000
4@@ -37,8 +37,8 @@
5 guint32 source_id;
6 };
7
8-static void os_animation_dispose (GObject* object);
9-static void os_animation_finalize (GObject* object);
10+static void os_animation_dispose (GObject *object);
11+static void os_animation_finalize (GObject *object);
12
13 G_DEFINE_TYPE (OsAnimation, os_animation, G_TYPE_OBJECT);
14
15@@ -69,7 +69,7 @@
16 }
17
18 static void
19-os_animation_dispose (GObject* object)
20+os_animation_dispose (GObject *object)
21 {
22 OsAnimation *animation;
23 OsAnimationPrivate *priv;
24@@ -87,7 +87,7 @@
25 }
26
27 static void
28-os_animation_finalize (GObject* object)
29+os_animation_finalize (GObject *object)
30 {
31 G_OBJECT_CLASS (os_animation_parent_class)->finalize (object);
32 }
33@@ -107,14 +107,14 @@
34 * Returns: the pointer to the #OsAnimation
35 */
36 OsAnimation*
37-os_animation_new (gint32 rate,
38- gint32 duration,
39+os_animation_new (gint32 rate,
40+ gint32 duration,
41 OsAnimationUpdateFunc update_func,
42- OsAnimationEndFunc end_func,
43- gpointer user_data)
44+ OsAnimationEndFunc end_func,
45+ gpointer user_data)
46 {
47- OsAnimation* animation;
48- OsAnimationPrivate* priv;
49+ OsAnimation *animation;
50+ OsAnimationPrivate *priv;
51
52 g_return_val_if_fail (rate != 0, NULL);
53 g_return_val_if_fail (duration != 0, NULL);
54@@ -140,10 +140,10 @@
55 * Sets the new duration of the animation
56 **/
57 void
58-os_animation_set_duration (OsAnimation* animation,
59- gint32 duration)
60+os_animation_set_duration (OsAnimation *animation,
61+ gint32 duration)
62 {
63- OsAnimationPrivate* priv;
64+ OsAnimationPrivate *priv;
65
66 g_return_if_fail (animation != NULL);
67 g_return_if_fail (duration != 0);
68@@ -192,9 +192,9 @@
69 * Starts the animation
70 **/
71 void
72-os_animation_start (OsAnimation* animation)
73+os_animation_start (OsAnimation *animation)
74 {
75- OsAnimationPrivate* priv;
76+ OsAnimationPrivate *priv;
77
78 g_return_if_fail (animation != NULL);
79
80@@ -214,9 +214,9 @@
81 * Stops the animation
82 **/
83 void
84-os_animation_stop (OsAnimation* animation)
85+os_animation_stop (OsAnimation *animation)
86 {
87- OsAnimationPrivate* priv;
88+ OsAnimationPrivate *priv;
89
90 g_return_if_fail (animation != NULL);
91
92
93=== modified file 'os/os-log.c'
94--- os/os-log.c 2011-04-05 16:21:15 +0000
95+++ os/os-log.c 2011-06-09 12:48:00 +0000
96@@ -35,10 +35,10 @@
97 /* Public functions. */
98
99 void
100-os_log_message (OsLogLevel level, const gchar* function, const gchar* file,
101- gint32 line, const gchar* format, ...)
102+os_log_message (OsLogLevel level, const gchar *function, const gchar *file,
103+ gint32 line, const gchar *format, ...)
104 {
105- static const gchar* prefix[3] = {
106+ static const gchar *prefix[3] = {
107 "\033[37;01m", /* OS_INFO */
108 "\033[33;01m", /* OS_WARN */
109 "\033[31;01m" /* OS_ERROR */
110
111=== modified file 'os/os-private.h'
112--- os/os-private.h 2011-05-12 23:39:33 +0000
113+++ os/os-private.h 2011-06-09 12:48:00 +0000
114@@ -53,8 +53,8 @@
115 void
116 G_GNUC_NO_INSTRUMENT
117 G_GNUC_PRINTF (5, 6)
118-os_log_message (OsLogLevel level, const gchar* function, const gchar* file,
119- gint32 line, const gchar* format, ...);
120+os_log_message (OsLogLevel level, const gchar *function, const gchar *file,
121+ gint32 line, const gchar *format, ...);
122
123 /* Macro logging a message to stderr using the given level. */
124 #define OS_LOG(level,...) \
125@@ -126,18 +126,18 @@
126
127 GType os_animation_get_type (void);
128
129-OsAnimation* os_animation_new (gint32 rate,
130- gint32 duration,
131+OsAnimation* os_animation_new (gint32 rate,
132+ gint32 duration,
133 OsAnimationUpdateFunc update_func,
134- OsAnimationEndFunc end_func,
135- gpointer user_data);
136-
137-void os_animation_set_duration (OsAnimation* animation,
138- gint32 duration);
139-
140-void os_animation_start (OsAnimation* animation);
141-
142-void os_animation_stop (OsAnimation* animation);
143+ OsAnimationEndFunc end_func,
144+ gpointer user_data);
145+
146+void os_animation_set_duration (OsAnimation *animation,
147+ gint32 duration);
148+
149+void os_animation_start (OsAnimation *animation);
150+
151+void os_animation_stop (OsAnimation *animation);
152
153 /* os-thumb.c */
154
155
156=== modified file 'os/os-utils.c'
157--- os/os-utils.c 2011-06-03 15:45:05 +0000
158+++ os/os-utils.c 2011-06-09 12:48:00 +0000
159@@ -29,10 +29,10 @@
160 /* Public functions. */
161
162 gboolean
163-os_utils_is_blacklisted (const gchar* program)
164+os_utils_is_blacklisted (const gchar *program)
165 {
166 /* Black-list of program names retrieved with g_get_prgname(). */
167- static const gchar *const blacklist[] = {
168+ static const gchar *blacklist[] = {
169 "apport-gtk",
170 "codeblocks",
171 "codelite",
172@@ -75,9 +75,3 @@
173
174 return FALSE;
175 }
176-
177-gboolean
178-os_utils_is_whitelisted (const gchar* program)
179-{
180- return TRUE;
181-}
182
183=== modified file 'os/os-utils.h'
184--- os/os-utils.h 2011-05-19 13:19:14 +0000
185+++ os/os-utils.h 2011-06-09 12:48:00 +0000
186@@ -32,9 +32,7 @@
187
188 G_BEGIN_DECLS
189
190-gboolean os_utils_is_blacklisted (const gchar* program);
191-
192-gboolean os_utils_is_whitelisted (const gchar* program);
193+gboolean os_utils_is_blacklisted (const gchar *program);
194
195 G_END_DECLS
196

Subscribers

People subscribed via source and target branches