gtk_widget_destroy() instead of gtk_object_destroy().

* e-summary-factory.c (control_destroy_cb): gtk_widget_destroy()
instead of gtk_object_destroy().
(e_summary_factory_new_control): Likewise.

* e-summary-calendar.c: Use g_object_ref()/g_object_unref()
instead of gtk_object_ref()/gtk_object_unref().
* e-summary-preferences.c: Likewise.
* e-summary-shown.c: Likewise.
* e-summary-table.c: Likewise.
* e-summary-tasks.c: Likewise.
* e-summary.c: Likewise.

* e-summary-preferences.c (e_summary_preferences_make_mail_table):
g_object_set_data() instead of gtk_object_set_data().
(make_property_dialog): g_object_get_data() instead of
gtk_object_get_data().
(get_folders_from_view): Likewise.

* component-factory.c (create_view): Use
evolution_shell_client_corba_objref() instead of
bonobo_object_corba_objref() on the EvolutionShellClient object.
Also, use g_object_get_data() instead of gtk_object_get_data().
(owner_set_cb): Likewise.
(create_component): Use g_object_set_data() instead of
gtk_object_set_data().

svn path=/trunk/; revision=18710

1 files changed, 5 insertions, 5 deletions

diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index b218bd13c0..4714cea746 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.c
@@ -243,7 +243,7 @@ add_recurrances (CalComponent *comp,
 	event->uid = g_strdup (recur->event->uid);
 	event->zone = recur->summary->tz;
 
-	gtk_object_ref (GTK_OBJECT (comp));
+	g_object_ref (comp);
 
 	g_ptr_array_add (recur->array, event);
 	return TRUE;
@@ -296,7 +296,7 @@ uids_to_array (ESummary *summary,
 			
 			status = cal_client_get_timezone (client, event->dt.tzid, &event->zone);
 			if (status != CAL_CLIENT_GET_SUCCESS) {
-				gtk_object_unref (GTK_OBJECT (event->comp));
+				g_object_unref (event->comp);
 				g_free (event);
 				continue;
 			}
@@ -321,7 +321,7 @@ free_event_array (GPtrArray *array)
 		
 		event = array->pdata[i];
 		g_free (event->uid);
-		gtk_object_unref (GTK_OBJECT (event->comp));
+		g_object_unref (event->comp);
 	}
 
 	g_ptr_array_free (array, TRUE);
@@ -551,7 +551,7 @@ setup_calendar (ESummary *summary)
 	}
 
 	if (calendar->client != NULL)
-		gtk_object_unref (GTK_OBJECT (calendar->client));
+		g_object_unref (calendar->client);
 
 	calendar->client = cal_client_new ();
 
@@ -635,7 +635,7 @@ e_summary_calendar_free (ESummary *summary)
 	if (calendar->cal_open_reload_timeout_id != 0)
 		g_source_remove (calendar->cal_open_reload_timeout_id);
 
-	gtk_object_unref (GTK_OBJECT (calendar->client));
+	g_object_unref (calendar->client);
 	g_free (calendar->html);
 	g_free (calendar->default_uri);