diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-08-14 08:49:46 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-08-14 08:56:33 +0800 |
| commit | 6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f (patch) | |
| tree | 8ac6832a905017845b3095112b83bb14da112617 /modules/addressbook/e-book-shell-view-actions.c | |
| parent | caed9460b2d518005abe34035d5b414ff07c0212 (diff) | |
| download | gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.gz gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.bz2 gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.lz gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.xz gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.tar.zst gsoc2013-evolution-6cb0cbd0be5791aa0af1f78ce44c7a6563611d8f.zip | |
Pass an EShell to EMsgComposer instances.
Reduce the composer's dependency on e_shell_get_default().
Diffstat (limited to 'modules/addressbook/e-book-shell-view-actions.c')
| -rw-r--r-- | modules/addressbook/e-book-shell-view-actions.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index 6bb9d7036b..9008002c33 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -358,10 +358,17 @@ static void action_contact_forward_cb (GtkAction *action, EBookShellView *book_shell_view) { + EShell *shell; + EShellView *shell_view; + EShellWindow *shell_window; EBookShellContent *book_shell_content; EAddressbookView *view; GList *list, *iter; + shell_view = E_SHELL_VIEW (book_shell_view); + shell_window = e_shell_view_get_shell_window (shell_view); + shell = e_shell_window_get_shell (shell_window); + book_shell_content = book_shell_view->priv->book_shell_content; view = e_book_shell_content_get_current_view (book_shell_content); g_return_if_fail (view != NULL); @@ -381,7 +388,8 @@ action_contact_forward_cb (GtkAction *action, iter->data = destination; } - eab_send_as_attachment (list); + eab_send_as_attachment (shell, list); + g_list_foreach (list, (GFunc) g_object_unref, NULL); g_list_free (list); } @@ -581,10 +589,17 @@ static void action_contact_send_message_cb (GtkAction *action, EBookShellView *book_shell_view) { + EShell *shell; + EShellView *shell_view; + EShellWindow *shell_window; EBookShellContent *book_shell_content; EAddressbookView *view; GList *list, *iter; + shell_view = E_SHELL_VIEW (book_shell_view); + shell_window = e_shell_view_get_shell_window (shell_view); + shell = e_shell_window_get_shell (shell_window); + book_shell_content = book_shell_view->priv->book_shell_content; view = e_book_shell_content_get_current_view (book_shell_content); g_return_if_fail (view != NULL); @@ -604,7 +619,8 @@ action_contact_send_message_cb (GtkAction *action, iter->data = destination; } - eab_send_as_to (list); + eab_send_as_to (shell, list); + g_list_foreach (list, (GFunc) g_object_unref, NULL); g_list_free (list); } |