diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-25 05:36:21 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:42:20 +0800 |
commit | 6e6da8a4080c4606529603ad9a90489509bea105 (patch) | |
tree | ba6161fc5b5abc0c514004ea5fafa6424a46f224 /modules/mail/e-mail-shell-view-actions.c | |
parent | 851a872865769d1d53e495fd1d0b82f0452594c4 (diff) | |
download | gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.tar gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.tar.gz gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.tar.bz2 gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.tar.lz gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.tar.xz gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.tar.zst gsoc2013-evolution-6e6da8a4080c4606529603ad9a90489509bea105.zip |
Use em_folder_tree_get_selected() in places to simplify code.
There were a few places where we were accessing the folder tree model
directly to get the selected store + folder name, or were asking for the
selected URI only to parse back into its store + folder name components.
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
-rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 7c55908b31..c5f155de15 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -451,24 +451,20 @@ action_mail_folder_properties_cb (GtkAction *action, EMailShellSidebar *mail_shell_sidebar; EMFolderTree *folder_tree; EShellView *shell_view; - GtkTreeSelection *selection; - GtkTreeView *tree_view; - GtkTreeModel *model; - GtkTreeIter iter; - gchar *uri; + CamelStore *store; + gchar *folder_name; shell_view = E_SHELL_VIEW (mail_shell_view); mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar; folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); - tree_view = GTK_TREE_VIEW (folder_tree); - selection = gtk_tree_view_get_selection (tree_view); - if (!gtk_tree_selection_get_selected (selection, &model, &iter)) - return; + if (!em_folder_tree_get_selected (folder_tree, &store, &folder_name)) + g_return_if_reached (); - gtk_tree_model_get (model, &iter, COL_STRING_URI, &uri, -1); - em_folder_properties_show (shell_view, uri); - g_free (uri); + em_folder_properties_show (shell_view, store, folder_name); + + g_object_unref (store); + g_free (folder_name); } static void |