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 /src/ephy-encoding-menu.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 'src/ephy-encoding-menu.c')
| -rw-r--r-- | src/ephy-encoding-menu.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index d9769e87b..f713c168b 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifdef HAVE_CONFIG_H @@ -32,6 +34,9 @@ /** * Private data */ + +#define EPHY_ENCODING_MENU_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ENCODING_MENU, EphyEncodingMenuPrivate)) + struct _EphyEncodingMenuPrivate { EphyWindow *window; @@ -105,14 +110,17 @@ ephy_encoding_menu_class_init (EphyEncodingMenuClass *klass) g_param_spec_object ("EphyWindow", "EphyWindow", "Parent window", - EPHY_WINDOW_TYPE, - G_PARAM_READWRITE)); + EPHY_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + g_type_class_add_private (object_class, sizeof(EphyEncodingMenuPrivate)); } static void ephy_encoding_menu_init (EphyEncodingMenu *wrhm) { - EphyEncodingMenuPrivate *p = g_new0 (EphyEncodingMenuPrivate, 1); + EphyEncodingMenuPrivate *p = EPHY_ENCODING_MENU_GET_PRIVATE (wrhm); wrhm->priv = p; wrhm->priv->action_group = NULL; @@ -132,8 +140,6 @@ ephy_encoding_menu_finalize_impl (GObject *o) g_object_unref (p->action_group); } - g_free (p); - G_OBJECT_CLASS (g_object_class)->finalize (o); } |