diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
| commit | 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a (patch) | |
| tree | 8d5f3985a82ec7d330af27ee0a29a79a2f0ecfa3 /shell/e-shell-taskbar.c | |
| parent | 1a4be6c521d674c4a60e54203521e2721b81b921 (diff) | |
| download | gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.gz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.zst gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.zip | |
Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly
Diffstat (limited to 'shell/e-shell-taskbar.c')
| -rw-r--r-- | shell/e-shell-taskbar.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c index 8b8cc1d4a7..f4621fc780 100644 --- a/shell/e-shell-taskbar.c +++ b/shell/e-shell-taskbar.c @@ -32,10 +32,6 @@ #include <e-util/e-extensible.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 */ @@ -202,7 +198,7 @@ shell_taskbar_dispose (GObject *object) { EShellTaskbarPrivate *priv; - priv = E_SHELL_TASKBAR_GET_PRIVATE (object); + priv = E_SHELL_TASKBAR (object)->priv; g_hash_table_foreach_remove ( priv->proxy_table, (GHRFunc) @@ -241,7 +237,7 @@ shell_taskbar_finalize (GObject *object) { EShellTaskbarPrivate *priv; - priv = E_SHELL_TASKBAR_GET_PRIVATE (object); + priv = E_SHELL_TASKBAR (object)->priv; g_hash_table_destroy (priv->proxy_table); @@ -330,7 +326,7 @@ e_shell_taskbar_init (EShellTaskbar *shell_taskbar) GtkWidget *widget; gint height; - shell_taskbar->priv = E_SHELL_TASKBAR_GET_PRIVATE (shell_taskbar); + shell_taskbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_taskbar, E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate); shell_taskbar->priv->proxy_table = g_hash_table_new (NULL, NULL); gtk_box_set_spacing (GTK_BOX (shell_taskbar), 12); |