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
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c 2012-08-09 14:11:35 +0000
+++ os/os-scrollbar.c 2012-08-29 16:12:17 +0000
@@ -3927,30 +3927,27 @@
3927 static const gchar *blacklist[] = {3927 static const gchar *blacklist[] = {
3928 "acroread", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/876218 */3928 "acroread", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/876218 */
3929 "eclipse", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/769277 */3929 "eclipse", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/769277 */
3930 "emacs", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847940 */
3931 "emacs23", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847940 */
3932 "firefox", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
3933 "firefox-bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
3934 "firefox-trunk", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
3935 "gimp", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
3936 "gimp-2.6", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
3937 "gimp-2.7", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
3938 "gimp-2.8", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
3939 "gnucash", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770304 */3930 "gnucash", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770304 */
3940 "gvim", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847943 */3931 "gvim", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847943 */
3941 "notes.bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/890986 */3932 "notes.bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/890986 */
3942 "soffice", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847918 */3933 "soffice", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847918 */
3943 "synaptic", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/755238 */3934 "synaptic", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/755238 */
3944 "thunderbird-bin", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847929 */
3945 "vinagre", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847932 */3935 "vinagre", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847932 */
3946 "vmplayer", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770625 */3936 "vmplayer", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770625 */
3947 "vmware"/* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770625 */3937 "vmware"/* https://bugs.launchpad.net/ayatana-scrollbar/+bug/770625 */
3948 };3938 };
3939 static const gchar *blacklist_prefix[] = {
3940 "emacs", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847940 */
3941 "firefox", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847922 */
3942 "gimp", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/803163 */
3943 "thunderbird", /* https://bugs.launchpad.net/ayatana-scrollbar/+bug/847929 */
3944 };
39493945
3950 GModule *module;3946 GModule *module;
3951 gpointer func;3947 gpointer func;
3952 gint32 i;3948 gint32 i;
3953 const gint32 nr_programs = G_N_ELEMENTS (blacklist);3949 const gint32 nr_programs = G_N_ELEMENTS (blacklist);
3950 const gint32 nr_programs_prefix = G_N_ELEMENTS (blacklist_prefix);
3954 const gchar *prgname;3951 const gchar *prgname;
3955 const gchar *flag;3952 const gchar *flag;
39563953
@@ -3983,6 +3980,9 @@
3983 for (i = 0; i < nr_programs; i++)3980 for (i = 0; i < nr_programs; i++)
3984 if (g_strcmp0 (blacklist[i], prgname) == 0)3981 if (g_strcmp0 (blacklist[i], prgname) == 0)
3985 return TRUE;3982 return TRUE;
3983 for (i = 0; i < nr_programs_prefix; i++)
3984 if (g_str_has_prefix (prgname, blacklist_prefix[i]))
3985 return TRUE;
39863986
3987 return FALSE;3987 return FALSE;
3988}3988}

Subscribers

People subscribed via source and target branches