aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-searchbar.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-23 07:22:14 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-23 09:43:04 +0800
commite64d6fe05c30c2cc1d7625a202afba3ba2da07cd (patch)
treef99df204ecdd5629acdc9f7e7b00d1c0d7903d6d /shell/e-shell-searchbar.c
parent2e60b6a4a21105bb4a1e2badd1be51b3e684d165 (diff)
downloadgsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.gz
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.bz2
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.lz
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.xz
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.zst
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.zip
Miscellaneous cleanups.
Diffstat (limited to 'shell/e-shell-searchbar.c')
-rw-r--r--shell/e-shell-searchbar.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 370d6b4f5e..ff3f06b403 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -39,6 +39,10 @@
#include "e-shell-window-actions.h"
+#define E_SHELL_SEARCHBAR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate))
+
#define SEARCH_OPTION_ADVANCED (-1)
/* Default "state key file" group: [Search Bar] */
@@ -629,7 +633,7 @@ shell_searchbar_dispose (GObject *object)
{
EShellSearchbarPrivate *priv;
- priv = E_SHELL_SEARCHBAR (object)->priv;
+ priv = E_SHELL_SEARCHBAR_GET_PRIVATE (object);
if (priv->shell_view != NULL) {
g_object_remove_weak_pointer (
@@ -911,8 +915,7 @@ e_shell_searchbar_init (EShellSearchbar *searchbar)
GtkLabel *label;
GtkWidget *widget;
- searchbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- searchbar, E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate);
+ searchbar->priv = E_SHELL_SEARCHBAR_GET_PRIVATE (searchbar);
gtk_box_set_spacing (GTK_BOX (searchbar), 24);