diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/ephy-encoding-dialog.c | 2 | ||||
-rw-r--r-- | src/ephy-encoding-menu.c | 5 |
3 files changed, 8 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2003-12-19 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-encoding-dialog.c: (sync_embed_cb): + * src/ephy-encoding-menu.c: (update_encoding_menu_cb): + + Use return, not g_return_if_fail. + +2003-12-19 Christian Persch <chpe@cvs.gnome.org> + * embed/print-dialog.c: (ephy_print_dialog_browse_button_cb): EphyFileChooser now destroys with parent, don't set the flag again here. diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c index c61db7b46..9ecadd9fd 100644 --- a/src/ephy-encoding-dialog.c +++ b/src/ephy-encoding-dialog.c @@ -128,7 +128,7 @@ sync_embed_cb (EphyEncodingDialog *dialog, GParamSpec *pspec, gpointer dummy) if (info == NULL) return; node = ephy_encodings_get_node (dialog->priv->encodings, info->encoding); - g_return_if_fail (EPHY_IS_NODE (node)); + if (!EPHY_IS_NODE (node)) return; /* select the current encoding in the list view */ ephy_node_view_select_node (EPHY_NODE_VIEW (dialog->priv->enc_view), diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index 2b26d4fb7..14aa4e63c 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -186,11 +186,6 @@ update_encoding_menu_cb (GtkAction *dummy, EphyEncodingMenu *menu) enc_node = ephy_encodings_get_node (p->encodings, encoding); if (!EPHY_IS_NODE (enc_node)) { - g_warning ("Encountered unknown encoding '%s'" - ". Please file a bug at http://bugzilla.gnome.o" - "rg/enter_bug.cgi?product=epiphany\n", - encoding); - goto build_menu; } |