aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-18 22:09:48 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-23 03:50:09 +0800
commit0c83b9b25d967ce6d6793ef851e86bc272a2f129 (patch)
treed97a5083bd6a03c273f744a60b56205dcf2befaf /shell/e-shell.c
parentc75f58d01bb7bbe139cd73a85894dc5f50185816 (diff)
downloadgsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar
gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.gz
gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.bz2
gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.lz
gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.xz
gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.tar.zst
gsoc2013-evolution-0c83b9b25d967ce6d6793ef851e86bc272a2f129.zip
Miscellaneous cleanups.
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ccc57f825c..cc1591337f 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;
EShellSettings *settings;
@@ -693,7 +697,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 (
@@ -747,7 +751,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);
@@ -1162,8 +1166,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);