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

Revert spurious commit on GtkLinkButton

Browse Source 
svn path=/trunk/; revision=19510
This commit is contained in:
Emmanuele Bassi
2008-02-11 09:55:29 +00:00
parent 48c87e3e17
commit 25f92d5f1b
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtklinkbutton.c
View File

@ -538,8 +538,8 @@ gtk_link_button_new (const gchar *uri)
} }
retval = g_object_new (GTK_TYPE_LINK_BUTTON, retval = g_object_new (GTK_TYPE_LINK_BUTTON,
"label", utf8_uri,
"uri", uri, "uri", uri,
"label", utf8_uri,
NULL); NULL);
g_free (utf8_uri); g_free (utf8_uri);
@ -590,24 +590,17 @@ void
gtk_link_button_set_uri (GtkLinkButton *link_button, gtk_link_button_set_uri (GtkLinkButton *link_button,
const gchar *uri) const gchar *uri)
{ {
GtkLinkButtonPrivate *priv;
const gchar *label;
gchar *tmp; gchar *tmp;
g_return_if_fail (GTK_IS_LINK_BUTTON (link_button)); g_return_if_fail (GTK_IS_LINK_BUTTON (link_button));
g_return_if_fail (uri != NULL); g_return_if_fail (uri != NULL);
tmp = link_button->priv->uri;
link_button->priv->uri = g_strdup (uri);
g_free (tmp);
priv = link_button->priv; link_button->priv->visited = FALSE;
g_free (priv->uri);
priv->uri = g_strdup (uri);
label = gtk_button_get_label (GTK_BUTTON (link_button));
if (label && *label != '\0' && strcmp (label, uri) != 0)
gtk_widget_set_tooltip_text (GTK_WIDGET (link_button), uri);
priv->visited = FALSE;
g_object_notify (G_OBJECT (link_button), "uri"); g_object_notify (G_OBJECT (link_button), "uri");
} }