Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff

Issue 905703003: Instrumented libraries: drop liboverlay-scrollbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build deps Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 diff -rupN ./gtk/gtkmain.c ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c 1 diff -rupN ./gtk/gtkmain.c ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c
2 --- ./gtk/gtkmain.c 2014-05-29 19:39:07.000000000 +0400 2 --- ./gtk/gtkmain.c 2014-05-29 19:39:07.000000000 +0400
3 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c» 2014-05-29 19:44:00.368263970 +0 400 3 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c» 2015-02-09 21:52:59.213636172 +0 300
4 @@ -759,7 +759,7 @@ _overlay_scrollbar_init (void) 4 @@ -751,6 +751,10 @@ _overlay_scrollbar_init (void)
5 return; 5 GModule *module = NULL;
6 gpointer symbol = NULL;
6 7
7 /* default extension library to use for this release */ 8 + /* Chrome doesn't use overlay-scrollbar anyway. By disabling it here, we avoi d
8 - gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0"; 9 + * having to build it. */
9 + gchar *path = "liboverlay-scrollbar-0.2.so.0"; 10 + return;
11 +
12 gchar *flag = (gchar*) g_getenv ("LIBOVERLAY_SCROLLBAR");
10 13
11 module = g_module_open (path, G_MODULE_BIND_LOCAL); 14 /* check if LIBOVERLAY_SCROLLBAR is set to 0 or an empty value
12 if (module == NULL)
13 diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 15 diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h
14 --- ./gtk/gtkmenushell.h 2011-08-16 06:30:52.000000000 +0400 16 --- ./gtk/gtkmenushell.h 2011-08-16 06:30:52.000000000 +0400
15 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h» 2014-05-29 19:42:28.0294 49496 +0400 17 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h» 2015-02-09 21:49:49.0520 32041 +0300
16 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic 18 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic
17 void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell, 19 void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,
18 gboolean keyboard_mode); 20 gboolean keyboard_mode);
19 gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell); 21 gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);
20 - 22 -
21 +// https://bugs.launchpad.net/bugs/945135 23 +// https://bugs.launchpad.net/bugs/945135
22 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, GtkWidge t *item); 24 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, GtkWidge t *item);
23 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboole an search_sensitive); 25 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboole an search_sensitive);
24 G_END_DECLS 26 G_END_DECLS
25 27
26 #endif /* __GTK_MENU_SHELL_H__ */ 28 #endif /* __GTK_MENU_SHELL_H__ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698