Merge lp:~cimi/overlay-scrollbar/blacklist-vinagre-unwhitelist-synaptic into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 206
Merged at revision: 208
Proposed branch: lp:~cimi/overlay-scrollbar/blacklist-vinagre-unwhitelist-synaptic
Merge into: lp:overlay-scrollbar
Diff against target: 20 lines (+1/-2)
1 file modified
os/os-utils.c (+1/-2)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/blacklist-vinagre-unwhitelist-synaptic
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+57355@code.launchpad.net

Description of the change

blacklist vinagre un-whitelist synaptic

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

Is there a bug for the synaptic change? It's fine, but if there is one make sure it gets attached as well.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-utils.c'
2--- os/os-utils.c 2011-03-23 15:42:09 +0000
3+++ os/os-utils.c 2011-04-12 16:22:53 +0000
4@@ -33,7 +33,7 @@
5 {
6 /* Black-list of program names retrieved with g_get_prgname(). */
7 static const gchar *const blacklist[] = {
8- "Fill me with blacklisted programs"
9+ "vinagre"
10 };
11
12 gint32 i;
13@@ -91,7 +91,6 @@
14 "palimpsest",
15 "rhythmbox",
16 "shotwell",
17- "synaptic",
18 "Tomboy",
19 "totem",
20 "ubuntuone-control-panel-gtk",

Subscribers

People subscribed via source and target branches