From c0fd2c48d208511bcf7ea2cbe1a6cf16219653df Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 23 Nov 2014 13:59:30 +0100 Subject: Gtk3: menu-bar: Remove duplicate code in panel_menu_bar_class_init This is also called (correctly per [1]) in panel_menu_bar_init Inspired by gnome-panel commit: 7230bad1c3bf2623d7fe2922422758ce56c95b16 --- mate-panel/panel-menu-bar.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'mate-panel') diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c index 86353bbc..f6ae7682 100644 --- a/mate-panel/panel-menu-bar.c +++ b/mate-panel/panel-menu-bar.c @@ -296,9 +296,6 @@ static void panel_menu_bar_class_init(PanelMenuBarClass* klass) { GObjectClass* gobject_class = (GObjectClass*) klass; GtkWidgetClass* widget_class = (GtkWidgetClass*) klass; -#if GTK_CHECK_VERSION (3, 0, 0) - GtkCssProvider *provider; -#endif gobject_class->get_property = panel_menu_bar_get_property; gobject_class->set_property = panel_menu_bar_set_property; @@ -311,19 +308,7 @@ static void panel_menu_bar_class_init(PanelMenuBarClass* klass) g_object_class_install_property(gobject_class, PROP_ORIENTATION, g_param_spec_enum("orientation", "Orientation", "The PanelMenuBar orientation", PANEL_TYPE_ORIENTATION, PANEL_ORIENTATION_TOP, G_PARAM_READWRITE)); -#if GTK_CHECK_VERSION (3, 0, 0) - provider = gtk_css_provider_new (); - gtk_css_provider_load_from_data (provider, - "PanelMenuBar {\n" - " border-width: 0px;\n" - "}\n", - -1, NULL); - gtk_style_context_add_provider_for_screen (gdk_screen_get_default(), - GTK_STYLE_PROVIDER (provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - - g_object_unref (provider); -#else +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_rc_parse_string ( "style \"panel-menubar-style\"\n" "{\n" -- cgit v1.2.1