overlay-scrollbar

Merge lp:~ayatana-scrollbar-team/overlay-scrollbar/blacklist_prefix into lp:overlay-scrollbar

  1. blacklist_prefix
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Ted Gould
Approved revision: 355
Merged at revision: 356
Proposed branch: lp:~ayatana-scrollbar-team/overlay-scrollbar/blacklist_prefix
Merge into: lp:overlay-scrollbar
Diff against target: 51 lines (+10/-10)
1 file modified
os/os-scrollbar.c (+10/-10)
To merge this branch: bzr merge lp:~ayatana-scrollbar-team/overlay-scrollbar/blacklist_prefix
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+121893@code.launchpad.net

Description of the change

Use prefixes in the blacklist

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve
lp:~ayatana-scrollbar-team/overlay-scrollbar/blacklist_prefix updated
356. By Andrea Cimitan

Oops ^2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2012-08-09 14:11:35 +0000
3+++ os/os-scrollbar.c 2012-08-29 16:12:17 +0000
4@@ -3927,30 +3927,27 @@
5 static const gchar *blacklist[] = {
6 "acroread", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/876218 */
7 "eclipse", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/769277 */
8- "emacs", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847940 */
9- "emacs23", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847940 */
10- "firefox", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
11- "firefox-bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
12- "firefox-trunk", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
13- "gimp", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
14- "gimp-2.6", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
15- "gimp-2.7", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
16- "gimp-2.8", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
17 "gnucash", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770304 */
18 "gvim", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847943 */
19 "notes.bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/890986 */
20 "soffice", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847918 */
21 "synaptic", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/755238 */
22- "thunderbird-bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847929 */
23 "vinagre", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847932 */
24 "vmplayer", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770625 */
25 "vmware"/* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770625 */
26 };
27+ static const gchar *blacklist_prefix[] = {
28+ "emacs", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847940 */
29+ "firefox", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
30+ "gimp", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
31+ "thunderbird", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847929 */
32+ };
33
34 GModule *module;
35 gpointer func;
36 gint32 i;
37 const gint32 nr_programs = G_N_ELEMENTS (blacklist);
38+ const gint32 nr_programs_prefix = G_N_ELEMENTS (blacklist_prefix);
39 const gchar *prgname;
40 const gchar *flag;
41
42@@ -3983,6 +3980,9 @@
43 for (i = 0; i < nr_programs; i++)
44 if (g_strcmp0 (blacklist[i], prgname) == 0)
45 return TRUE;
46+ for (i = 0; i < nr_programs_prefix; i++)
47+ if (g_str_has_prefix (prgname, blacklist_prefix[i]))
48+ return TRUE;
49
50 return FALSE;
51 }

Subscribers

People subscribed via source and target branches