Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emoji chooser: break out a helper function

Browse Source 
This is just a small cleanup.
This commit is contained in:
Matthias Clasen
2017-11-19 22:40:07 -05:00
committed by Daniel Boles
parent d3eacaf840
commit 55e8736613
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkemojichooser.c
View File

@@ -226,26 +226,12 @@ emoji_activated (GtkFlowBox *box,
g_free (text);
}
static void
show_variations (GtkEmojiChooser *chooser,
GtkWidget *child)
static gboolean
has_variations (GVariant *emoji_data)
{
GtkWidget *popover;
GtkWidget *view;
GtkWidget *box;
GVariant *emoji_data;
GtkWidget *parent_popover;
GVariant *codes;
int i;
gboolean has_variations;
gunichar modifier;
if (!child)
return;
emoji_data = (GVariant*) g_object_get_data (G_OBJECT (child), "emoji-data");
if (!emoji_data)
return;
has_variations = FALSE;
codes = g_variant_get_child_value (emoji_data, 0);
@@ -260,7 +246,29 @@ show_variations (GtkEmojiChooser *chooser,
}
}
g_variant_unref (codes);
if (!has_variations)
return has_variations;
}
static void
show_variations (GtkEmojiChooser *chooser,
GtkWidget *child)
{
GtkWidget *popover;
GtkWidget *view;
GtkWidget *box;
GVariant *emoji_data;
GtkWidget *parent_popover;
gunichar modifier;
if (!child)
return;
emoji_data = (GVariant*) g_object_get_data (G_OBJECT (child), "emoji-data");
if (!emoji_data)
return;
if (!has_variations (emoji_data))
return;
parent_popover = gtk_widget_get_ancestor (child, GTK_TYPE_POPOVER);