aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ephy-encoding-dialog.c10
-rw-r--r--src/ephy-encoding-menu.c2
2 files changed, 2 insertions, 10 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 7c6efd7f6..c61db7b46 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -107,14 +107,6 @@ ephy_encoding_dialog_get_type (void)
return ephy_type_encoding_dialog;
}
-static gboolean
-encoding_is_automatic (EphyEncodingInfo *info)
-{
- g_return_val_if_fail (info != NULL, FALSE);
-
- return (info->encoding_source < EMBED_ENCODING_PARENT_FORCED);
-}
-
static void
sync_embed_cb (EphyEncodingDialog *dialog, GParamSpec *pspec, gpointer dummy)
{
@@ -159,7 +151,7 @@ sync_embed_cb (EphyEncodingDialog *dialog, GParamSpec *pspec, gpointer dummy)
g_list_free (rows);
}
- is_automatic = encoding_is_automatic (info);
+ is_automatic = ephy_encoding_info_is_automatic (info);
button = ephy_dialog_get_control (EPHY_DIALOG (dialog), properties[AUTOMATIC_PROP].id);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), is_automatic);
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 4c5901bf4..2b26d4fb7 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -200,7 +200,7 @@ update_encoding_menu_cb (GtkAction *dummy, EphyEncodingMenu *menu)
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
/* check if encoding was overridden */
- is_automatic = (info->encoding_source < EMBED_ENCODING_PARENT_FORCED);
+ is_automatic = ephy_encoding_info_is_automatic (info);
action = gtk_action_group_get_action (p->action_group,
"ViewEncodingAutomatic");