diff options
| author | infirit <[email protected]> | 2014-11-23 13:59:30 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-23 13:59:30 +0100 |
| commit | c0fd2c48d208511bcf7ea2cbe1a6cf16219653df (patch) | |
| tree | 3dff1bde5dca828fae8236f1f6131de41a63f40a | |
| parent | 24e90fe2904ea0783562e64ef6981fc83373604f (diff) | |
| download | mate-panel-c0fd2c48d208511bcf7ea2cbe1a6cf16219653df.tar.bz2 mate-panel-c0fd2c48d208511bcf7ea2cbe1a6cf16219653df.tar.xz | |
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
| -rw-r--r-- | mate-panel/panel-menu-bar.c | 17 |
1 files changed, 1 insertions, 16 deletions
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" |