diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
| commit | 9918361aef9ad1360a0ed3a240cc58d6cd9e30f8 (patch) | |
| tree | 50bf24934b5ab3fefcc27913d1855a27c75e6d40 /shell/e-shell-taskbar.c | |
| parent | fa1bb9a17e11cf12ce02d9b49bba2753f6020ea0 (diff) | |
| parent | e64d6fe05c30c2cc1d7625a202afba3ba2da07cd (diff) | |
| download | gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.gz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.bz2 gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.lz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.xz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.zst gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.zip | |
Merge branch 'wip/gsettings'
Diffstat (limited to 'shell/e-shell-taskbar.c')
| -rw-r--r-- | shell/e-shell-taskbar.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c index adc0d27980..3dd995ded1 100644 --- a/shell/e-shell-taskbar.c +++ b/shell/e-shell-taskbar.c @@ -36,6 +36,10 @@ #include <e-shell-view.h> #include <misc/e-activity-proxy.h> +#define E_SHELL_TASKBAR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate)) + struct _EShellTaskbarPrivate { gpointer shell_view; /* weak pointer */ @@ -204,7 +208,7 @@ shell_taskbar_dispose (GObject *object) { EShellTaskbarPrivate *priv; - priv = E_SHELL_TASKBAR (object)->priv; + priv = E_SHELL_TASKBAR_GET_PRIVATE (object); g_hash_table_foreach_remove ( priv->proxy_table, (GHRFunc) @@ -243,7 +247,7 @@ shell_taskbar_finalize (GObject *object) { EShellTaskbarPrivate *priv; - priv = E_SHELL_TASKBAR (object)->priv; + priv = E_SHELL_TASKBAR_GET_PRIVATE (object); g_hash_table_destroy (priv->proxy_table); @@ -371,8 +375,7 @@ e_shell_taskbar_init (EShellTaskbar *shell_taskbar) { GtkWidget *widget; - shell_taskbar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - shell_taskbar, E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate); + shell_taskbar->priv = E_SHELL_TASKBAR_GET_PRIVATE (shell_taskbar); shell_taskbar->priv->proxy_table = g_hash_table_new (NULL, NULL); gtk_box_set_spacing (GTK_BOX (shell_taskbar), 12); |