aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--my-evolution/ChangeLog28
-rw-r--r--my-evolution/component-factory.c10
-rw-r--r--my-evolution/e-summary-calendar.c10
-rw-r--r--my-evolution/e-summary-factory.c4
-rw-r--r--my-evolution/e-summary-preferences.c14
-rw-r--r--my-evolution/e-summary-shown.c2
-rw-r--r--my-evolution/e-summary-table.c2
-rw-r--r--my-evolution/e-summary-tasks.c10
-rw-r--r--my-evolution/e-summary.c2
9 files changed, 53 insertions, 29 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 87f88a440f..82e7f4b2f9 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,5 +1,33 @@
2002-11-11 Ettore Perazzoli <ettore@ximian.com>
+ * 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().
+
+2002-11-11 Ettore Perazzoli <ettore@ximian.com>
+
* e-summary-rdf.c: Convert to use libxml2.
2002-11-11 Ettore Perazzoli <ettore@ximian.com>
diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index bb58f29c65..d266bf2706 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -75,10 +75,9 @@ create_view (EvolutionShellComponent *shell,
return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
}
- offline_handler = gtk_object_get_data (GTK_OBJECT (shell),
- "offline-handler");
+ offline_handler = g_object_get_data (G_OBJECT (shell), "offline-handler");
shell_client = evolution_shell_component_get_owner (shell);
- corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
+ corba_shell = evolution_shell_client_corba_objref (shell_client);
control = e_summary_factory_new_control (physical_uri, corba_shell,
offline_handler, global_preferences);
if (!control)
@@ -101,7 +100,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
evolution_dir = g_strdup (evolution_homedir);
}
- corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
+ corba_shell = evolution_shell_client_corba_objref (shell_client);
e_summary_folder_init_folder_store (corba_shell);
e_summary_preferences_register_config_control_factory (corba_shell);
@@ -154,8 +153,7 @@ create_component (BonoboGenericFactory *factory,
g_signal_connect (shell_component, "owner_unset", G_CALLBACK (owner_unset_cb), NULL);
offline_handler = e_summary_offline_handler_new ();
- gtk_object_set_data (GTK_OBJECT (shell_component), "offline-handler",
- offline_handler);
+ g_object_set_data (G_OBJECT (shell_component), "offline-handler", offline_handler);
bonobo_object_add_interface (BONOBO_OBJECT (shell_component), BONOBO_OBJECT (offline_handler));
return BONOBO_OBJECT (shell_component);
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);
diff --git a/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c
index a7a0018833..9d9fe3c78f 100644
--- a/my-evolution/e-summary-factory.c
+++ b/my-evolution/e-summary-factory.c
@@ -116,7 +116,7 @@ static void
control_destroy_cb (BonoboControl *control,
ESummary *summary)
{
- gtk_object_destroy (GTK_OBJECT (summary));
+ gtk_widget_destroy (GTK_WIDGET (summary));
}
BonoboControl *
@@ -139,7 +139,7 @@ e_summary_factory_new_control (const char *uri,
control = bonobo_control_new (summary);
if (control == NULL) {
- gtk_object_destroy (GTK_OBJECT (summary));
+ gtk_widget_destroy (summary);
return NULL;
}
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 3f11ae4b4e..edbda8f135 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -1038,8 +1038,7 @@ make_property_dialog (PropertyData *pd)
mail->storage_set_view = glade_xml_get_widget (pd->xml, "mail-custom");
g_return_val_if_fail (mail->storage_set_view != NULL, FALSE);
- listener = gtk_object_get_data (GTK_OBJECT (mail->storage_set_view),
- "listener");
+ listener = g_object_get_data (G_OBJECT (mail->storage_set_view), "listener");
gtk_signal_connect (GTK_OBJECT (listener), "folder-toggled",
GTK_SIGNAL_FUNC (storage_set_changed), pd);
@@ -1192,9 +1191,8 @@ free_property_dialog (PropertyData *pd)
g_free (pd->calendar);
}
- if (pd->xml) {
- gtk_object_unref (GTK_OBJECT (pd->xml));
- }
+ if (pd->xml)
+ g_object_unref (pd->xml);
g_free (pd);
}
@@ -1287,8 +1285,8 @@ e_summary_preferences_make_mail_table (PropertyData *pd)
CORBA_exception_free (&ev);
widget = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL);
- gtk_object_set_data (GTK_OBJECT (widget), "listener", listener);
- gtk_object_set_data (GTK_OBJECT (widget), "corba_view", view);
+ g_object_set_data (G_OBJECT (widget), "listener", listener);
+ g_object_set_data (G_OBJECT (widget), "corba_view", view);
set_selected_folders (view);
return widget;
@@ -1332,7 +1330,7 @@ get_folders_from_view (GtkWidget *view)
GList *out_list = NULL;
int i;
- set_view = gtk_object_get_data (GTK_OBJECT (view), "corba_view");
+ set_view = g_object_get_data (G_OBJECT (view), "corba_view");
CORBA_exception_init (&ev);
list = GNOME_Evolution_StorageSetView__get_checkedFolders (set_view, &ev);
diff --git a/my-evolution/e-summary-shown.c b/my-evolution/e-summary-shown.c
index 4896083198..d13b5242ad 100644
--- a/my-evolution/e-summary-shown.c
+++ b/my-evolution/e-summary-shown.c
@@ -461,7 +461,7 @@ make_table (GHashTable *data_model,
value_to_string,
data_model);
- gtk_object_ref (GTK_OBJECT (td->etm));
+ g_object_ref (td->etm);
gtk_object_sink (GTK_OBJECT (td->etm));
etmm = E_TREE_MEMORY (td->etm);
diff --git a/my-evolution/e-summary-table.c b/my-evolution/e-summary-table.c
index 7edc82e0b4..4439ec9684 100644
--- a/my-evolution/e-summary-table.c
+++ b/my-evolution/e-summary-table.c
@@ -363,7 +363,7 @@ e_summary_table_init (ESummaryTable *est)
value_is_empty,
value_to_string,
est);
- gtk_object_ref (GTK_OBJECT (priv->etm));
+ g_object_ref (priv->etm);
gtk_object_sink (GTK_OBJECT (priv->etm));
etmm = E_TREE_MEMORY (priv->etm);
diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c
index 854043afdb..35235d2fe1 100644
--- a/my-evolution/e-summary-tasks.c
+++ b/my-evolution/e-summary-tasks.c
@@ -376,11 +376,11 @@ generate_html (gpointer data)
text.value);
#endif
cal_component_free_icaltimetype (completed);
- gtk_object_unref (GTK_OBJECT (comp));
+ g_object_unref (comp);
continue;
}
- gtk_object_unref (GTK_OBJECT (comp));
+ g_object_unref (comp);
g_string_append (string, tmp);
g_free (tmp);
}
@@ -501,7 +501,7 @@ setup_task_folder (ESummary *summary)
NULL);
if (tasks->client != NULL)
- gtk_object_unref (GTK_OBJECT (tasks->client));
+ g_object_unref (tasks->client);
tasks->client = cal_client_new ();
if (tasks->client == NULL) {
@@ -582,13 +582,13 @@ e_summary_tasks_free (ESummary *summary)
if (tasks->cal_open_reload_timeout_id != 0)
g_source_remove (tasks->cal_open_reload_timeout_id);
- gtk_object_unref (GTK_OBJECT (tasks->client));
+ g_object_unref (tasks->client);
g_free (tasks->html);
g_free (tasks->due_today_colour);
g_free (tasks->overdue_colour);
g_free (tasks->default_uri);
- gtk_object_unref (GTK_OBJECT (tasks->config_listener));
+ g_object_unref (tasks->config_listener);
g_free (tasks);
summary->tasks = NULL;
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index 072e7c4d5f..bf3a358c87 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -631,7 +631,7 @@ do_summary_print (ESummary *summary,
}
}
- gtk_object_unref (GTK_OBJECT (print_master));
+ g_object_unref (print_master);
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 16:14:24 +0800