From 63c26d5712c807f65db9c1b0c98ca06aad76171a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 27 Mar 2011 17:58:32 -0400 Subject: Miscellaneous GtkAction-related cleanups. Prefer the newer GtkAction "set" functions over g_object_set(). --- modules/mail/e-mail-shell-backend.c | 5 +++-- modules/mail/e-mail-shell-view.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index af4af565f7..1de34a97ed 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -78,7 +78,8 @@ mail_shell_backend_init_importers (void) importer = mbox_importer_peek (); e_import_class_add_importer (import_class, importer, NULL, NULL); - mbox_importer_set_preview_funcs (mbox_create_preview_cb, mbox_fill_preview_cb); + mbox_importer_set_preview_funcs ( + mbox_create_preview_cb, mbox_fill_preview_cb); importer = elm_importer_peek (); e_import_class_add_importer (import_class, importer, NULL, NULL); @@ -95,7 +96,7 @@ mail_shell_backend_mail_icon_cb (EShellWindow *shell_window, action = e_shell_window_get_shell_view_action ( shell_window, BACKEND_NAME); - g_object_set (action, "icon-name", icon_name, NULL); + gtk_action_set_icon_name (action, icon_name); } static void diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 0c7feba0cf..2a3e2550ae 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -952,7 +952,7 @@ mail_shell_view_update_actions (EShellView *shell_view) else label = _("_Disable Account"); gtk_action_set_sensitive (action, sensitive); - g_object_set (action, "label", label, NULL); + gtk_action_set_label (action, label); action = ACTION (MAIL_ACCOUNT_EXPUNGE); sensitive = folder_is_trash; -- cgit v1.2.3