aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/ChangeLog38
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/folder-browser.c4
-rw-r--r--mail/mail-config-druid.c3
-rw-r--r--mail/mail-display.c6
-rw-r--r--mail/mail-local.c2
-rw-r--r--mail/mail-summary.c2
-rw-r--r--mail/mail-vfolder.c4
-rw-r--r--mail/message-browser.c2
-rw-r--r--mail/message-list.c24
-rw-r--r--mail/subscribe-dialog.c10
11 files changed, 67 insertions, 30 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 41ad935c2a..8ad06c8466 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,41 @@
+2002-11-14 Ettore Perazzoli <ettore@ximian.com>
+
+ * component-factory.c (owner_set_cb): Want a (GWeakNotify) cast
+ here, not (GWeakNotify *).
+
+ * subscribe-dialog.c (fete_init): g_object_set() instead of
+ gtk_object_set().
+ (populate_store_list): Likewise.
+ (menu_item_selected): g_object_get_data() instead of
+ gtk_object_get_data().
+
+ * message-list.c (message_list_create_extras): g_object_set()
+ instead of gtk_object_set().
+
+ * message-browser.c (message_browser_message_list_built):
+ g_object_get_data() instead of gtk_object_get_data().
+
+ * mail-vfolder.c (edit_rule_response): g_object_get_data() instead
+ of gtk_object_get_data().
+
+ * mail-summary.c (generate_folder_summaries): g_object_unref() the
+ context instead of gtk_object_destroy().
+
+ * mail-local.c (reconfigure_response): g_object_get_data() instead
+ of gtk_object_get_data().
+
+ * mail-display.c (pixbuf_gen_idle): g_object_unref() the GdkPixbuf
+ loader instead of gtk_object_destroy().
+ (pixbuf_gen_idle): Likewise.
+ (embeddable_destroy_cb): Likewise.
+
+ * mail-config-druid.c (mail_config_druid_destroy): No need to
+ gtk_object_destroy() the GladeXML object.
+ (construct): g_object_set() instead of gtk_object_set().
+
+ * folder-browser.c (folder_browser_gui_init): g_object_get_data()
+ instead of gtk_object_get_data().
+
2002-11-14 Not Zed <NotZed@Ximian.com>
* component-factory.c (create_view): shell client objref.
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 15349686fa..3a3d3b727c 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -752,7 +752,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
/* FIXME: should we ref this? */
global_shell_client = shell_client;
- g_object_weak_ref(G_OBJECT(shell_client), (GWeakNotify *)shell_client_destroy, NULL);
+ g_object_weak_ref(G_OBJECT(shell_client), (GWeakNotify)shell_client_destroy, NULL);
evolution_dir = g_strdup (evolution_homedir);
mail_session_init ();
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 1296863978..b81fd3bac7 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -2311,8 +2311,8 @@ folder_browser_gui_init (FolderBrowser *fb)
/* quick-search bar */
if (search_context) {
- const char *systemrules = gtk_object_get_data (GTK_OBJECT (search_context), "system");
- const char *userrules = gtk_object_get_data (GTK_OBJECT (search_context), "user");
+ const char *systemrules = g_object_get_data (G_OBJECT (search_context), "system");
+ const char *userrules = g_object_get_data (G_OBJECT (search_context), "user");
fb->search = e_filter_bar_new (search_context, systemrules, userrules,
folder_browser_config_search, fb);
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index 1922a741c0..c64d90fb14 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -126,7 +126,6 @@ mail_config_druid_destroy (GtkObject *obj)
CORBA_Environment ev;
if (druid->xml) {
- gtk_object_destroy (GTK_OBJECT (druid->xml));
g_object_unref(druid->xml);
druid->xml = NULL;
@@ -644,7 +643,7 @@ construct (MailConfigDruid *druid)
gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Assistant"));
gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, FALSE);
gtk_window_set_modal (GTK_WINDOW (druid), FALSE);
- gtk_object_set (GTK_OBJECT (druid), "type", GTK_WINDOW_TOPLEVEL, NULL);
+ g_object_set (G_OBJECT (druid), "type", GTK_WINDOW_TOPLEVEL, NULL);
druid->listener = bonobo_listener_new (NULL, NULL);
g_signal_connect(druid->listener, "event-notify",
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 2c6ba79114..427f660a92 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -617,7 +617,7 @@ pixbuf_gen_idle (struct _PixbufLoader *pbl)
if (pbl->loader) {
gdk_pixbuf_loader_close (pbl->loader, NULL);
- gtk_object_destroy (GTK_OBJECT (pbl->loader));
+ g_object_unref (pbl->loader);
camel_object_unref (pbl->mstream);
}
g_signal_handler_disconnect((pbl->eb), pbl->destroy_id);
@@ -637,7 +637,7 @@ pixbuf_gen_idle (struct _PixbufLoader *pbl)
if (pbl->loader) {
gdk_pixbuf_loader_close (pbl->loader, NULL);
- gtk_object_destroy (GTK_OBJECT (pbl->loader));
+ g_object_unref (pbl->loader);
}
g_free (pbl->type);
@@ -717,7 +717,7 @@ embeddable_destroy_cb (GtkObject *embeddable,
if (pbl->loader) {
gdk_pixbuf_loader_close (pbl->loader, NULL);
- gtk_object_destroy (GTK_OBJECT (pbl->loader));
+ g_object_unref (pbl->loader);
}
g_free (pbl->type);
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 5ddf5194c1..3b06ebed5e 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -1390,7 +1390,7 @@ reconfigure_response(GtkDialog *dialog, int button, struct _reconfigure_msg *m)
menu = gtk_option_menu_get_menu(m->optionlist);
item = gtk_menu_get_active(GTK_MENU(menu));
- m->newtype = g_strdup(gtk_object_get_data((GtkObject *)item, "type"));
+ m->newtype = g_strdup(g_object_get_data (item, "type"));
m->index_body = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m->check_index_body));
gtk_widget_set_sensitive (m->frame, FALSE);
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index 7a6615f19d..95aaeb7c64 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -374,7 +374,7 @@ generate_folder_summaries (MailSummary *summary)
camel_exception_free (ex);
}
- gtk_object_destroy (GTK_OBJECT (context));
+ g_object_unref (context);
}
static void
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5caca2b52d..42a5a23df8 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -826,8 +826,8 @@ edit_rule_response(GtkWidget *w, int button, void *data)
{
if (button == GTK_RESPONSE_OK) {
char *user;
- FilterRule *rule = gtk_object_get_data((GtkObject *)w, "rule");
- FilterRule *orig = gtk_object_get_data((GtkObject *)w, "orig");
+ FilterRule *rule = g_object_get_data (G_OBJECT (w), "rule");
+ FilterRule *orig = g_object_get_data (G_OBJECT (w), "orig");
filter_rule_copy(orig, rule);
user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
diff --git a/mail/message-browser.c b/mail/message-browser.c
index a9994631ab..592d436e35 100644
--- a/mail/message-browser.c
+++ b/mail/message-browser.c
@@ -219,7 +219,7 @@ message_browser_message_loaded (FolderBrowser *fb, const char *uid, MessageBrows
static void
message_browser_message_list_built (MessageList *ml, MessageBrowser *mb)
{
- const char *uid = gtk_object_get_data (GTK_OBJECT (mb), "uid");
+ const char *uid = g_object_get_data (G_OBJECT (mb), "uid");
g_signal_handlers_disconnect_matched(mb->fb, G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
message_browser_message_list_built, mb);
diff --git a/mail/message-list.c b/mail/message-list.c
index 880af45ec2..810253bd4e 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1157,18 +1157,18 @@ message_list_create_extras (void)
/* date cell */
cell = e_cell_date_new (NULL, GTK_JUSTIFY_LEFT);
- gtk_object_set (GTK_OBJECT (cell),
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (G_OBJECT (cell),
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_table_extras_add_cell (extras, "render_date", cell);
/* text cell */
cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
- gtk_object_set (GTK_OBJECT (cell),
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (G_OBJECT (cell),
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_table_extras_add_cell (extras, "render_text", cell);
e_table_extras_add_cell (extras, "render_tree",
@@ -1177,10 +1177,10 @@ message_list_create_extras (void)
/* size cell */
cell = e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT);
- gtk_object_set (GTK_OBJECT (cell),
- "bold_column", COL_UNREAD,
- "color_column", COL_COLOUR,
- NULL);
+ g_object_set (G_OBJECT (cell),
+ "bold_column", COL_UNREAD,
+ "color_column", COL_COLOUR,
+ NULL);
e_table_extras_add_cell (extras, "render_size", cell);
return extras;
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 061dfaaa39..2b94afb0f8 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -431,9 +431,9 @@ fete_init (GtkObject *object)
cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
text_cell = cell;
- gtk_object_set (GTK_OBJECT (cell),
- "bold_column", FOLDER_COL_SUBSCRIBED,
- NULL);
+ g_object_set (G_OBJECT (cell),
+ "bold_column", FOLDER_COL_SUBSCRIBED,
+ NULL);
e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_text", cell);
/* toggle column */
@@ -1452,7 +1452,7 @@ static void
menu_item_selected (GtkMenuItem *item, gpointer user_data)
{
SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
- StoreData *sd = gtk_object_get_data (GTK_OBJECT (item), STORE_DATA_KEY);
+ StoreData *sd = g_object_get_data (G_OBJECT (item), STORE_DATA_KEY);
g_return_if_fail (sd);
@@ -1537,7 +1537,7 @@ populate_store_list (SubscribeDialog *sc)
camel_url_free (url);
item = gtk_menu_item_new_with_label (string);
store_data_async_get_store (iter->data, got_sd_store, item);
- gtk_object_set_data (GTK_OBJECT (item), STORE_DATA_KEY, iter->data);
+ g_object_set_data (G_OBJECT (item), STORE_DATA_KEY, iter->data);
g_signal_connect(item, "activate", G_CALLBACK(menu_item_selected), sc);
g_free (string);
generated by cgit (git 2.34.1) at 2024-12-28 08:49:45 +0800