diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-09-27 13:13:42 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-09-27 21:31:13 +0800 |
| commit | e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd (patch) | |
| tree | d2d2ce8eb509717d412ad3171059e470ff0e7030 /shell/e-shell.c | |
| parent | c520043a094d81d222aa0c3e23b0035ddb89d0bf (diff) | |
| download | gsoc2013-evolution-e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd.tar.gz gsoc2013-evolution-e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd.tar.zst gsoc2013-evolution-e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd.zip | |
Miscellaneous cleanups from the account-mgmt branch.
Reducing diff noise so I can see important changes easier when comparing
branches. A few API changes, but nothing that affects functionality.
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 2954765d15..dce7b21070 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -46,6 +46,10 @@ #include "e-shell-window.h" #include "e-shell-utils.h" +#define E_SHELL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL, EShellPrivate)) + struct _EShellPrivate { GQueue alerts; GList *watched_windows; @@ -739,7 +743,7 @@ shell_dispose (GObject *object) EShellPrivate *priv; EAlert *alert; - priv = E_SHELL (object)->priv; + priv = E_SHELL_GET_PRIVATE (object); while ((alert = g_queue_pop_head (&priv->alerts)) != NULL) { g_signal_handlers_disconnect_by_func ( @@ -787,7 +791,7 @@ shell_finalize (GObject *object) { EShellPrivate *priv; - priv = E_SHELL (object)->priv; + priv = E_SHELL_GET_PRIVATE (object); g_hash_table_destroy (priv->backends_by_name); g_hash_table_destroy (priv->backends_by_scheme); @@ -1226,8 +1230,7 @@ e_shell_init (EShell *shell) GtkIconTheme *icon_theme; EggSMClient *sm_client; - shell->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - shell, E_TYPE_SHELL, EShellPrivate); + shell->priv = E_SHELL_GET_PRIVATE (shell); backends_by_name = g_hash_table_new (g_str_hash, g_str_equal); backends_by_scheme = g_hash_table_new (g_str_hash, g_str_equal); |