[evolution] Revert "Bug 766773 - Set CSS names on some custom widget classes"



commit 73515a7c74af348a6a7693d786f0ea72cb2c6a81
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jul 11 14:30:05 2016 +0200

    Revert "Bug 766773 - Set CSS names on some custom widget classes"
    
    This reverts commit 47d194733820180454380ca28d6e07b4a2c8043c.
    
    Oops, incorrect testing of the changes. This change causes even uglier
    Evolution, thus rather revert it.

 addressbook/gui/widgets/e-addressbook-view.c     |    4 ---
 addressbook/gui/widgets/e-minicard-view-widget.c |    4 ---
 calendar/gui/e-cal-list-view.c                   |   11 +++-----
 calendar/gui/e-calendar-view.c                   |    4 ---
 calendar/gui/e-comp-editor-page-attachments.c    |    4 ---
 calendar/gui/e-comp-editor.c                     |    4 ---
 calendar/gui/e-day-view.c                        |    4 ---
 calendar/gui/e-meeting-time-sel.c                |    4 ---
 calendar/gui/e-memo-table.c                      |    4 ---
 calendar/gui/e-task-table.c                      |    4 ---
 calendar/gui/e-timezone-entry.c                  |    4 ---
 calendar/gui/e-week-view.c                       |    4 ---
 calendar/gui/e-weekday-chooser.c                 |    4 ---
 composer/e-msg-composer.c                        |    4 ---
 e-util/e-alert-bar.c                             |    4 ---
 e-util/e-attachment-bar.c                        |    4 ---
 e-util/e-attachment-button.c                     |    4 ---
 e-util/e-attachment-dialog.c                     |    4 ---
 e-util/e-attachment-icon-view.c                  |    4 ---
 e-util/e-attachment-paned.c                      |    4 ---
 e-util/e-attachment-tree-view.c                  |    4 ---
 e-util/e-calendar.c                              |    8 +----
 e-util/e-canvas.c                                |    4 ---
 e-util/e-color-combo.c                           |    4 ---
 e-util/e-dateedit.c                              |    4 ---
 e-util/e-emoticon-tool-button.c                  |    4 ---
 e-util/e-html-editor-cell-dialog.c               |    4 ---
 e-util/e-html-editor-dialog.c                    |    4 ---
 e-util/e-html-editor-find-dialog.c               |    4 ---
 e-util/e-html-editor-hrule-dialog.c              |    4 ---
 e-util/e-html-editor-image-dialog.c              |    4 ---
 e-util/e-html-editor-link-dialog.c               |    4 ---
 e-util/e-html-editor-page-dialog.c               |    4 ---
 e-util/e-html-editor-replace-dialog.c            |    4 ---
 e-util/e-html-editor-spell-check-dialog.c        |    4 ---
 e-util/e-html-editor-table-dialog.c              |    4 ---
 e-util/e-html-editor-text-dialog.c               |    4 ---
 e-util/e-html-editor-view.c                      |    4 ---
 e-util/e-html-editor.c                           |    4 ---
 e-util/e-import-assistant.c                      |    4 ---
 e-util/e-map.c                                   |    4 ---
 e-util/e-name-selector-dialog.c                  |    4 ---
 e-util/e-name-selector-entry.c                   |    4 ---
 e-util/e-name-selector-list.c                    |    4 ---
 e-util/e-paned.c                                 |    4 ---
 e-util/e-port-entry.c                            |    4 ---
 e-util/e-preferences-window.c                    |    4 ---
 e-util/e-preview-pane.c                          |    4 ---
 e-util/e-search-bar.c                            |    4 ---
 e-util/e-source-config.c                         |    4 ---
 e-util/e-source-selector.c                       |    4 ---
 e-util/e-spell-entry.c                           |    4 ---
 e-util/e-spinner.c                               |    4 ---
 e-util/e-table.c                                 |   10 +++----
 e-util/e-tree.c                                  |    4 ---
 e-util/e-web-view.c                              |    4 ---
 libgnomecanvas/gnome-canvas.c                    |    9 ++----
 mail/e-mail-account-tree-view.c                  |    4 ---
 mail/e-mail-browser.c                            |    4 ---
 mail/e-mail-config-assistant.c                   |    4 ---
 mail/e-mail-display.c                            |    4 ---
 mail/e-mail-junk-options.c                       |    4 ---
 mail/e-mail-tag-editor.c                         |    4 ---
 mail/em-folder-tree.c                            |    4 ---
 mail/em-subscription-editor.c                    |    4 ---
 modules/calendar/e-cal-base-shell-content.c      |    4 ---
 modules/calendar/e-cal-base-shell-sidebar.c      |    4 ---
 modules/calendar/e-cal-base-shell-view.c         |    4 ---
 modules/calendar/e-cal-shell-content.c           |    4 ---
 modules/mail/e-mail-shell-sidebar.c              |    4 ---
 modules/mail/em-account-prefs.c                  |    4 ---
 shell/e-shell-content.c                          |    4 ---
 shell/e-shell-searchbar.c                        |    4 ---
 shell/e-shell-sidebar.c                          |    4 ---
 shell/e-shell-switcher.c                         |    4 ---
 shell/e-shell-taskbar.c                          |    4 ---
 shell/e-shell-window.c                           |   31 ----------------------
 77 files changed, 13 insertions(+), 344 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index e870945..463e49f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -815,10 +815,6 @@ e_addressbook_view_class_init (EAddressbookViewClass *class)
        object_class->dispose = addressbook_view_dispose;
        object_class->constructed = addressbook_view_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        /* Inherited from ESelectableInterface */
        g_object_class_override_property (
                object_class,
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c 
b/addressbook/gui/widgets/e-minicard-view-widget.c
index 25e7186..4ed6161 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -94,10 +94,6 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
        widget_class->size_allocate = e_minicard_view_widget_size_allocate;
        widget_class->focus_in_event = e_minicard_view_widget_real_focus_in_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        canvas_class = E_CANVAS_CLASS (class);
        canvas_class->reflow = e_minicard_view_widget_reflow;
 
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index cd23ddc..1cbd114 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -90,19 +90,16 @@ e_cal_list_view_class_init (ECalListViewClass *class)
        GtkWidgetClass *widget_class;
        ECalendarViewClass *view_class;
 
+       object_class = (GObjectClass *) class;
+       widget_class = (GtkWidgetClass *) class;
+       view_class = (ECalendarViewClass *) class;
+
        /* Method override */
-       object_class = G_OBJECT_CLASS (class);
        object_class->dispose = e_cal_list_view_dispose;
        object_class->get_property = e_cal_list_view_get_property;
 
-       widget_class = GTK_WIDGET_CLASS (class);
        widget_class->popup_menu = e_cal_list_view_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
-       view_class = E_CALENDAR_VIEW_CLASS (class);
        view_class->get_selected_events = e_cal_list_view_get_selected_events;
        view_class->get_selected_time_range = e_cal_list_view_get_selected_time_range;
        view_class->get_visible_time_range = e_cal_list_view_get_visible_time_range;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index aa4d837..539e4d4 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1220,10 +1220,6 @@ e_calendar_view_class_init (ECalendarViewClass *class)
        /* init the accessibility support for e_day_view */
        widget_class = GTK_WIDGET_CLASS (class);
        gtk_widget_class_set_accessible_type (widget_class, EA_TYPE_CAL_VIEW);
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/calendar/gui/e-comp-editor-page-attachments.c b/calendar/gui/e-comp-editor-page-attachments.c
index 033dfe8..776f3a2 100644
--- a/calendar/gui/e-comp-editor-page-attachments.c
+++ b/calendar/gui/e-comp-editor-page-attachments.c
@@ -875,10 +875,6 @@ e_comp_editor_page_attachments_class_init (ECompEditorPageAttachmentsClass *klas
        widget_class->drag_motion = ecep_attachments_drag_motion;
        widget_class->drag_data_received = ecep_attachments_drag_data_received;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (klass));
-       #endif
-
        object_class = G_OBJECT_CLASS (klass);
        object_class->set_property = ecep_attachments_set_property;
        object_class->get_property = ecep_attachments_get_property;
diff --git a/calendar/gui/e-comp-editor.c b/calendar/gui/e-comp-editor.c
index 88dbdc2..e58a78d 100644
--- a/calendar/gui/e-comp-editor.c
+++ b/calendar/gui/e-comp-editor.c
@@ -2377,10 +2377,6 @@ e_comp_editor_class_init (ECompEditorClass *klass)
        widget_class->delete_event = comp_editor_delete_event;
        widget_class->key_press_event = comp_editor_key_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (klass));
