Fix crash on app list start page contents not existing.
[chromium-blink-merge.git] / third_party / instrumented_libraries / patches / libgtk2.0-0.precise.diff
blob75f4f64206594e3015b6c7f94a9e3f5950c0f76b
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
3 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c 2015-02-09 21:52:59.213636172 +0300
4 @@ -751,6 +751,10 @@ _overlay_scrollbar_init (void)
5 GModule *module = NULL;
6 gpointer symbol = NULL;
8 + /* Chrome doesn't use overlay-scrollbar anyway. By disabling it here, we avoid
9 + * having to build it. */
10 + return;
12 gchar *flag = (gchar*) g_getenv ("LIBOVERLAY_SCROLLBAR");
14 /* check if LIBOVERLAY_SCROLLBAR is set to 0 or an empty value
15 diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h
16 --- ./gtk/gtkmenushell.h 2011-08-16 06:30:52.000000000 +0400
17 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 2015-02-09 21:49:49.052032041 +0300
18 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic
19 void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,
20 gboolean keyboard_mode);
21 gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);
23 +// https://bugs.launchpad.net/bugs/945135
24 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, GtkWidget *item);
25 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboolean search_sensitive);
26 G_END_DECLS
28 #endif /* __GTK_MENU_SHELL_H__ */