[nautilus-sendto] Bug 586530 – Remove deprecated GTK+ symbols

[Bastien Nocera <hadess src gnome org>]

commit 1ba51330f2519f054ca7a654f28cdf2f8d607acf
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jun 25 16:10:13 2009 +0100

    Bug 586530 â?? Remove deprecated GTK+ symbols
    
    Easy!

 src/nautilus-sendto-command.c           |    2 +-
 src/plugins/evolution/e-contact-entry.h |   17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
index 8171509..a8c472f 100644
--- a/src/nautilus-sendto-command.c
+++ b/src/nautilus-sendto-command.c
@@ -409,7 +409,7 @@ set_contact_widgets (NS_ui *ui)
 	for (aux = plugin_list; aux; aux = aux->next){
 		p = (NstPlugin *) aux->data;
 		w = p->info->get_contacts_widget(p);
-		gtk_box_pack_end_defaults (GTK_BOX(ui->hbox_contacts_ws),w);
+		gtk_box_pack_end (GTK_BOX(ui->hbox_contacts_ws),w, TRUE, TRUE, 0);
 		gtk_widget_hide (GTK_WIDGET(w));
 		ui->contact_widgets = g_list_append (ui->contact_widgets, w);
 		if (GTK_IS_ENTRY (w)) {
diff --git a/src/plugins/evolution/e-contact-entry.h b/src/plugins/evolution/e-contact-entry.h
index 838695e..bf6b39b 100644
--- a/src/plugins/evolution/e-contact-entry.h
+++ b/src/plugins/evolution/e-contact-entry.h
@@ -30,12 +30,17 @@
 
 G_BEGIN_DECLS
 
-#define E_TYPE_CONTACT_ENTRY (e_contact_entry_get_type ())
-#define E_CONTACT_ENTRY(obj) (GTK_CHECK_CAST ((obj), e_contact_entry_get_type (), EContactEntry))
-#define E_CONTACT_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), e_contact_entry_get_type (), EContactEntryClass))
-#define E_IS_CONTACT_ENTRY(obj) (GTK_CHECK_TYPE (obj, e_contact_entry_get_type ()))
-#define E_IS_CONTACT_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), e_contact_entry_get_type ()))
-#define E_CONTACT_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_CONTACT_ENTRY_TYPE, EContactEntryClass))
+#define E_TYPE_CONTACT_ENTRY (e_contact_entry_get_type())
+#define E_CONTACT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+				E_TYPE_CONTACT_ENTRY, EContactEntry))
+#define E_CONTACT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+				E_TYPE_CONTACT_ENTRY, EContactEntryClass))
+#define E_IS_CONTACT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+						E_TYPE_CONTACT_ENTRY))
+#define E_IS_CONTACT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \
+						E_TYPE_CONTACT_ENTRY))
+#define E_GET_CONTACT_ENTRY_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \
+				E_TYPE_CONTACT_ENTRY, EContactEntryClass))
 
 typedef struct EContactEntryPriv EContactEntryPriv;