diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
| commit | 9918361aef9ad1360a0ed3a240cc58d6cd9e30f8 (patch) | |
| tree | 50bf24934b5ab3fefcc27913d1855a27c75e6d40 /shell/e-shell-searchbar.c | |
| parent | fa1bb9a17e11cf12ce02d9b49bba2753f6020ea0 (diff) | |
| parent | e64d6fe05c30c2cc1d7625a202afba3ba2da07cd (diff) | |
| download | gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.gz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.bz2 gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.lz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.xz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.zst gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.zip | |
Merge branch 'wip/gsettings'
Diffstat (limited to 'shell/e-shell-searchbar.c')
| -rw-r--r-- | shell/e-shell-searchbar.c | 9 |
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); |