diff options
| author | Christian Persch <chpe@src.gnome.org> | 2003-09-02 07:20:17 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2003-09-02 07:20:17 +0800 |
| commit | 73a95385f4034998cc78199dc8bb9ee22d90d6aa (patch) | |
| tree | 499d78ab52e8937f672e3659105dda083a34c988 /lib/widgets/ephy-search-entry.c | |
| parent | 3375c1878c4c0ebf4f5067d128024ea484208f62 (diff) | |
| download | gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.tar gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.tar.gz gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.tar.bz2 gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.tar.lz gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.tar.xz gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.tar.zst gsoc2013-epiphany-73a95385f4034998cc78199dc8bb9ee22d90d6aa.zip | |
Mega-patch, changelog too long to paste here.
Diffstat (limited to 'lib/widgets/ephy-search-entry.c')
| -rw-r--r-- | lib/widgets/ephy-search-entry.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c index e1b106594..1e8a9e096 100644 --- a/lib/widgets/ephy-search-entry.c +++ b/lib/widgets/ephy-search-entry.c @@ -27,7 +27,8 @@ static void ephy_search_entry_class_init (EphySearchEntryClass *klass); static void ephy_search_entry_init (EphySearchEntry *entry); -static void ephy_search_entry_finalize (GObject *object); + +#define EPHY_SEARCH_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SEARCH_ENTRY, EphySearchEntryPrivate)) struct EphySearchEntryPrivate { @@ -81,8 +82,6 @@ ephy_search_entry_class_init (EphySearchEntryClass *klass) parent_class = g_type_class_peek_parent (klass); - object_class->finalize = ephy_search_entry_finalize; - ephy_search_entry_signals[SEARCH] = g_signal_new ("search", G_OBJECT_CLASS_TYPE (object_class), @@ -93,6 +92,8 @@ ephy_search_entry_class_init (EphySearchEntryClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING); + + g_type_class_add_private (object_class, sizeof (EphySearchEntryPrivate)); } static gboolean @@ -139,7 +140,10 @@ ephy_search_entry_destroy_cb (GtkEditable *editable, static void ephy_search_entry_init (EphySearchEntry *entry) { - entry->priv = g_new0 (EphySearchEntryPrivate, 1); + entry->priv = EPHY_SEARCH_ENTRY_GET_PRIVATE (entry); + + entry->priv->clearing = FALSE; + entry->priv->timeout = 0; g_signal_connect (G_OBJECT (entry), "destroy", @@ -151,23 +155,6 @@ ephy_search_entry_init (EphySearchEntry *entry) entry); } -static void -ephy_search_entry_finalize (GObject *object) -{ - EphySearchEntry *entry; - - g_return_if_fail (object != NULL); - g_return_if_fail (EPHY_IS_SEARCH_ENTRY (object)); - - entry = EPHY_SEARCH_ENTRY (object); - - g_return_if_fail (entry->priv != NULL); - - g_free (entry->priv); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - GtkWidget * ephy_search_entry_new (void) { |