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 /widgets/misc/e-web-view.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 'widgets/misc/e-web-view.c')
| -rw-r--r-- | widgets/misc/e-web-view.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index afc0476ad5..d227a720ad 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -34,10 +34,6 @@ #include "e-popup-action.h" #include "e-selectable.h" -#define E_WEB_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_WEB_VIEW, EWebViewPrivate)) - typedef struct _EWebViewRequest EWebViewRequest; struct _EWebViewPrivate { @@ -674,7 +670,7 @@ web_view_dispose (GObject *object) { EWebViewPrivate *priv; - priv = E_WEB_VIEW_GET_PRIVATE (object); + priv = E_WEB_VIEW (object)->priv; if (priv->ui_manager != NULL) { g_object_unref (priv->ui_manager); @@ -715,7 +711,7 @@ web_view_finalize (GObject *object) { EWebViewPrivate *priv; - priv = E_WEB_VIEW_GET_PRIVATE (object); + priv = E_WEB_VIEW (object)->priv; /* All URI requests should be complete or cancelled by now. */ if (priv->requests != NULL) @@ -1362,7 +1358,7 @@ e_web_view_init (EWebView *web_view) const gchar *id; GError *error = NULL; - web_view->priv = E_WEB_VIEW_GET_PRIVATE (web_view); + web_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (web_view, E_TYPE_WEB_VIEW, EWebViewPrivate); ui_manager = gtk_ui_manager_new (); web_view->priv->ui_manager = ui_manager; |