Massive code cleanup (bug #429422)

svn path=/trunk/; revision=33432

14 files changed, 158 insertions, 108 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index d6e03cc036..36ee0add7a 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -33,6 +33,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkdialog.h>
+#include <gtk/gtkfilechooserbutton.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreeview.h>
@@ -41,7 +42,6 @@
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
-#include <libgnomeui/gnome-file-entry.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
@@ -99,7 +99,7 @@ typedef struct {
 	GtkWidget *aalarm_group;
 	GtkWidget *aalarm_sound;
 	GtkWidget *aalarm_attach;
-	GtkWidget *aalarm_file_entry;
+	GtkWidget *aalarm_file_chooser;
 
 	/* Mail alarm widgets */
 	const char *email;
@@ -779,7 +779,7 @@ get_widgets (Dialog *dialog)
 	dialog->aalarm_group = GW ("aalarm-group");
 	dialog->aalarm_sound = GW ("aalarm-sound");
 	dialog->aalarm_attach = GW ("aalarm-attach");
-	dialog->aalarm_file_entry = GW ("aalarm-file-entry");
+	dialog->aalarm_file_chooser = GW ("aalarm-file-chooser");
 
 	dialog->malarm_group = GW ("malarm-group");
 	dialog->malarm_address_group = GW ("malarm-address-group");
@@ -810,7 +810,7 @@ get_widgets (Dialog *dialog)
 		&& dialog->aalarm_group
 		&& dialog->aalarm_sound
 		&& dialog->aalarm_attach
-		&& dialog->aalarm_file_entry
+		&& dialog->aalarm_file_chooser
 		&& dialog->malarm_group
 		&& dialog->malarm_address_group
 		&& dialog->malarm_addressbook
@@ -1073,13 +1073,16 @@ action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
 		}
 	}
 	
-	gtk_notebook_set_page (GTK_NOTEBOOK (dialog->option_notebook), page);
+	gtk_notebook_set_current_page (
+		GTK_NOTEBOOK (dialog->option_notebook), page);
 
 	switch (action) {	
 	case E_CAL_COMPONENT_ALARM_AUDIO:
 		dir = calendar_config_get_dir_path ();
 		if ( dir && *dir )
-			gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->aalarm_file_entry), dir);
+			gtk_file_chooser_set_current_folder (
+				GTK_FILE_CHOOSER (dialog->aalarm_file_chooser),
+				dir);
 		g_free (dir);
 		check_custom_sound (dialog);
 		break;
diff --git a/calendar/gui/dialogs/alarm-dialog.glade b/calendar/gui/dialogs/alarm-dialog.glade
index fb44f24b25..4e32374928 100644
--- a/calendar/gui/dialogs/alarm-dialog.glade
+++ b/calendar/gui/dialogs/alarm-dialog.glade
@@ -18,6 +18,8 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -85,6 +87,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -112,6 +118,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -336,6 +346,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -363,6 +377,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -435,6 +453,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -539,6 +561,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -566,6 +592,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -631,6 +661,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">option-notebook</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -704,6 +738,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -754,7 +792,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">aalarm-attach</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -764,27 +805,14 @@
 			  </child>
 
 			  <child>
-			    <widget class="GnomeFileEntry" id="aalarm-file-entry">
+			    <widget class="GtkFileChooserButton" id="aalarm-file-chooser">
 			      <property name="visible">True</property>
-			      <property name="max_saved">10</property>
-			      <property name="directory_entry">False</property>
-			      <property name="modal">True</property>
-			      <property name="use_filechooser">True</property>
-			      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-
-			      <child internal-child="entry">
-				<widget class="GtkEntry" id="aalarm-attach">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-			      </child>
+			      <property name="title" translatable="yes">Select A File</property>
+			      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+			      <property name="local_only">True</property>
+			      <property name="show_hidden">False</property>
+			      <property name="do_overwrite_confirmation">False</property>
+			      <property name="width_chars">-1</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -819,6 +847,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -854,6 +886,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">palarm-program</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -879,6 +915,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">palarm-args</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -958,6 +998,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -1094,6 +1138,10 @@
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">option-notebook</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -1145,6 +1193,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 543a3555c7..ab546ca2a4 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <string.h>
+
 #include <gtk/gtkbox.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 8c9d488f4f..303d5bde84 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -22,8 +22,9 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
