aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2009-02-27 00:37:43 +0800
committerXan Lopez <xan@src.gnome.org>2009-02-27 00:37:43 +0800
commit524007db88546cf76a6d0a0c1c512dd93058bc63 (patch)
tree1c9d1aadf4e2f3ee2c1d24c54e8b412ad0b144c1 /src
parent01b36dd4aeebac60076b1e8d28dd1181129939bd (diff)
downloadgsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.tar
gsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.tar.gz
gsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.tar.bz2
gsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.tar.lz
gsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.tar.xz
gsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.tar.zst
gsoc2013-epiphany-524007db88546cf76a6d0a0c1c512dd93058bc63.zip
Implement get/set encoding for the embed.
Bug #525265 svn path=/trunk/; revision=8815
Diffstat (limited to 'src')
-rw-r--r--src/ephy-encoding-dialog.c4
-rw-r--r--src/ephy-encoding-menu.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 5a2c3ba3f..64a343868 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -83,7 +83,7 @@ sync_encoding_against_embed (EphyEncodingDialog *dialog)
GtkTreeModel *model;
GList *rows;
GtkWidget *button;
- char *encoding;
+ const char *encoding;
gboolean is_automatic;
dialog->priv->update_tag = TRUE;
@@ -123,8 +123,6 @@ sync_encoding_against_embed (EphyEncodingDialog *dialog)
button = ephy_dialog_get_control (EPHY_DIALOG (dialog), properties[AUTOMATIC_PROP].id);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), is_automatic);
- g_free (encoding);
-
dialog->priv->update_tag = FALSE;
}
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 0b56cc7e1..682a22747 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -112,7 +112,7 @@ update_encoding_menu_cb (GtkAction *dummy, EphyEncodingMenu *menu)
EphyEmbed *embed;
GtkAction *action;
char name[128];
- char *encoding;
+ const char *encoding;
EphyNode *enc_node;
GList *recent, *related = NULL, *l;
EphyLanguageGroup groups;
@@ -219,8 +219,6 @@ build_menu:
g_list_free (related);
g_list_free (recent);
- g_free (encoding);
-
menu->priv->update_tag = FALSE;
STOP_PROFILER ("Rebuilding encoding menu")