diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2003-12-18 23:58:01 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2003-12-18 23:58:01 +0800 |
| commit | aba053264da43f60b0628077e79cd52e3d78394a (patch) | |
| tree | 5aa84f8f32a792c138a1528c8c15926a80e29062 /src | |
| parent | 9266e975fc38af05bf2a7d1329d7b530ef2c6ba0 (diff) | |
| download | gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.tar gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.tar.gz gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.tar.bz2 gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.tar.lz gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.tar.xz gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.tar.zst gsoc2013-epiphany-aba053264da43f60b0628077e79cd52e3d78394a.zip | |
Factor out the common encoding is_automatic check.
2003-12-18 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-encodings.c: (ephy_encoding_info_is_automatic):
* embed/ephy-encodings.h:
* src/ephy-encoding-dialog.c: (sync_embed_cb):
* src/ephy-encoding-menu.c: (update_encoding_menu_cb):
Factor out the common encoding is_automatic check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-encoding-dialog.c | 10 | ||||
| -rw-r--r-- | src/ephy-encoding-menu.c | 2 |
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"); |