-       #endif
-
        object_class = G_OBJECT_CLASS (klass);
        object_class->set_property = e_comp_editor_set_property;
        object_class->get_property = e_comp_editor_get_property;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 7153ac9..555319a 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1991,10 +1991,6 @@ e_day_view_class_init (EDayViewClass *class)
        widget_class->focus_out_event = day_view_focus_out;
        widget_class->popup_menu = day_view_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        view_class = E_CALENDAR_VIEW_CLASS (class);
        view_class->get_selected_events = day_view_get_selected_events;
        view_class->get_selected_time_range = day_view_get_selected_time_range;
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 8b10231..bd8a4bc 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -293,10 +293,6 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass *class)
        widget_class->style_updated = e_meeting_time_selector_style_updated;
        widget_class->draw = e_meeting_time_selector_draw;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_USE_24_HOUR_FORMAT,
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 3553a3e..f4309ee 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -967,10 +967,6 @@ e_memo_table_class_init (EMemoTableClass *class)
        widget_class->popup_menu = memo_table_popup_menu;
        widget_class->query_tooltip = memo_table_query_tooltip;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        table_class = E_TABLE_CLASS (class);
        table_class->double_click = memo_table_double_click;
        table_class->right_click = memo_table_right_click;
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 21c472b..2216e06 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -1351,10 +1351,6 @@ e_task_table_class_init (ETaskTableClass *class)
        widget_class->popup_menu = task_table_popup_menu;
        widget_class->query_tooltip = task_table_query_tooltip;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        table_class = E_TABLE_CLASS (class);
        table_class->double_click = task_table_double_click;
        table_class->right_click = task_table_right_click;
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 7338f43..3dd84b5 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -281,10 +281,6 @@ e_timezone_entry_class_init (ETimezoneEntryClass *class)
        widget_class->mnemonic_activate = timezone_entry_mnemonic_activate;
        widget_class->focus = timezone_entry_focus;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_TIMEZONE,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 53ea644..ec9b695 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1615,10 +1615,6 @@ e_week_view_class_init (EWeekViewClass *class)
        widget_class->focus = week_view_focus;
        widget_class->popup_menu = week_view_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        view_class = E_CALENDAR_VIEW_CLASS (class);
        view_class->get_selected_events = week_view_get_selected_events;
        view_class->get_selected_time_range = week_view_get_selected_time_range;
