[gtk+] Do not initialize the priv pointer before check type
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Do not initialize the priv pointer before check type
- Date: Wed, 6 Jul 2011 13:26:37 +0000 (UTC)
commit ad0c0b8eb38c83b9da5cdd066d64f5602c0ee99a
Author: Javier Jardon <jjardon gnome org>
Date: Wed Jul 6 14:25:06 2011 +0100
Do not initialize the priv pointer before check type
gtk/gtkhsv.c | 16 ++++++++--------
gtk/gtklabel.c | 2 +-
gtk/gtkliststore.c | 2 +-
gtk/gtktable.c | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 78be592..cc01373 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -1360,18 +1360,18 @@ gtk_hsv_get_color (GtkHSV *hsv,
double *s,
double *v)
{
- GtkHSVPrivate *priv = hsv->priv;
+ GtkHSVPrivate *priv;
g_return_if_fail (GTK_IS_HSV (hsv));
priv = hsv->priv;
-
+
if (h)
*h = priv->h;
-
+
if (s)
*s = priv->s;
-
+
if (v)
*v = priv->v;
}
@@ -1391,7 +1391,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
gint size,
gint ring_width)
{
- GtkHSVPrivate *priv = hsv->priv;
+ GtkHSVPrivate *priv;
int same_size;
g_return_if_fail (GTK_IS_HSV (hsv));
@@ -1402,7 +1402,7 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
priv = hsv->priv;
same_size = (priv->size == size);
-
+
priv->size = size;
priv->ring_width = ring_width;
@@ -1427,7 +1427,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
gint *size,
gint *ring_width)
{
- GtkHSVPrivate *priv = hsv->priv;
+ GtkHSVPrivate *priv;
g_return_if_fail (GTK_IS_HSV (hsv));
@@ -1458,7 +1458,7 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
gboolean
gtk_hsv_is_adjusting (GtkHSV *hsv)
{
- GtkHSVPrivate *priv = hsv->priv;
+ GtkHSVPrivate *priv;
g_return_val_if_fail (GTK_IS_HSV (hsv), FALSE);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 313da19..0b7ee88 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2820,7 +2820,7 @@ void
gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern)
{
- GtkLabelPrivate *priv = label->priv;
+ GtkLabelPrivate *priv;
g_return_if_fail (GTK_IS_LABEL (label));
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 1844a8b..b6533e4 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -939,7 +939,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
gint column,
GValue *value)
{
- GtkListStorePrivate *priv = list_store->priv;
+ GtkListStorePrivate *priv;
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter_is_valid (iter, list_store));
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index ab8c826..dee3d34 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -750,9 +750,9 @@ gtk_table_attach (GtkTable *table,
guint xpadding,
guint ypadding)
{
- GtkTablePrivate *priv = table->priv;
+ GtkTablePrivate *priv;
GtkTableChild *table_child;
-
+
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (gtk_widget_get_parent (child) == NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]