+#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtksignal.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include "comp-editor-page.h"
@@ -200,7 +201,7 @@ comp_editor_page_destroy (GtkObject *object)
 	}
 
 	if (page->accel_group) {
-		gtk_accel_group_unref (page->accel_group);
+		g_object_unref (page->accel_group);
 		page->accel_group = NULL;
 	}
 
@@ -506,17 +507,18 @@ comp_editor_page_display_validation_error (CompEditorPage *page,
 					   GtkWidget *field)
 {
 	GtkWidget *dialog;
-	char *real_msg;
 
 	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
 	g_return_if_fail (msg != NULL);
 	g_return_if_fail (GTK_IS_WIDGET (field));
 
-	real_msg = g_strdup_printf (_("Validation error: %s"), msg);
-	dialog = gnome_error_dialog (real_msg);
-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
+	dialog = gtk_message_dialog_new (
+		NULL, 0,
+		GTK_MESSAGE_ERROR,
+		GTK_BUTTONS_CLOSE,
+		_("Validation error: %s"), msg);
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
 
 	gtk_widget_grab_focus (field);
-
-	g_free (real_msg);
 }
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index d74c23daef..0cd25deef7 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -814,15 +814,17 @@ save_comp (CompEditor *editor)
 	}
 	
 	if (!result) {
-		GtkWidget *dlg;
-		char *msg;
+		GtkWidget *dialog;
 
-		msg = g_strdup (error ? error->message : _("Could not update object"));
+		dialog = gtk_message_dialog_new (
+			NULL, 0,
+			GTK_MESSAGE_ERROR,
+			GTK_BUTTONS_OK,
+			"%s", (error != NULL) ? error->message :
+			_("Could not update object"));
+		gtk_dialog_run (GTK_DIALOG(dialog));
+		gtk_widget_destroy (dialog);
 
-		dlg = gnome_error_dialog (msg);
-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-
-		g_free (msg);
 		if (error)
 			g_error_free (error);
 
@@ -2093,7 +2095,7 @@ comp_editor_show_page (CompEditor *editor, CompEditorPage *page)
 
 	page_widget = comp_editor_page_get_widget (page);
 	page_num = gtk_notebook_page_num (priv->notebook, page_widget);
-	gtk_notebook_set_page (priv->notebook, page_num);
+	gtk_notebook_set_current_page (priv->notebook, page_num);
 }
 
 /**
@@ -2964,10 +2966,17 @@ obj_modified_cb (ECal *client, GList *objects, gpointer data)
 		if (e_cal_component_set_icalcomponent (comp, icalcomp)) {
 			comp_editor_edit_comp (editor, comp);
 		} else {
-			GtkWidget *dlg;
+			GtkWidget *dialog;
+
+			dialog = gtk_message_dialog_new (
+				NULL, 0,
+				GTK_MESSAGE_ERROR,
+				GTK_BUTTONS_OK,
+				"%s",
+				_("Unable to use current version!"));
+			gtk_dialog_run (GTK_DIALOG (dialog));
+			gtk_widget_destroy (dialog);
 			
-			dlg = gnome_error_dialog (_("Unable to use current version!"));
-			gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
 			icalcomponent_free (icalcomp);
 		}
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index a8a1c365a2..3274dc0f37 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -372,8 +372,7 @@ create_schedule_page (EventEditor *ee)
 			"gtk-close", GTK_RESPONSE_CLOSE,
 			NULL);
 	priv->sched_page = schedule_page_new (priv->model);
-	g_object_ref (priv->sched_page);
-	gtk_object_sink (GTK_OBJECT (priv->sched_page));
+	g_object_ref_sink (priv->sched_page);
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(priv->sched_window)->vbox), comp_editor_page_get_widget (COMP_EDITOR_PAGE (priv->sched_page)));
 
 	g_signal_connect (priv->sched_window, "response", G_CALLBACK(gtk_widget_hide), NULL);
@@ -597,8 +596,7 @@ event_editor_construct (EventEditor *ee, ECal *client)
 	priv = ee->priv;
 
 	priv->event_page = event_page_new (priv->model, client, COMP_EDITOR(ee)->uic);
-	g_object_ref (priv->event_page);
-	gtk_object_sink (GTK_OBJECT (priv->event_page));
+	g_object_ref_sink (priv->event_page);
 	comp_editor_append_page (COMP_EDITOR (ee), 
 				 COMP_EDITOR_PAGE (priv->event_page),
 				 _("Appoint_ment"), TRUE);
@@ -612,8 +610,7 @@ event_editor_construct (EventEditor *ee, ECal *client)
 	g_signal_connect (priv->recur_window, "response", G_CALLBACK (gtk_widget_hide), NULL);
 	g_signal_connect ((GtkWidget *) priv->recur_window, "delete-event", G_CALLBACK(window_delete_event), NULL);
 	priv->recur_page = recurrence_page_new ();
-	g_object_ref (priv->recur_page);
-	gtk_object_sink (GTK_OBJECT (priv->recur_page));
+	g_object_ref_sink (priv->recur_page);
 	gtk_container_add ((GtkContainer *) (GTK_DIALOG (priv->recur_window)->vbox), 
 			comp_editor_page_get_widget (COMP_EDITOR_PAGE (priv->recur_page)));
 	gtk_widget_show_all (priv->recur_window);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 74cd4d2144..efb3c95b24 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -286,7 +286,7 @@ event_page_finalize (GObject *object)
 	g_ptr_array_free (priv->deleted_attendees, TRUE);
 	
 	if (priv->main)
-		gtk_widget_unref (priv->main);
+		g_object_unref (priv->main);
 
 	if (priv->xml) {
 		g_object_unref (priv->xml);
@@ -811,8 +811,8 @@ sensitize_widgets (EventPage *epage)
 		gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6);
 	}
 	
-	gtk_entry_set_editable (GTK_ENTRY (priv->summary), !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->location), sensitize);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->summary), !read_only);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->location), sensitize);
 	gtk_widget_set_sensitive (priv->alarm_box, custom);	
 	gtk_widget_set_sensitive (priv->start_time, sensitize);
 	gtk_widget_set_sensitive (priv->start_timezone, sensitize);
@@ -833,7 +833,7 @@ sensitize_widgets (EventPage *epage)
 	gtk_widget_set_sensitive (priv->hour_selector, sensitize);
 	gtk_widget_set_sensitive (priv->minute_selector, sensitize);
 
-	gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->categories), !read_only);
 
 	if (delegate) {
 		gtk_widget_set_sensitive (priv->source_selector, FALSE);
@@ -1052,7 +1052,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 				if (!priv->user_org) {
 					list = g_list_append (list, string);
 					gtk_combo_set_popdown_strings (GTK_COMBO (priv->organizer), list);
-					gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry), FALSE);
+					gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (priv->organizer)->entry), FALSE);
 				}
 
 				g_free (string);
@@ -2176,10 +2176,8 @@ get_widgets (EventPage *epage)
 	   it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
+	if (accel_groups)
+		page->accel_group = g_object_ref (accel_groups->data);
 	priv->alarm_dialog = GW ("alarm-dialog");
 	priv->alarm_box = GW ("custom_box");
 	priv->alarm_time = GW ("alarm-time");
@@ -2200,7 +2198,7 @@ get_widgets (EventPage *epage)
 	}
 	priv->attendees_label = GW ("attendees-label");
 
-	gtk_widget_ref (priv->main);
+	g_object_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->categories = GW ("categories");	
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index fb977c3a97..aaa1b864b6 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -213,8 +213,7 @@ memo_editor_construct (MemoEditor *me, ECal *client)
 	priv = me->priv;
 
 	priv->memo_page = memo_page_new (editor->uic, flags);
-	g_object_ref (priv->memo_page);
-	gtk_object_sink (GTK_OBJECT (priv->memo_page));
+	g_object_ref_sink (priv->memo_page);
 	comp_editor_append_page (COMP_EDITOR (me), 
 				 COMP_EDITOR_PAGE (priv->memo_page),
 				 _("Memo"), TRUE);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index c0cade5155..b307da3ed8 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -180,7 +180,7 @@ memo_page_finalize (GObject *object)
 	priv = mpage->priv;
 	
 	if (priv->main)
-		gtk_widget_unref (priv->main);
+		g_object_unref (priv->main);
 
 	if (priv->xml) {
 		g_object_unref (priv->xml);
@@ -306,14 +306,14 @@ sensitize_widgets (MemoPage *mpage)
 	gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->memo_content), sensitize);
 	gtk_widget_set_sensitive (priv->start_date, sensitize);
 	gtk_widget_set_sensitive (priv->categories_btn, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->summary_entry), sensitize);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->categories), !read_only);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->summary_entry), sensitize);
 	
 	if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_IS_SHARED) {
-		gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry), sensitize);
+		gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (priv->org_combo)->entry), sensitize);
 	
 		if (priv->to_entry) {
-			gtk_entry_set_editable (GTK_ENTRY (priv->to_entry), !read_only);
+			gtk_editable_set_editable (GTK_EDITABLE (priv->to_entry), !read_only);
 			gtk_widget_grab_focus (priv->to_entry);
 		}
 	}
@@ -424,7 +424,7 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 			} else {
 				list = g_list_append (list, string);
 				gtk_combo_set_popdown_strings (GTK_COMBO (priv->org_combo), list);
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry), FALSE);
+				gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (priv->org_combo)->entry), FALSE);
 			}
 			g_free (string);
 			g_list_free (list);
@@ -777,12 +777,10 @@ get_widgets (MemoPage *mpage)
 	   it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
+	if (accel_groups)
+		page->accel_group = g_object_ref (accel_groups->data);
 
-	gtk_widget_ref (priv->main);
+	g_object_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->org_label = GW ("org-label");
@@ -1141,7 +1139,7 @@ memo_page_new (BonoboUIComponent *uic, CompEditorPageFlags flags)
 {
 	MemoPage *mpage;
 
-	mpage = gtk_type_new (TYPE_MEMO_PAGE);
+	mpage = g_object_new (TYPE_MEMO_PAGE, NULL);
 	mpage->priv->uic = uic;
 	COMP_EDITOR_PAGE (mpage)->flags = flags;
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 2ee4f1a410..581a2559db 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -286,7 +286,7 @@ recurrence_page_finalize (GObject *object)
 			    0, 0, NULL, preview_date_range_changed_cb, NULL);
 
 	if (priv->main)
-		gtk_widget_unref (priv->main);
+		g_object_unref (priv->main);
 
 	if (priv->xml) {
 		g_object_unref (priv->xml);
@@ -2000,12 +2000,10 @@ get_widgets (RecurrencePage *rpage)
 	   it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
+	if (accel_groups)
+		page->accel_group = g_object_ref (accel_groups->data);
 
-	gtk_widget_ref (priv->main);
+	g_object_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 	      
 	priv->recurs = GW ("recurs");
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 3aeb03b328..dd467b42f9 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -133,7 +133,7 @@ schedule_page_finalize (GObject *object)
 	priv = spage->priv;
 
 	if (priv->main)
-		gtk_widget_unref (priv->main);
+		g_object_unref (priv->main);
 
 	if (priv->xml) {
 		g_object_unref (priv->xml);
@@ -358,12 +358,10 @@ get_widgets (SchedulePage *spage)
 	   it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
+	if (accel_groups)
+		page->accel_group = g_object_ref (accel_groups->data);
 
-	gtk_widget_ref (priv->main);
+	g_object_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 #undef GW
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 9484add139..a5164534d6 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -158,7 +158,7 @@ task_details_page_finalize (GObject *object)
 	priv = tdpage->priv;
 
 	if (priv->main)
-		gtk_widget_unref (priv->main);
+		g_object_unref (priv->main);
 
 	if (priv->xml) {
 		g_object_unref (priv->xml);
@@ -275,7 +275,7 @@ sensitize_widgets (TaskDetailsPage *tdpage)
 	gtk_widget_set_sensitive (priv->percent_complete, !read_only);
 	gtk_widget_set_sensitive (priv->completed_date, !read_only);
 	gtk_widget_set_sensitive (priv->url_label, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry))), !read_only);
+	gtk_editable_set_editable (GTK_EDITABLE (e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry))), !read_only);
 }
 
 /* fill_widgets handler for the task page */