diff --git a/calendar/gui/e-weekday-chooser.c b/calendar/gui/e-weekday-chooser.c
index 8db071e..3e4d1b7 100644
--- a/calendar/gui/e-weekday-chooser.c
+++ b/calendar/gui/e-weekday-chooser.c
@@ -370,10 +370,6 @@ e_weekday_chooser_class_init (EWeekdayChooserClass *class)
        widget_class->get_preferred_width = weekday_chooser_get_preferred_width;
        widget_class->focus = weekday_chooser_focus;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_WEEK_START_DAY,
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index dd50ef0..d60b412 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2944,10 +2944,6 @@ e_msg_composer_class_init (EMsgComposerClass *class)
        widget_class->map = msg_composer_map;
        widget_class->key_press_event = msg_composer_key_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->presend = msg_composer_presend;
 
        g_object_class_install_property (
diff --git a/e-util/e-alert-bar.c b/e-util/e-alert-bar.c
index 754fd49..56cdf21 100644
--- a/e-util/e-alert-bar.c
+++ b/e-util/e-alert-bar.c
@@ -347,10 +347,6 @@ e_alert_bar_class_init (EAlertBarClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->get_request_mode = alert_bar_get_request_mode;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        info_bar_class = GTK_INFO_BAR_CLASS (class);
        info_bar_class->close = alert_bar_close;
 }
diff --git a/e-util/e-attachment-bar.c b/e-util/e-attachment-bar.c
index 29ae55a..3916d00 100644
--- a/e-util/e-attachment-bar.c
+++ b/e-util/e-attachment-bar.c
@@ -534,10 +534,6 @@ e_attachment_bar_class_init (EAttachmentBarClass *class)
        widget_class->button_release_event = attachment_bar_button_release_event;
        widget_class->motion_notify_event = attachment_bar_motion_notify_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_ACTIVE_VIEW,
diff --git a/e-util/e-attachment-button.c b/e-util/e-attachment-button.c
index 54197ef..090b619 100644
--- a/e-util/e-attachment-button.c
+++ b/e-util/e-attachment-button.c
@@ -525,10 +525,6 @@ e_attachment_button_class_init (EAttachmentButtonClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->style_updated = attachment_button_style_updated;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_ATTACHMENT,
diff --git a/e-util/e-attachment-dialog.c b/e-util/e-attachment-dialog.c
index 9ce7045..0f71bc9 100644
--- a/e-util/e-attachment-dialog.c
+++ b/e-util/e-attachment-dialog.c
@@ -284,10 +284,6 @@ e_attachment_dialog_class_init (EAttachmentDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->map = attachment_dialog_map;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        dialog_class = GTK_DIALOG_CLASS (class);
        dialog_class->response = attachment_dialog_response;
 
diff --git a/e-util/e-attachment-icon-view.c b/e-util/e-attachment-icon-view.c
index 8952fef..cd0bc52 100644
--- a/e-util/e-attachment-icon-view.c
+++ b/e-util/e-attachment-icon-view.c
@@ -532,10 +532,6 @@ e_attachment_icon_view_class_init (EAttachmentIconViewClass *class)
        widget_class->drag_data_received = attachment_icon_view_drag_data_received;
        widget_class->popup_menu = attachment_icon_view_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        icon_view_class = GTK_ICON_VIEW_CLASS (class);
        icon_view_class->item_activated = attachment_icon_view_item_activated;
 
diff --git a/e-util/e-attachment-paned.c b/e-util/e-attachment-paned.c
index 3152be2..ee96a9a 100644
--- a/e-util/e-attachment-paned.c
+++ b/e-util/e-attachment-paned.c
@@ -561,10 +561,6 @@ e_attachment_paned_class_init (EAttachmentPanedClass *class)
        object_class->dispose = attachment_paned_dispose;
        object_class->constructed = attachment_paned_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_ACTIVE_VIEW,
diff --git a/e-util/e-attachment-tree-view.c b/e-util/e-attachment-tree-view.c
index 940a112..9f20a7d 100644
--- a/e-util/e-attachment-tree-view.c
+++ b/e-util/e-attachment-tree-view.c
@@ -592,10 +592,6 @@ e_attachment_tree_view_class_init (EAttachmentTreeViewClass *class)
        widget_class->drag_data_received = attachment_tree_view_drag_data_received;
        widget_class->popup_menu = attachment_tree_view_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        tree_view_class = GTK_TREE_VIEW_CLASS (class);
        tree_view_class->row_activated = attachment_tree_view_row_activated;
 
diff --git a/e-util/e-calendar.c b/e-util/e-calendar.c
index 2c2107a..f429ec0 100644
--- a/e-util/e-calendar.c
+++ b/e-util/e-calendar.c
@@ -200,10 +200,10 @@ e_calendar_class_init (ECalendarClass *class)
 
        g_type_class_add_private (class, sizeof (ECalendarPrivate));
 
-       object_class = G_OBJECT_CLASS (class);
+       object_class = (GObjectClass *) class;
        object_class->dispose = e_calendar_dispose;
 
-       widget_class = GTK_WIDGET_CLASS (class);
+       widget_class = (GtkWidgetClass *) class;
        widget_class->realize = e_calendar_realize;
        widget_class->style_updated = e_calendar_style_updated;
        widget_class->get_preferred_width = e_calendar_get_preferred_width;
@@ -212,10 +212,6 @@ e_calendar_class_init (ECalendarClass *class)
        widget_class->drag_motion = e_calendar_drag_motion;
        widget_class->drag_leave = e_calendar_drag_leave;
        widget_class->focus = e_calendar_focus;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-canvas.c b/e-util/e-canvas.c
index c4ddd0e..f9f6b14 100644
--- a/e-util/e-canvas.c
+++ b/e-util/e-canvas.c
@@ -611,10 +611,6 @@ e_canvas_class_init (ECanvasClass *class)
        widget_class->focus_in_event = canvas_focus_in_event;
        widget_class->focus_out_event = canvas_focus_out_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->reflow = canvas_reflow;
 
        signals[REFLOW] = g_signal_new (
diff --git a/e-util/e-color-combo.c b/e-util/e-color-combo.c
index 76fef68..3a9c051 100644
--- a/e-util/e-color-combo.c
+++ b/e-util/e-color-combo.c
@@ -610,10 +610,6 @@ e_color_combo_class_init (EColorComboClass *class)
        widget_class->get_preferred_width = color_combo_get_preferred_width;
        widget_class->button_press_event = color_combo_button_press_event_cb;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->popup = color_combo_popup;
        class->popdown = color_combo_popdown;
 
diff --git a/e-util/e-dateedit.c b/e-util/e-dateedit.c
index 4ed2987..6b08132 100644
--- a/e-util/e-dateedit.c
+++ b/e-util/e-dateedit.c
@@ -379,10 +379,6 @@ e_date_edit_class_init (EDateEditClass *class)
        widget_class->mnemonic_activate = e_date_edit_mnemonic_activate;
        widget_class->grab_focus = e_date_edit_grab_focus;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_ALLOW_NO_DATE_SET,
diff --git a/e-util/e-emoticon-tool-button.c b/e-util/e-emoticon-tool-button.c
index 85ea1ff..0b10133 100644
--- a/e-util/e-emoticon-tool-button.c
+++ b/e-util/e-emoticon-tool-button.c
@@ -498,10 +498,6 @@ e_emoticon_tool_button_class_init (EEmoticonToolButtonClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->button_press_event = emoticon_tool_button_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        toggle_tool_button_class = GTK_TOGGLE_TOOL_BUTTON_CLASS (class);
        toggle_tool_button_class->toggled = emoticon_tool_button_toggled;
 
diff --git a/e-util/e-html-editor-cell-dialog.c b/e-util/e-html-editor-cell-dialog.c
index dcd0ebb..0ee0da2 100644
--- a/e-util/e-html-editor-cell-dialog.c
+++ b/e-util/e-html-editor-cell-dialog.c
@@ -679,10 +679,6 @@ e_html_editor_cell_dialog_class_init (EHTMLEditorCellDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_cell_dialog_show;
        widget_class->hide = html_editor_cell_dialog_hide;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-dialog.c b/e-util/e-html-editor-dialog.c
index ae67f99..b62e4ac 100644
--- a/e-util/e-html-editor-dialog.c
+++ b/e-util/e-html-editor-dialog.c
@@ -149,10 +149,6 @@ e_html_editor_dialog_class_init (EHTMLEditorDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_dialog_show;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_EDITOR,
diff --git a/e-util/e-html-editor-find-dialog.c b/e-util/e-html-editor-find-dialog.c
index 95030db..6fe61cf 100644
--- a/e-util/e-html-editor-find-dialog.c
+++ b/e-util/e-html-editor-find-dialog.c
@@ -133,10 +133,6 @@ e_html_editor_find_dialog_class_init (EHTMLEditorFindDialogClass *class)
 
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_find_dialog_show;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-hrule-dialog.c b/e-util/e-html-editor-hrule-dialog.c
index b5c5d22..bb92276 100644
--- a/e-util/e-html-editor-hrule-dialog.c
+++ b/e-util/e-html-editor-hrule-dialog.c
@@ -331,10 +331,6 @@ e_html_editor_hrule_dialog_class_init (EHTMLEditorHRuleDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_hrule_dialog_show;
        widget_class->hide = html_editor_hrule_dialog_hide;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-image-dialog.c b/e-util/e-html-editor-image-dialog.c
index cac4815..5eb7909 100644
--- a/e-util/e-html-editor-image-dialog.c
+++ b/e-util/e-html-editor-image-dialog.c
@@ -507,10 +507,6 @@ e_html_editor_image_dialog_class_init (EHTMLEditorImageDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_image_dialog_show;
        widget_class->hide = html_editor_image_dialog_hide;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-link-dialog.c b/e-util/e-html-editor-link-dialog.c
index f711305..78bc97d 100644
--- a/e-util/e-html-editor-link-dialog.c
+++ b/e-util/e-html-editor-link-dialog.c
@@ -373,10 +373,6 @@ e_html_editor_link_dialog_class_init (EHTMLEditorLinkDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_link_dialog_show;
        widget_class->hide = html_editor_link_dialog_hide;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-page-dialog.c b/e-util/e-html-editor-page-dialog.c
index 206495d..9033ff3 100644
--- a/e-util/e-html-editor-page-dialog.c
+++ b/e-util/e-html-editor-page-dialog.c
@@ -525,10 +525,6 @@ e_html_editor_page_dialog_class_init (EHTMLEditorPageDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_page_dialog_show;
        widget_class->hide = html_editor_page_dialog_hide;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-replace-dialog.c b/e-util/e-html-editor-replace-dialog.c
index 568d723..d21bef2 100644
--- a/e-util/e-html-editor-replace-dialog.c
+++ b/e-util/e-html-editor-replace-dialog.c
@@ -204,10 +204,6 @@ e_html_editor_replace_dialog_class_init (EHTMLEditorReplaceDialogClass *class)
 
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_replace_dialog_show;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-spell-check-dialog.c b/e-util/e-html-editor-spell-check-dialog.c
index da64c19..5d83ec2 100644
--- a/e-util/e-html-editor-spell-check-dialog.c
+++ b/e-util/e-html-editor-spell-check-dialog.c
@@ -502,10 +502,6 @@ e_html_editor_spell_check_dialog_class_init (EHTMLEditorSpellCheckDialogClass *c
 
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_spell_check_dialog_show;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-table-dialog.c b/e-util/e-html-editor-table-dialog.c
index 0041818..f7155d6 100644
--- a/e-util/e-html-editor-table-dialog.c
+++ b/e-util/e-html-editor-table-dialog.c
@@ -747,10 +747,6 @@ e_html_editor_table_dialog_class_init (EHTMLEditorTableDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_table_dialog_show;
        widget_class->hide = html_editor_table_dialog_hide;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-text-dialog.c b/e-util/e-html-editor-text-dialog.c
index 7209ce9..9edb8e5 100644
--- a/e-util/e-html-editor-text-dialog.c
+++ b/e-util/e-html-editor-text-dialog.c
@@ -195,10 +195,6 @@ e_html_editor_text_dialog_class_init (EHTMLEditorTextDialogClass *class)
 
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = html_editor_text_dialog_show;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 568e5b1..c167fa2 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -6312,10 +6312,6 @@ e_html_editor_view_class_init (EHTMLEditorViewClass *class)
        widget_class->button_release_event = html_editor_view_button_release_event;
        widget_class->key_press_event = html_editor_view_key_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->paste_clipboard_quoted = html_editor_view_paste_clipboard_quoted;
 
        /**
diff --git a/e-util/e-html-editor.c b/e-util/e-html-editor.c
index 2914ba5..90c8069 100644
--- a/e-util/e-html-editor.c
+++ b/e-util/e-html-editor.c
@@ -855,10 +855,6 @@ e_html_editor_class_init (EHTMLEditorClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->parent_set = html_editor_parent_changed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->update_actions = html_editor_update_actions;
        class->spell_languages_changed = html_editor_spell_languages_changed;
 
diff --git a/e-util/e-import-assistant.c b/e-util/e-import-assistant.c
index bb6bf3e..d028312 100644
--- a/e-util/e-import-assistant.c
+++ b/e-util/e-import-assistant.c
@@ -1248,10 +1248,6 @@ e_import_assistant_class_init (EImportAssistantClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->key_press_event = import_assistant_key_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        assistant_class = GTK_ASSISTANT_CLASS (class);
        assistant_class->prepare = import_assistant_prepare;
 
diff --git a/e-util/e-map.c b/e-util/e-map.c
index d16c397..1b3d51a 100644
--- a/e-util/e-map.c
+++ b/e-util/e-map.c
@@ -835,10 +835,6 @@ e_map_class_init (EMapClass *class)
        widget_class->button_release_event = e_map_button_release;
        widget_class->motion_notify_event = e_map_motion;
        widget_class->key_press_event = e_map_key_press;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c
index e620512..d776190 100644
--- a/e-util/e-name-selector-dialog.c
+++ b/e-util/e-name-selector-dialog.c
@@ -615,10 +615,6 @@ e_name_selector_dialog_class_init (ENameSelectorDialogClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->realize = name_selector_dialog_realize;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        /**
         * ENameSelectorDialog:client-cache:
         *
diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c
index 88a810c..94b92a5 100644
--- a/e-util/e-name-selector-entry.c
+++ b/e-util/e-name-selector-entry.c
@@ -330,10 +330,6 @@ e_name_selector_entry_class_init (ENameSelectorEntryClass *class)
        widget_class->realize = name_selector_entry_realize;
        widget_class->drag_data_received = name_selector_entry_drag_data_received;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        /**
         * ENameSelectorEntry:client-cache:
         *
diff --git a/e-util/e-name-selector-list.c b/e-util/e-name-selector-list.c
index bc8dbb4..2de7e7f 100644
--- a/e-util/e-name-selector-list.c
+++ b/e-util/e-name-selector-list.c
@@ -703,10 +703,6 @@ e_name_selector_list_class_init (ENameSelectorListClass *class)
 
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->realize = name_selector_list_realize;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-paned.c b/e-util/e-paned.c
index 9219031..b4a0914 100644
--- a/e-util/e-paned.c
+++ b/e-util/e-paned.c
@@ -322,10 +322,6 @@ e_paned_class_init (EPanedClass *class)
        widget_class->realize = paned_realize;
        widget_class->size_allocate = paned_size_allocate;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_HPOSITION,
diff --git a/e-util/e-port-entry.c b/e-util/e-port-entry.c
index 10f2793..e0925d0 100644
--- a/e-util/e-port-entry.c
+++ b/e-util/e-port-entry.c
@@ -292,10 +292,6 @@ e_port_entry_class_init (EPortEntryClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->get_preferred_width = port_entry_get_preferred_width;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_IS_VALID,
diff --git a/e-util/e-preferences-window.c b/e-util/e-preferences-window.c
index 2de58b3..680140d 100644
--- a/e-util/e-preferences-window.c
+++ b/e-util/e-preferences-window.c
@@ -282,10 +282,6 @@ e_preferences_window_class_init (EPreferencesWindowClass *class)
 
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->show = preferences_window_show;
-
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
 }
 
 static void
diff --git a/e-util/e-preview-pane.c b/e-util/e-preview-pane.c
index 1ef04f5..eeb84bf 100644
--- a/e-util/e-preview-pane.c
+++ b/e-util/e-preview-pane.c
@@ -233,10 +233,6 @@ e_preview_pane_class_init (EPreviewPaneClass *class)
        object_class->dispose = preview_pane_dispose;
        object_class->constructed = preview_pane_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->show_search_bar = preview_pane_show_search_bar;
 
        g_object_class_install_property (
diff --git a/e-util/e-search-bar.c b/e-util/e-search-bar.c
index ffa892d..759956a 100644
--- a/e-util/e-search-bar.c
+++ b/e-util/e-search-bar.c
@@ -481,10 +481,6 @@ e_search_bar_class_init (ESearchBarClass *class)
        widget_class->hide = search_bar_hide;
        widget_class->key_press_event = search_bar_key_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->clear = search_bar_clear;
 
        g_object_class_install_property (
diff --git a/e-util/e-source-config.c b/e-util/e-source-config.c
index 0d60ffb..d53a54e 100644
--- a/e-util/e-source-config.c
+++ b/e-util/e-source-config.c
@@ -877,10 +877,6 @@ e_source_config_class_init (ESourceConfigClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->realize = source_config_realize;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->list_eligible_collections =
                source_config_list_eligible_collections;
        class->init_candidate = source_config_init_candidate;
diff --git a/e-util/e-source-selector.c b/e-util/e-source-selector.c
index c9719cd..a32dc16 100644
--- a/e-util/e-source-selector.c
+++ b/e-util/e-source-selector.c
@@ -1716,10 +1716,6 @@ e_source_selector_class_init (ESourceSelectorClass *class)
        widget_class->drag_data_received = source_selector_drag_data_received;
        widget_class->popup_menu = source_selector_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        tree_view_class = GTK_TREE_VIEW_CLASS (class);
        tree_view_class->test_collapse_row = source_selector_test_collapse_row;
        tree_view_class->row_expanded = source_selector_row_expanded;
diff --git a/e-util/e-spell-entry.c b/e-util/e-spell-entry.c
index f9e464d..b48390c 100644
--- a/e-util/e-spell-entry.c
+++ b/e-util/e-spell-entry.c
@@ -954,10 +954,6 @@ e_spell_entry_class_init (ESpellEntryClass *class)
        widget_class->draw = spell_entry_draw;
        widget_class->button_press_event = spell_entry_button_press;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_CHECKING_ENABLED,
diff --git a/e-util/e-spinner.c b/e-util/e-spinner.c
index 256245f..8a4b972 100644
--- a/e-util/e-spinner.c
+++ b/e-util/e-spinner.c
@@ -241,10 +241,6 @@ e_spinner_class_init (ESpinnerClass *klass)
        widget_class->realize = e_spinner_realize;
        widget_class->unrealize = e_spinner_unrealize;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (klass));
-       #endif
-
        /**
         * ESpinner:active:
         *
diff --git a/e-util/e-table.c b/e-util/e-table.c
index af5cc96..450810a 100644
--- a/e-util/e-table.c
+++ b/e-util/e-table.c
@@ -3196,23 +3196,21 @@ e_table_class_init (ETableClass *class)
        GObjectClass *object_class;
        GtkWidgetClass *widget_class;
 
-       object_class = G_OBJECT_CLASS (class);
+       object_class = (GObjectClass *) class;
+       widget_class = (GtkWidgetClass *) class;
+
        object_class->dispose = et_dispose;
        object_class->finalize = et_finalize;
        object_class->set_property = et_set_property;
        object_class->get_property = et_get_property;
 
-       widget_class = GTK_WIDGET_CLASS (class);
        widget_class->grab_focus = et_grab_focus;
        widget_class->unrealize = et_unrealize;
        widget_class->get_preferred_width = et_get_preferred_width;
        widget_class->get_preferred_height = et_get_preferred_height;
        widget_class->style_updated = et_canvas_style_updated;
-       widget_class->focus = et_focus;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
+       widget_class->focus = et_focus;
 
        class->cursor_change = NULL;
        class->cursor_activated = NULL;
diff --git a/e-util/e-tree.c b/e-util/e-tree.c
index f549919..19f83c5 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -2873,10 +2873,6 @@ e_tree_class_init (ETreeClass *class)
        widget_class->style_updated = et_canvas_style_updated;
        widget_class->focus = et_focus;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->start_drag = et_real_start_drag;
 
        signals[CURSOR_CHANGE] = g_signal_new (
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index 6eaa0f5..42af88f 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -1576,10 +1576,6 @@ e_web_view_class_init (EWebViewClass *class)
        widget_class->map = web_view_map;
        widget_class->unmap = web_view_unmap;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->create_plugin_widget = web_view_create_plugin_widget;
        class->hovering_over_link = web_view_hovering_over_link;
        class->link_clicked = web_view_link_clicked;
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index b90df0f..fecce97 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -1863,12 +1863,13 @@ gnome_canvas_class_init (GnomeCanvasClass *class)
        GObjectClass   *object_class;
        GtkWidgetClass *widget_class;
 
-       object_class = G_OBJECT_CLASS (class);
+       object_class = (GObjectClass *) class;
+       widget_class = (GtkWidgetClass *) class;
+
        object_class->set_property = gnome_canvas_set_property;
        object_class->get_property = gnome_canvas_get_property;
        object_class->dispose = gnome_canvas_dispose;
 
-       widget_class = GTK_WIDGET_CLASS (class);
        widget_class->map = gnome_canvas_map;
        widget_class->unmap = gnome_canvas_unmap;
        widget_class->realize = gnome_canvas_realize;
@@ -1886,10 +1887,6 @@ gnome_canvas_class_init (GnomeCanvasClass *class)
        widget_class->focus_in_event = gnome_canvas_focus_in;
        widget_class->focus_out_event = gnome_canvas_focus_out;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->draw_background = gnome_canvas_draw_background;
        class->request_update = gnome_canvas_request_update_real;
 
diff --git a/mail/e-mail-account-tree-view.c b/mail/e-mail-account-tree-view.c
index 693822e..c7c824e 100644
--- a/mail/e-mail-account-tree-view.c
+++ b/mail/e-mail-account-tree-view.c
@@ -196,10 +196,6 @@ e_mail_account_tree_view_class_init (EMailAccountTreeViewClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->drag_end = mail_account_tree_view_drag_end;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        signals[ENABLE] = g_signal_new (
                "enable",
                G_TYPE_FROM_CLASS (class),
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 26ea3e1..e8115d9 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -986,10 +986,6 @@ e_mail_browser_class_init (EMailBrowserClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->key_press_event = mail_browser_key_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_BACKEND,
diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index 420deeb..3363c21 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -1056,10 +1056,6 @@ e_mail_config_assistant_class_init (EMailConfigAssistantClass *class)
        object_class->finalize = mail_config_assistant_finalize;
        object_class->constructed = mail_config_assistant_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        container_class = GTK_CONTAINER_CLASS (class);
        container_class->remove = mail_config_assistant_remove;
 
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 97a4572..1e475ca 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1881,10 +1881,6 @@ e_mail_display_class_init (EMailDisplayClass *class)
        widget_class->style_updated = mail_display_style_updated;
        widget_class->button_press_event = mail_display_button_press_event;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        web_view_class = E_WEB_VIEW_CLASS (class);
        web_view_class->redirect_uri = mail_display_redirect_uri;
        web_view_class->suggest_filename = mail_display_suggest_filename;
diff --git a/mail/e-mail-junk-options.c b/mail/e-mail-junk-options.c
index a19b104..975bd36 100644
--- a/mail/e-mail-junk-options.c
+++ b/mail/e-mail-junk-options.c
@@ -356,10 +356,6 @@ e_mail_junk_options_class_init (EMailJunkOptionsClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->map = mail_junk_options_map;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_SESSION,
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index fd79468..7414d7e 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -203,10 +203,6 @@ e_mail_tag_editor_class_init (EMailTagEditorClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->realize = mail_tag_editor_realize;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->get_tag_list = mail_tag_editor_get_tag_list;
        class->set_tag_list = mail_tag_editor_set_tag_list;
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index d095fbd..ce5ab9f 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1586,10 +1586,6 @@ em_folder_tree_class_init (EMFolderTreeClass *class)
        widget_class->key_press_event = folder_tree_key_press_event;
        widget_class->popup_menu = folder_tree_popup_menu;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        tree_view_class = GTK_TREE_VIEW_CLASS (class);
        tree_view_class->row_activated = folder_tree_row_activated;
        tree_view_class->test_collapse_row = folder_tree_test_collapse_row;
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index ef71978..934b24e 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -1713,10 +1713,6 @@ em_subscription_editor_class_init (EMSubscriptionEditorClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->realize = subscription_editor_realize;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_SESSION,
diff --git a/modules/calendar/e-cal-base-shell-content.c b/modules/calendar/e-cal-base-shell-content.c
index ddb8c9e..399aa85 100644
--- a/modules/calendar/e-cal-base-shell-content.c
+++ b/modules/calendar/e-cal-base-shell-content.c
@@ -369,10 +369,6 @@ e_cal_base_shell_content_class_init (ECalBaseShellContentClass *class)
        object_class->finalize = cal_base_shell_content_finalize;
        object_class->constructed = cal_base_shell_content_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_DATA_MODEL,
diff --git a/modules/calendar/e-cal-base-shell-sidebar.c b/modules/calendar/e-cal-base-shell-sidebar.c
index 2f011b7..da10449 100644
--- a/modules/calendar/e-cal-base-shell-sidebar.c
+++ b/modules/calendar/e-cal-base-shell-sidebar.c
@@ -851,10 +851,6 @@ e_cal_base_shell_sidebar_class_init (ECalBaseShellSidebarClass *class)
        object_class->dispose = cal_base_shell_sidebar_dispose;
        object_class->finalize = cal_base_shell_sidebar_finalize;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        shell_sidebar_class = E_SHELL_SIDEBAR_CLASS (class);
        shell_sidebar_class->check_state = cal_base_shell_sidebar_check_state;
 
diff --git a/modules/calendar/e-cal-base-shell-view.c b/modules/calendar/e-cal-base-shell-view.c
index b9443f3..8d9a92c 100644
--- a/modules/calendar/e-cal-base-shell-view.c
+++ b/modules/calendar/e-cal-base-shell-view.c
@@ -110,10 +110,6 @@ e_cal_base_shell_view_class_init (ECalBaseShellViewClass *class)
        object_class->dispose = cal_base_shell_view_dispose;
        object_class->constructed = cal_base_shell_view_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->source_type = E_CAL_CLIENT_SOURCE_TYPE_LAST;
 }
 
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 4da74f5..114ab8d 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -1741,10 +1741,6 @@ e_cal_shell_content_class_init (ECalShellContentClass *class)
        object_class->dispose = cal_shell_content_dispose;
        object_class->constructed = cal_shell_content_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        shell_content_class = E_SHELL_CONTENT_CLASS (class);
        shell_content_class->check_state = cal_shell_content_check_state;
        shell_content_class->focus_search_results = cal_shell_content_focus_search_results;
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 1544b02..8638d16 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -324,10 +324,6 @@ e_mail_shell_sidebar_class_init (EMailShellSidebarClass *class)
        widget_class->get_preferred_width = mail_shell_sidebar_get_preferred_width;
        widget_class->get_preferred_height = mail_shell_sidebar_get_preferred_height;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        shell_sidebar_class = E_SHELL_SIDEBAR_CLASS (class);
        shell_sidebar_class->check_state = mail_shell_sidebar_check_state;
 
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 11ead2e..e4f0160 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -205,10 +205,6 @@ em_account_prefs_class_init (EMAccountPrefsClass *class)
        object_class->dispose = account_prefs_dispose;
        object_class->constructed = account_prefs_constructed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), G_OBJECT_CLASS_NAME (class));
-       #endif
-
        account_manager_class = E_MAIL_ACCOUNT_MANAGER_CLASS (class);
        account_manager_class->add_account = account_prefs_add_account;
        account_manager_class->edit_account = account_prefs_edit_account;
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 99baae9..8509668 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -442,10 +442,6 @@ e_shell_content_class_init (EShellContentClass *class)
        widget_class->get_preferred_height = shell_content_get_preferred_height;
        widget_class->size_allocate = shell_content_size_allocate;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        container_class = GTK_CONTAINER_CLASS (class);
        container_class->remove = shell_content_remove;
        container_class->forall = shell_content_forall;
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 1ee79e7..00073a0 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -779,10 +779,6 @@ e_shell_searchbar_class_init (EShellSearchbarClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->map = shell_searchbar_map;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        g_object_class_install_property (
                object_class,
                PROP_FILTER_COMBO_BOX,
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 3774956..1683cf6 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -352,10 +352,6 @@ e_shell_sidebar_class_init (EShellSidebarClass *class)
        widget_class->get_preferred_height = shell_sidebar_get_preferred_height;
        widget_class->size_allocate = shell_sidebar_size_allocate;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        container_class = GTK_CONTAINER_CLASS (class);
        container_class->forall = shell_sidebar_forall;
 
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index e700f0a..a4f0271 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -530,10 +530,6 @@ e_shell_switcher_class_init (EShellSwitcherClass *class)
        widget_class->size_allocate = shell_switcher_size_allocate;
        widget_class->screen_changed = shell_switcher_screen_changed;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        container_class = GTK_CONTAINER_CLASS (class);
        container_class->remove = shell_switcher_remove;
        container_class->forall = shell_switcher_forall;
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 1413cc3..5138478 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -436,10 +436,6 @@ e_shell_taskbar_class_init (EShellTaskbarClass *class)
        widget_class->get_preferred_height = shell_taskbar_get_preferred_height;
        widget_class->get_preferred_width = shell_taskbar_get_preferred_width;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        /**
         * EShellTaskbar:message
         *
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index ce5f165..6d3b3c5 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -81,63 +81,36 @@ static const char *css =
 EMailBrowser EPreviewPane GtkScrolledWindow {\
     border: none;\
 }\
-EMailBrowser EPreviewPane scrolledwindow {\
-    border: none;\
-}\
 EPaned.horizontal EPreviewPane GtkScrolledWindow {\
     border-width: 1px 0 0 0;\
 }\
-EPaned.horizontal EPreviewPane scrolledwindow {\
-    border-width: 1px 0 0 0;\
-}\
 EPaned.vertical EPreviewPane GtkScrolledWindow {\
     border: none;\
 }\
-EPaned.vertical EPreviewPane scrolledwindow {\
-    border: none;\
-}\
 EAddressbookView {\
    border-width: 1px 0 0 0;\
 }\
 ECalShellContent GtkSeparator {\
    color: @borders;\
 }\
-ECalShellContent separator {\
-   color: @borders;\
-}\
 ECalShellContent GtkNotebook {\
    border-width: 1px 0 0 0;\
 }\
-ECalShellContent notebook {\
-   border-width: 1px 0 0 0;\
-}\
 EShellSidebar GtkScrolledWindow {\
    border-width: 1px 0 0 0;\
 }\
-EShellSidebar scrolledwindow {\
-   border-width: 1px 0 0 0;\
-}\
 .switcher-visible EShellSidebar GtkScrolledWindow {\
    border-width: 1px 0;\
 }\
-.switcher-visible EShellSidebar scrolledwindow {\
-   border-width: 1px 0;\
-}\
 .switcher-visible ECalBaseShellSidebar EPaned {\
    -GtkPaned-handle-size: 0;\
 }\
 EMAccountPrefs GtkFrame {\
    border: none;\
 }\
-EMAccountPrefs frame {\
-   border: none;\
-}\
 EAttachmentPaned > GtkBox > GtkPaned > GtkScrolledWindow {\
    border-width: 1px 0;\
 }\
-EAttachmentPaned > box > paned > scrolledwindow {\
-   border-width: 1px 0;\
-}\
 EHTMLEditor .toolbar {\
    border-bottom: none;\
    background: transparent;\
@@ -913,10 +886,6 @@ e_shell_window_class_init (EShellWindowClass *class)
        widget_class = GTK_WIDGET_CLASS (class);
        widget_class->get_preferred_width = shell_window_get_preferred_width;
 
-       #if GTK_CHECK_VERSION (3, 20, 0)
-       gtk_widget_class_set_css_name (widget_class, G_OBJECT_CLASS_NAME (class));
-       #endif
-
        class->close_alert = shell_window_close_alert;
        class->construct_menubar = shell_window_construct_menubar;
        class->construct_toolbar = shell_window_construct_toolbar;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]