AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

label: Inline function into only caller

Browse Source
This commit is contained in:
Timm Bäder 2020-04-14 09:20:00 +02:00
parent db9fbb3918
commit 9ad0dbb145
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtklabel.c
View File

@ -519,7 +519,6 @@ static void gtk_label_clear_links (GtkLabel *self);
static gboolean gtk_label_activate_link (GtkLabel *self, static gboolean gtk_label_activate_link (GtkLabel *self,
const gchar *uri); const gchar *uri);
static void gtk_label_activate_current_link (GtkLabel *self); static void gtk_label_activate_current_link (GtkLabel *self);
static GtkLabelLink *gtk_label_get_current_link (GtkLabel *self);
static void emit_activate_link (GtkLabel *self, static void emit_activate_link (GtkLabel *self,
GtkLabelLink *link); GtkLabelLink *link);
@ -5469,22 +5468,6 @@ gtk_label_activate_current_link (GtkLabel *self)
gtk_widget_activate_default (widget); gtk_widget_activate_default (widget);
} }
static GtkLabelLink *
gtk_label_get_current_link (GtkLabel *self)
{
GtkLabelLink *link;
if (!self->select_info)
return NULL;
if (self->select_info->link_clicked)
link = self->select_info->active_link;
else
link = gtk_label_get_focus_link (self, NULL);
return link;
}
/** /**
* gtk_label_get_current_uri: * gtk_label_get_current_uri:
* @label: a #GtkLabel * @label: a #GtkLabel
@ -5503,11 +5486,17 @@ gtk_label_get_current_link (GtkLabel *self)
const gchar * const gchar *
gtk_label_get_current_uri (GtkLabel *self) gtk_label_get_current_uri (GtkLabel *self)
{ {
GtkLabelLink *link; const GtkLabelLink *link;
g_return_val_if_fail (GTK_IS_LABEL (self), NULL); g_return_val_if_fail (GTK_IS_LABEL (self), NULL);
link = gtk_label_get_current_link (self); if (!self->select_info)
return NULL;
if (self->select_info->link_clicked)
link = self->select_info->active_link;
else
link = gtk_label_get_focus_link (self, NULL);
if (link) if (link)
return link->uri; return link->uri;