@@ -492,12 +492,10 @@ get_widgets (TaskDetailsPage *tdpage)
 	   it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
+	if (accel_groups)
+		page->accel_group = g_object_ref (accel_groups->data);
 
-	gtk_widget_ref (priv->main);
+	g_object_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->status = GW ("status");
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 35b92bc63b..ef614ef1c0 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -418,8 +418,7 @@ task_editor_construct (TaskEditor *te, ECal *client)
 	priv = te->priv;
 
 	priv->task_page = task_page_new (priv->model, client, editor->uic);
-	g_object_ref (priv->task_page);
-	gtk_object_sink (GTK_OBJECT (priv->task_page));
+	g_object_ref_sink (priv->task_page);
 	comp_editor_append_page (COMP_EDITOR (te), 
 				 COMP_EDITOR_PAGE (priv->task_page),
 				 _("_Task"), TRUE);
@@ -434,8 +433,7 @@ task_editor_construct (TaskEditor *te, ECal *client)
 	g_signal_connect (priv->task_details_window, "delete-event", G_CALLBACK(gtk_widget_hide), NULL);
 	
 	priv->task_details_page = task_details_page_new ();
-	g_object_ref (priv->task_details_page);
-	gtk_object_sink (GTK_OBJECT (priv->task_details_page));
+	g_object_ref_sink (priv->task_details_page);
 	gtk_container_add ((GtkContainer *) GTK_DIALOG(priv->task_details_window)->vbox, 
 		           comp_editor_page_get_widget ((CompEditorPage *)priv->task_details_page));
 	gtk_widget_show_all (priv->task_details_window);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 79b07d012b..1a7352aab5 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -233,7 +233,7 @@ task_page_finalize (GObject *object)
 	priv = tpage->priv;
 
 	if (priv->main)
