diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-02-07 16:59:42 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-02-07 16:59:42 +0000 |
| commit | ac6c3719975925a8506ff7f7b36f359fb3a3298b (patch) | |
| tree | 49243d2aab8c81e54c86a4180e3ec64ee9565743 /gtk/gtklabel.c | |
| parent | d95069aa1f486cda06b0e78d1d67f857d7ef1b59 (diff) | |
| download | gdk-pixbuf-ac6c3719975925a8506ff7f7b36f359fb3a3298b.tar.gz | |
gtk/gtkcellview.c gtk/gtklabel.c gtk/gtklayout.c gtk/gtklist.c
2008-02-07 Michael Natterer <mitch@imendio.com>
* gtk/gtkcellview.c
* gtk/gtklabel.c
* gtk/gtklayout.c
* gtk/gtklist.c
* gtk/gtkmenu.c
* gtk/gtkmenushell.c
* gtk/gtkmisc.c
* gtk/gtkoptionmenu.c
* gtk/gtkplug.c
* gtk/gtkpreview.c
* gtk/gtkprogress.c
* gtk/gtkradiomenuitem.c
* gtk/gtkscale.c
* gtk/gtkscrolledwindow.c
* gtk/gtksocket.c: remove g_return_if_fail() from private
functions and virtual function implementations.
svn path=/trunk/; revision=19492
Diffstat (limited to 'gtk/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index dd2cea3ec..814b5369e 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1883,12 +1883,8 @@ gtk_label_destroy (GtkObject *object) static void gtk_label_finalize (GObject *object) { - GtkLabel *label; - - g_return_if_fail (GTK_IS_LABEL (object)); - - label = GTK_LABEL (object); - + GtkLabel *label = GTK_LABEL (object); + g_free (label->label); g_free (label->text); @@ -2136,16 +2132,12 @@ static void gtk_label_size_request (GtkWidget *widget, GtkRequisition *requisition) { - GtkLabel *label; + GtkLabel *label = GTK_LABEL (widget); GtkLabelPrivate *priv; gint width, height; PangoRectangle logical_rect; GtkWidgetAuxInfo *aux_info; - - g_return_if_fail (GTK_IS_LABEL (widget)); - g_return_if_fail (requisition != NULL); - - label = GTK_LABEL (widget); + priv = GTK_LABEL_GET_PRIVATE (widget); /* @@ -2295,11 +2287,7 @@ static void gtk_label_style_set (GtkWidget *widget, GtkStyle *previous_style) { - GtkLabel *label; - - g_return_if_fail (GTK_IS_LABEL (widget)); - - label = GTK_LABEL (widget); + GtkLabel *label = GTK_LABEL (widget); /* We have to clear the layout, fonts etc. may have changed */ gtk_label_clear_layout (label); |