aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-03-28 05:58:32 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:50 +0800
commitcb8915bcaa591e15c405a175e6904528ae9a446f (patch)
tree4d7bfb328c4ad0e51b1603dcc755f293f8c07b47 /modules/mail
parent392973975c3e4a4e8fe17731b5e397ae10a91517 (diff)
downloadgsoc2013-evolution-cb8915bcaa591e15c405a175e6904528ae9a446f.tar.gz
gsoc2013-evolution-cb8915bcaa591e15c405a175e6904528ae9a446f.tar.zst
gsoc2013-evolution-cb8915bcaa591e15c405a175e6904528ae9a446f.zip
Miscellaneous GtkAction-related cleanups.
Prefer the newer GtkAction "set" functions over g_object_set().
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-backend.c5
-rw-r--r--modules/mail/e-mail-shell-view.c2
2 files changed, 4 insertions, 3 deletions
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;