callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

label: Rename variable

Browse Source 
The effective attributes aren't that anymore. They're now just the
attributes from the parsed markup.
This commit is contained in:
Benjamin Otte 2012-01-06 05:07:36 +01:00
parent f1c9a3e633
commit e78e4d8dd8
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtklabel.c
View File

@ -243,7 +243,7 @@ struct _GtkLabelPrivate
GtkWindow *mnemonic_window; GtkWindow *mnemonic_window;
PangoAttrList *attrs; PangoAttrList *attrs;
PangoAttrList *effective_attrs; PangoAttrList *markup_attrs;
PangoLayout *layout; PangoLayout *layout;
gchar *label; gchar *label;
@ -2080,9 +2080,9 @@ gtk_label_recalculate (GtkLabel *label)
{ {
if (!priv->pattern_set) if (!priv->pattern_set)
{ {
if (priv->effective_attrs) if (priv->markup_attrs)
pango_attr_list_unref (priv->effective_attrs); pango_attr_list_unref (priv->markup_attrs);
priv->effective_attrs = NULL; priv->markup_attrs = NULL;
} }
gtk_label_set_text_internal (label, g_strdup (priv->label)); gtk_label_set_text_internal (label, g_strdup (priv->label));
} }
@ -2593,9 +2593,9 @@ gtk_label_set_markup_internal (GtkLabel *label,
if (attrs) if (attrs)
{ {
if (priv->effective_attrs) if (priv->markup_attrs)
pango_attr_list_unref (priv->effective_attrs); pango_attr_list_unref (priv->markup_attrs);
priv->effective_attrs = attrs; priv->markup_attrs = attrs;
} }
if (accel_char != 0) if (accel_char != 0)
@ -2763,9 +2763,9 @@ gtk_label_set_pattern_internal (GtkLabel *label,
else else
attrs = gtk_label_pattern_to_attrs (label, pattern); attrs = gtk_label_pattern_to_attrs (label, pattern);
if (priv->effective_attrs) if (priv->markup_attrs)
pango_attr_list_unref (priv->effective_attrs); pango_attr_list_unref (priv->markup_attrs);
priv->effective_attrs = attrs; priv->markup_attrs = attrs;
} }
/** /**
@ -3125,8 +3125,8 @@ gtk_label_finalize (GObject *object)
if (priv->attrs) if (priv->attrs)
pango_attr_list_unref (priv->attrs); pango_attr_list_unref (priv->attrs);
if (priv->effective_attrs) if (priv->markup_attrs)
pango_attr_list_unref (priv->effective_attrs); pango_attr_list_unref (priv->markup_attrs);
gtk_label_clear_links (label); gtk_label_clear_links (label);
g_free (priv->select_info); g_free (priv->select_info);
@ -3404,17 +3404,17 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_attr_list_insert (attrs, attribute); pango_attr_list_insert (attrs, attribute);
} }
} }
else if (priv->effective_attrs && priv->effective_attrs) else if (priv->markup_attrs && priv->markup_attrs)
attrs = pango_attr_list_new (); attrs = pango_attr_list_new ();
else else
attrs = NULL; attrs = NULL;
if (priv->effective_attrs) if (priv->markup_attrs)
{ {
if (attrs) if (attrs)
my_pango_attr_list_merge (attrs, priv->effective_attrs); my_pango_attr_list_merge (attrs, priv->markup_attrs);
else else
attrs = pango_attr_list_ref (priv->effective_attrs); attrs = pango_attr_list_ref (priv->markup_attrs);
} }
if (priv->attrs) if (priv->attrs)