aboutsummaryrefslogtreecommitdiffstats
path: root/lib/widgets/ephy-zoom-control.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2003-09-02 07:20:17 +0800
committerChristian Persch <chpe@src.gnome.org>2003-09-02 07:20:17 +0800
commit73a95385f4034998cc78199dc8bb9ee22d90d6aa (patch)
tree499d78ab52e8937f672e3659105dda083a34c988 /lib/widgets/ephy-zoom-control.c
parent3375c1878c4c0ebf4f5067d128024ea484208f62 (diff)
downloadgsoc2013-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-zoom-control.c')
-rw-r--r--lib/widgets/ephy-zoom-control.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index 91c611012..6fe7dd9f6 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.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
@@ -33,6 +35,9 @@
/**
* Private data
*/
+
+#define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate))
+
struct _EphyZoomControlPrivate {
GtkWidget *option_menu;
float zoom;
@@ -191,7 +196,7 @@ ephy_zoom_control_init (EphyZoomControl *control)
GtkWidget *item, *menu, *box;
guint i;
- p = g_new0 (EphyZoomControlPrivate, 1);
+ p = EPHY_ZOOM_CONTROL_GET_PRIVATE (control);
control->priv = p;
p->zoom = 1.0;
@@ -325,6 +330,8 @@ ephy_zoom_control_class_init (EphyZoomControlClass *klass)
G_TYPE_NONE,
1,
G_TYPE_FLOAT);
+
+ g_type_class_add_private (object_class, sizeof (EphyZoomControlPrivate));
}
static void
@@ -334,12 +341,9 @@ ephy_zoom_control_finalize (GObject *o)
g_object_unref (control->priv->option_menu);
- g_free (control->priv);
-
G_OBJECT_CLASS (parent_class)->finalize (o);
}
-
void
ephy_zoom_control_set_zoom_level (EphyZoomControl *control, float zoom)
{