aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-search-bar.c
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc/e-search-bar.c')
-rw-r--r--widgets/misc/e-search-bar.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 59476a61e1..0f83fd9683 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -25,10 +25,6 @@
#include <gdk/gdkkeysyms.h>
#include <gtkhtml/gtkhtml-search.h>
-#define E_SEARCH_BAR_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_SEARCH_BAR, ESearchBarPrivate))
-
struct _ESearchBarPrivate {
EWebView *web_view;
GtkWidget *entry;
@@ -314,7 +310,7 @@ search_bar_dispose (GObject *object)
{
ESearchBarPrivate *priv;
- priv = E_SEARCH_BAR_GET_PRIVATE (object);
+ priv = E_SEARCH_BAR (object)->priv;
if (priv->web_view != NULL) {
g_object_unref (priv->web_view);
@@ -360,7 +356,7 @@ search_bar_finalize (GObject *object)
{
ESearchBarPrivate *priv;
- priv = E_SEARCH_BAR_GET_PRIVATE (object);
+ priv = E_SEARCH_BAR (object)->priv;
g_free (priv->active_search);
@@ -373,7 +369,7 @@ search_bar_constructed (GObject *object)
{
ESearchBarPrivate *priv;
- priv = E_SEARCH_BAR_GET_PRIVATE (object);
+ priv = E_SEARCH_BAR (object)->priv;
g_object_bind_property (
object, "case-sensitive",
@@ -535,7 +531,7 @@ e_search_bar_init (ESearchBar *search_bar)
GtkWidget *widget;
GtkWidget *container;
- search_bar->priv = E_SEARCH_BAR_GET_PRIVATE (search_bar);
+ search_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (search_bar, E_TYPE_SEARCH_BAR, ESearchBarPrivate);
search_bar->priv->tokenizer = e_searching_tokenizer_new ();
g_signal_connect_swapped (