From 5bcf04619f76183562f0649c66e7d22a7be5b35e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 8 Mar 2011 07:39:47 -0500 Subject: Bug 644166 - Add style class to primary toolbars Requires GTK+ >= 3.0.2 since GTK_STYLE_CLASS_PRIMARY_TOOLBAR is a very recent addition. --- calendar/gui/dialogs/comp-editor.c | 4 ++++ configure.ac | 2 +- shell/e-shell-window.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 0e4250c7c1..1d6fa36653 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1965,6 +1965,10 @@ comp_editor_init (CompEditor *editor) gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); + gtk_style_context_add_class ( + gtk_widget_get_style_context (widget), + GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + widget = e_attachment_paned_new (); gtk_container_set_border_width (GTK_CONTAINER (widget), 6); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); diff --git a/configure.ac b/configure.ac index cc7a788f70..8d68aca982 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.28]) -m4_define([gtk_minimum_version], [3.0]) +m4_define([gtk_minimum_version], [3.0.2]) m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [3.91.3]) m4_define([gnome_desktop_minimum_version], [2.91.3]) diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 8c0258eb87..1ba075d957 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -414,6 +414,10 @@ shell_window_construct_toolbar (EShellWindow *shell_window) toolbar = e_shell_window_get_managed_widget ( shell_window, "/main-toolbar"); + gtk_style_context_add_class ( + gtk_widget_get_style_context (toolbar), + GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + if (e_shell_get_meego_mode (shell)) gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); -- cgit v1.2.3