From 753c60fc67a0a56a5f119c14ffa54ea9af95c208 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Nov 2010 08:48:33 -0500 Subject: Drop backward-compatibility cruft. --- widgets/misc/e-account-manager.c | 3 --- widgets/misc/e-attachment-button.c | 3 --- widgets/misc/e-attachment-dialog.c | 3 --- widgets/misc/e-attachment-paned.c | 3 --- widgets/misc/e-attachment-view.c | 3 --- widgets/misc/e-buffer-tagger.c | 3 --- widgets/misc/e-calendar-item.c | 3 --- widgets/misc/e-canvas-utils.c | 3 --- widgets/misc/e-canvas-vbox.c | 3 --- widgets/misc/e-cell-renderer-combo.c | 3 --- widgets/misc/e-charset-combo-box.c | 3 --- widgets/misc/e-combo-cell-editable.c | 3 --- widgets/misc/e-dateedit.c | 16 ++-------------- widgets/misc/e-image-chooser.c | 3 --- widgets/misc/e-import-assistant.c | 3 --- widgets/misc/e-map.c | 3 --- widgets/misc/e-preferences-window.c | 3 --- widgets/misc/e-preview-pane.c | 3 --- widgets/misc/e-search-bar.c | 3 --- widgets/misc/e-selection-model.c | 3 --- widgets/misc/e-signature-manager.c | 3 --- widgets/misc/e-signature-script-dialog.c | 3 --- 22 files changed, 2 insertions(+), 77 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-account-manager.c b/widgets/misc/e-account-manager.c index 0c9e464657..d8415f8d3a 100644 --- a/widgets/misc/e-account-manager.c +++ b/widgets/misc/e-account-manager.c @@ -25,9 +25,6 @@ #include #include "e-account-tree-view.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_ACCOUNT_MANAGER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_ACCOUNT_MANAGER, EAccountManagerPrivate)) diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index 19af142ac7..7cadf574f7 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -23,9 +23,6 @@ #include "e-attachment-button.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_ATTACHMENT_BUTTON_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate)) diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index 24fe7b4049..cb504219df 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -306,9 +306,6 @@ e_attachment_dialog_init (EAttachmentDialog *dialog) gtk_window_set_title ( GTK_WINDOW (dialog), _("Attachment Properties")); -#if !GTK_CHECK_VERSION(2,90,7) - g_object_set (dialog, "has-separator", FALSE, NULL); -#endif gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); container = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index f15b871b1c..3158c363d9 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -30,9 +30,6 @@ #include "e-attachment-icon-view.h" #include "e-attachment-tree-view.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_ATTACHMENT_PANED_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate)) diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 8958ad0980..0a3a29aa77 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -33,9 +33,6 @@ #include "e-attachment-handler-image.h" #include "e-attachment-handler-sendto.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - enum { UPDATE_ACTIONS, LAST_SIGNAL diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c index 55a9e34e57..feef06c21e 100644 --- a/widgets/misc/e-buffer-tagger.c +++ b/widgets/misc/e-buffer-tagger.c @@ -29,9 +29,6 @@ #include "e-util/e-util.h" #include "e-buffer-tagger.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - enum EBufferTaggerState { E_BUFFER_TAGGER_STATE_NONE = 0, diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index e34e0d4428..96193894f8 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -38,9 +38,6 @@ #include #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static const gint e_calendar_item_days_in_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index bbf10b60af..fda5cd86e8 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -23,9 +23,6 @@ #include "e-canvas-utils.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - void e_canvas_item_move_absolute (GnomeCanvasItem *item, gdouble dx, gdouble dy) { diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 270c55c27d..ef9e7f043d 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -34,9 +34,6 @@ #include "e-canvas-utils.h" #include "e-canvas-vbox.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_canvas_vbox_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_canvas_vbox_dispose (GObject *object); diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c index 03156f1801..9c2c2883b2 100644 --- a/widgets/misc/e-cell-renderer-combo.c +++ b/widgets/misc/e-cell-renderer-combo.c @@ -27,9 +27,6 @@ #include "e-combo-cell-editable.h" #include "e-cell-renderer-combo.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - enum { PROP_0, PROP_LIST diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c index 5f542a6d48..e2cf06e3d1 100644 --- a/widgets/misc/e-charset-combo-box.c +++ b/widgets/misc/e-charset-combo-box.c @@ -103,9 +103,6 @@ charset_combo_box_run_dialog (ECharsetComboBox *combo_box) dialog = GTK_DIALOG (widget); -#if !GTK_CHECK_VERSION(2,90,7) - g_object_set (dialog, "has-separator", FALSE, NULL); -#endif gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK); gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 613fc7b2f6..f108e71f55 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -25,9 +25,6 @@ #include "e-combo-cell-editable.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - struct _EComboCellEditablePriv { GtkEntry *entry; GtkWidget *popup; diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 098825a321..8aa048cb28 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -43,9 +43,6 @@ #include #include "e-calendar.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_DATE_EDIT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_DATE_EDIT, EDateEditPrivate)) @@ -571,17 +568,8 @@ create_children (EDateEdit *dedit) "widget \"*.e-dateedit-timecombo\" style \"e-dateedit-timecombo-style\""); time_store = gtk_list_store_new (1, G_TYPE_STRING); -#if GTK_CHECK_VERSION(2,23,0) - priv->time_combo = g_object_new ( - GTK_TYPE_COMBO_BOX_TEXT, - "model", time_store, - "has-entry", TRUE, - "entry-text-column", 0, - NULL); -#else - priv->time_combo = gtk_combo_box_entry_new_with_model ( - GTK_TREE_MODEL (time_store), 0); -#endif + priv->time_combo = gtk_combo_box_new_with_model_and_entry ( + GTK_TREE_MODEL (time_store)); g_object_unref (time_store); child = gtk_bin_get_child (GTK_BIN (priv->time_combo)); diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index c01f35b3d7..e9a497f4c4 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -30,9 +30,6 @@ #include "e-util/e-util.h" #include "e-util/e-icon-factory.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_IMAGE_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate)) diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index 9ff1a5c391..55ea1bbc62 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -33,9 +33,6 @@ #include #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_IMPORT_ASSISTANT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_IMPORT_ASSISTANT, EImportAssistantPrivate)) diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 165a9c702f..89ca22b76a 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -33,9 +33,6 @@ #include "e-map.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_MAP_TWEEN_TIMEOUT_MSECS 25 #define E_MAP_TWEEN_DURATION_MSECS 150 diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c index 20f1c7a068..023c3e058f 100644 --- a/widgets/misc/e-preferences-window.c +++ b/widgets/misc/e-preferences-window.c @@ -25,9 +25,6 @@ #include #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define SWITCH_PAGE_INTERVAL 250 #define E_PREFERENCES_WINDOW_GET_PRIVATE(obj) \ diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c index f6617ad29a..b6a06ccfe5 100644 --- a/widgets/misc/e-preview-pane.c +++ b/widgets/misc/e-preview-pane.c @@ -23,9 +23,6 @@ #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_PREVIEW_PANE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_PREVIEW_PANE, EPreviewPanePrivate)) diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 695eb112e7..0b0589bfa6 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -25,9 +25,6 @@ #include #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_SEARCH_BAR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_SEARCH_BAR, ESearchBarPrivate)) diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 44a22d6eb3..d5ce69a1a6 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -29,9 +29,6 @@ #include "e-selection-model.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - G_DEFINE_TYPE ( ESelectionModel, e_selection_model, diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c index 43b6be6c63..f7529d37e4 100644 --- a/widgets/misc/e-signature-manager.c +++ b/widgets/misc/e-signature-manager.c @@ -27,9 +27,6 @@ #include "e-signature-tree-view.h" #include "e-signature-script-dialog.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_SIGNATURE_MANAGER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_SIGNATURE_MANAGER, ESignatureManagerPrivate)) diff --git a/widgets/misc/e-signature-script-dialog.c b/widgets/misc/e-signature-script-dialog.c index 1d514f5da0..1364737735 100644 --- a/widgets/misc/e-signature-script-dialog.c +++ b/widgets/misc/e-signature-script-dialog.c @@ -242,9 +242,6 @@ e_signature_script_dialog_init (ESignatureScriptDialog *dialog) GTK_DIALOG (dialog), GTK_STOCK_SAVE, GTK_RESPONSE_OK); -#if !GTK_CHECK_VERSION(2,90,7) - g_object_set (dialog, "has-separator", FALSE, NULL); -#endif gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); container = content_area; -- cgit v1.2.3