diff options
author | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:39 +0800 |
commit | c003c99a75587ba39a45d164272760c33f9666b5 (patch) | |
tree | ad6d0583fa9e8f078fb1c118f994371d2f1f79d8 /shell/e-shell-taskbar.c | |
parent | f55aaa5e00a40a137f403a8d5c68dd508059b0b4 (diff) | |
download | gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.tar gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.tar.gz gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.tar.bz2 gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.tar.lz gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.tar.xz gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.tar.zst gsoc2013-evolution-c003c99a75587ba39a45d164272760c33f9666b5.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); |