aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-01-06 23:06:36 +0800
committerChristian Persch <chpe@src.gnome.org>2004-01-06 23:06:36 +0800
commit43f2238fc1651b80e1fa97f87a7b4e3f341add68 (patch)
tree001402e5da23080ff28e73024ab3763ad81e2f48 /src
parent7acf32dbb218c465fcf7ee76c7033fc21c1ead20 (diff)
downloadgsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.tar
gsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.tar.gz
gsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.tar.bz2
gsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.tar.lz
gsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.tar.xz
gsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.tar.zst
gsoc2013-epiphany-43f2238fc1651b80e1fa97f87a7b4e3f341add68.zip
Move "automatic" check back to where it was, since we now always have a
2004-01-06 Christian Persch <chpe@cvs.gnome.org> * src/ephy-encoding-menu.c: (update_encoding_menu_cb): Move "automatic" check back to where it was, since we now always have a node for the encoding.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-encoding-menu.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 11c4d44aa..bd76aa4d2 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -186,6 +186,14 @@ update_encoding_menu_cb (GtkAction *dummy, EphyEncodingMenu *menu)
enc_node = ephy_encodings_get_node (p->encodings, encoding, TRUE);
g_assert (EPHY_IS_NODE (enc_node));
+ /* check if encoding was overridden */
+ is_automatic = ephy_encoding_info_is_automatic (info);
+
+ action = gtk_action_group_get_action (p->action_group,
+ "ViewEncodingAutomatic");
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_automatic);
+ g_object_set (G_OBJECT (action), "sensitive", !is_automatic, NULL);
+
/* set the encodings group's active member */
g_snprintf (name, sizeof (name), "Encoding%s", encoding);
action = gtk_action_group_get_action (p->action_group, name);
@@ -216,14 +224,6 @@ update_encoding_menu_cb (GtkAction *dummy, EphyEncodingMenu *menu)
recent = g_list_sort (recent, (GCompareFunc) sort_encodings);
build_menu:
- /* check if encoding was overridden */
- is_automatic = ephy_encoding_info_is_automatic (info);
-
- action = gtk_action_group_get_action (p->action_group,
- "ViewEncodingAutomatic");
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_automatic);
- g_object_set (G_OBJECT (action), "sensitive", !is_automatic, NULL);
-
/* clear the menu */
if (p->merge_id > 0)
{