From 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- widgets/misc/e-attachment-paned.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'widgets/misc/e-attachment-paned.c') diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 0eaada1e8e..21d736b50b 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -30,10 +30,6 @@ #include "e-attachment-icon-view.h" #include "e-attachment-tree-view.h" -#define E_ATTACHMENT_PANED_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate)) - #define NUM_VIEWS 2 /* Initial height of the lower pane. */ @@ -222,7 +218,7 @@ attachment_paned_dispose (GObject *object) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (object); + priv = E_ATTACHMENT_PANED (object)->priv; if (priv->model != NULL) { g_object_unref (priv->model); @@ -285,7 +281,7 @@ attachment_paned_constructed (GObject *object) GConfBridge *bridge; const gchar *key; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (object); + priv = E_ATTACHMENT_PANED (object)->priv; bridge = gconf_bridge_get (); @@ -359,7 +355,7 @@ attachment_paned_get_private (EAttachmentView *view) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_private (view); @@ -370,7 +366,7 @@ attachment_paned_get_store (EAttachmentView *view) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_store (view); @@ -383,7 +379,7 @@ attachment_paned_get_path_at_pos (EAttachmentView *view, { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_path_at_pos (view, x, y); @@ -394,7 +390,7 @@ attachment_paned_get_selected_paths (EAttachmentView *view) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_get_selected_paths (view); @@ -406,7 +402,7 @@ attachment_paned_path_is_selected (EAttachmentView *view, { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); return e_attachment_view_path_is_selected (view, path); @@ -418,7 +414,7 @@ attachment_paned_select_path (EAttachmentView *view, { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_select_path (view, path); @@ -430,7 +426,7 @@ attachment_paned_unselect_path (EAttachmentView *view, { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_unselect_path (view, path); @@ -441,7 +437,7 @@ attachment_paned_select_all (EAttachmentView *view) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_select_all (view); @@ -452,7 +448,7 @@ attachment_paned_unselect_all (EAttachmentView *view) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_unselect_all (view); @@ -463,7 +459,7 @@ attachment_paned_update_actions (EAttachmentView *view) { EAttachmentPanedPrivate *priv; - priv = E_ATTACHMENT_PANED_GET_PRIVATE (view); + priv = E_ATTACHMENT_PANED (view)->priv; view = E_ATTACHMENT_VIEW (priv->icon_view); e_attachment_view_update_actions (view); @@ -522,7 +518,7 @@ e_attachment_paned_init (EAttachmentPaned *paned) GtkWidget *widget; GtkAction *action; - paned->priv = E_ATTACHMENT_PANED_GET_PRIVATE (paned); + paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate); paned->priv->model = e_attachment_store_new (); /* Keep the expander label and combo box the same height. */ -- cgit v1.2.3