-		gtk_widget_unref (priv->main);
+		g_object_unref (priv->main);
 
 	if (priv->xml) {
 		g_object_unref (priv->xml);
@@ -391,13 +391,13 @@ sensitize_widgets (TaskPage *tpage)
 
 	sensitize = (!read_only && sens);
 
-	gtk_entry_set_editable (GTK_ENTRY (priv->summary), !read_only);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->summary), !read_only);
 	gtk_widget_set_sensitive (priv->due_date, !read_only);
 	gtk_widget_set_sensitive (priv->start_date, !read_only);
 	gtk_widget_set_sensitive (priv->timezone, !read_only);
 	gtk_widget_set_sensitive (priv->description, !read_only);
 	gtk_widget_set_sensitive (priv->categories_btn, !read_only);
-	gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only);
+	gtk_editable_set_editable (GTK_EDITABLE (priv->categories), !read_only);
 
 	gtk_widget_set_sensitive (priv->organizer, !read_only);
 	gtk_widget_set_sensitive (priv->add, (!read_only &&  sens));
@@ -1398,12 +1398,10 @@ get_widgets (TaskPage *tpage)
 	   it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
-	if (accel_groups) {
-		page->accel_group = accel_groups->data;
-		gtk_accel_group_ref (page->accel_group);
-	}
+	if (accel_groups)
+		page->accel_group = g_object_ref (accel_groups->data);
 
-	gtk_widget_ref (priv->main);
+	g_object_ref (priv->main);
 	gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main);
 
 	priv->summary = GW ("summary");
@@ -1913,7 +1911,7 @@ task_page_new (EMeetingStore *model, ECal *client, BonoboUIComponent *uic)
 {
 	TaskPage *tpage;
 
-	tpage = gtk_type_new (TYPE_TASK_PAGE);
+	tpage = g_object_new (TYPE_TASK_PAGE, NULL);
 	if (!task_page_construct (tpage, model, client)) {
 		g_object_unref (tpage);
 		return NULL;