Merge lp:~ayatana-scrollbar-team/overlay-scrollbar/not-reinitialized-null-variables-at-init into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 346
Merged at revision: 347
Proposed branch: lp:~ayatana-scrollbar-team/overlay-scrollbar/not-reinitialized-null-variables-at-init
Merge into: lp:overlay-scrollbar
Diff against target: 49 lines (+0/-18)
3 files modified
os/os-animation.c (+0/-2)
os/os-bar.c (+0/-4)
os/os-thumb.c (+0/-12)
To merge this branch: bzr merge lp:~ayatana-scrollbar-team/overlay-scrollbar/not-reinitialized-null-variables-at-init
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+104791@code.launchpad.net

Description of the change

it's not necessary to reinitialize variables to 0 or null values, glib does that.

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

Fine, I prefer being explicit, but I don't care.

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-10-05 12:24:21 +0000
3+++ os/os-animation.c 2012-05-04 18:33:18 +0000
4@@ -64,8 +64,6 @@
5 OS_TYPE_ANIMATION,
6 OsAnimationPrivate);
7 priv = animation->priv;
8-
9- priv->source_id = 0;
10 }
11
12 static void
13
14=== modified file 'os/os-bar.c'
15--- os/os-bar.c 2012-03-06 13:40:06 +0000
16+++ os/os-bar.c 2012-05-04 18:33:18 +0000
17@@ -325,10 +325,6 @@
18 priv->bar_mask = mask;
19 priv->tail_mask = mask;
20
21- priv->active = FALSE;
22- priv->detached = FALSE;
23- priv->visible = FALSE;
24-
25 priv->weight = 1.0f;
26
27 priv->state_animation = os_animation_new (RATE_ANIMATION, DURATION_FADE_OUT,
28
29=== modified file 'os/os-thumb.c'
30--- os/os-thumb.c 2012-03-21 13:12:10 +0000
31+++ os/os-thumb.c 2012-05-04 18:33:18 +0000
32@@ -185,18 +185,6 @@
33 OsThumbPrivate);
34 priv = thumb->priv;
35
36- priv->event = OS_EVENT_NONE;
37-
38- priv->pointer.x = 0;
39- priv->pointer.y = 0;
40- priv->pointer_root.x = 0;
41- priv->pointer_root.y = 0;
42-
43- priv->rgba = FALSE;
44- priv->detached = FALSE;
45- priv->tolerance = FALSE;
46-
47- priv->source_id = 0;
48 priv->animation = os_animation_new (RATE_ANIMATION, DURATION_FADE_OUT,
49 fade_out_cb, NULL, thumb);
50

Subscribers

People subscribed via source and target branches