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. --- addressbook/gui/contact-editor/e-contact-editor-fullname.c | 6 ------ addressbook/gui/contact-editor/e-contact-editor.c | 3 --- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 3 --- addressbook/gui/merging/eab-contact-merging.c | 3 --- addressbook/gui/widgets/e-minicard-label.c | 3 --- addressbook/gui/widgets/e-minicard-view.c | 3 --- addressbook/gui/widgets/e-minicard.c | 3 --- 7 files changed, 24 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index c26b6e5e96..ce9092c411 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -28,9 +28,6 @@ #include "e-contact-editor-fullname.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void fill_in_info (EContactEditorFullname *editor); static void extract_info (EContactEditorFullname *editor); @@ -200,9 +197,6 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam content_area = gtk_dialog_get_content_area (dialog); gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname)); -#if !GTK_CHECK_VERSION(2,90,7) - g_object_set (dialog, "has-separator", FALSE, NULL); -#endif gtk_container_set_border_width (GTK_CONTAINER (action_area), 12); gtk_container_set_border_width (GTK_CONTAINER (content_area), 0); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 4ca2dd624b..44a272f3a3 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -53,9 +53,6 @@ #include "e-contact-editor-fullname.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define EMAIL_SLOTS 4 #define PHONE_SLOTS 8 #define IM_SLOTS 4 diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 7c5d9a9c98..67c9c88c6f 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -47,9 +47,6 @@ #include "e-contact-list-model.h" #include "eab-contact-merging.h" -/* backward-compatibility cruft */ -#include - #define E_CONTACT_LIST_EDITOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate)) diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index b97fb8e1f3..dd99a12dce 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -34,9 +34,6 @@ #include "e-util/e-util-private.h" #include -/* backend-compatibility cruft */ -#include "e-util/gtk-compat.h" - typedef struct dropdown_data dropdown_data; typedef enum { E_CONTACT_MERGING_ADD, diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 21cb6154a0..fd4e692c69 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -33,9 +33,6 @@ #include #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void e_minicard_label_init (EMinicardLabel *card); static void e_minicard_label_class_init (EMinicardLabelClass *klass); static void e_minicard_label_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index d3a05e53a6..0e36bd6b9b 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -36,9 +36,6 @@ #include "e-util/e-util.h" #include "ea-addressbook.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void e_minicard_view_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 27d8c8843d..07eacac291 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -39,9 +39,6 @@ #include #include "ea-addressbook.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *class); static void e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -- cgit v1.2.3