diff options
| author | Jean-François Rameau <jframeau@cvs.gnome.org> | 2006-03-03 05:23:34 +0800 |
|---|---|---|
| committer | Jean-François Rameau <jframeau@src.gnome.org> | 2006-03-03 05:23:34 +0800 |
| commit | 8dc95a5c584d8fdb99afec102702bd8801b95266 (patch) | |
| tree | 2b0682233b70018437c4bc140a3d32f1ad45d9d6 /src/prefs-dialog.c | |
| parent | 4f2b380361e6bf153a04cc80dba762733a5963c1 (diff) | |
| download | gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.tar gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.tar.gz gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.tar.bz2 gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.tar.lz gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.tar.xz gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.tar.zst gsoc2013-epiphany-8dc95a5c584d8fdb99afec102702bd8801b95266.zip | |
Fix gcc 4.1 warnings (dereferencing type-punned pointer will break
2006-03-02 Jean-François Rameau <jframeau@cvs.gnome.org>
* embed/ephy-embed-shell.c:(ephy_embed_shell_dispose):
* src/ephy-encoding-menu.c: (ephy_encoding_menu_view_dialog_cb):
* src/ephy-history-window.c: (cmd_clear), (ephy_history_window_finalize):
* src/ephy-shell.c: (ephy_shell_get_pdm_dialog),(ephy_shell_get_prefs_dialog),
(ephy_shell_get_print_setup_dialog):
* src/prefs-dialog.c: (prefs_dialog_finalize), (font_prefs_button_clicked_cb),
(language_editor_add_button_clicked_cb):
* src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_finalize):
Fix gcc 4.1 warnings (dereferencing type-punned pointer will break strict-aliasing rules).
Diffstat (limited to 'src/prefs-dialog.c')
| -rw-r--r-- | src/prefs-dialog.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index ca4bb6eb5..b0b518f70 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -329,17 +329,21 @@ prefs_dialog_finalize (GObject *object) if (priv->fonts_dialog != NULL) { + EphyDialog **fonts_dialog = &priv->fonts_dialog; + g_object_remove_weak_pointer (G_OBJECT (priv->fonts_dialog), - (gpointer *) &priv->fonts_dialog); + (gpointer *) fonts_dialog); g_object_unref (priv->fonts_dialog); } if (priv->add_lang_dialog != NULL) { + EphyDialog **add_lang_dialog = &priv->add_lang_dialog; + g_object_remove_weak_pointer (G_OBJECT (priv->add_lang_dialog), - (gpointer *) &priv->add_lang_dialog); + (gpointer *) add_lang_dialog); g_object_unref (priv->add_lang_dialog); } @@ -616,11 +620,15 @@ font_prefs_button_clicked_cb (GtkWidget *button, if (priv->fonts_dialog == NULL) { + EphyDialog **fonts_dialog; + priv->fonts_dialog = setup_fonts_dialog (pd); + fonts_dialog = &priv->fonts_dialog; + g_object_add_weak_pointer (G_OBJECT (priv->fonts_dialog), - (gpointer *) &priv->fonts_dialog); + (gpointer *) fonts_dialog); } ephy_dialog_show (priv->fonts_dialog); @@ -1143,11 +1151,15 @@ language_editor_add_button_clicked_cb (GtkWidget *button, { if (pd->priv->add_lang_dialog == NULL) { + EphyDialog **add_lang_dialog; + pd->priv->add_lang_dialog = setup_add_language_dialog (pd); + add_lang_dialog = &pd->priv->add_lang_dialog; + g_object_add_weak_pointer (G_OBJECT (pd->priv->add_lang_dialog), - (gpointer *) &pd->priv->add_lang_dialog); + (gpointer *) add_lang_dialog); } ephy_dialog_show (pd->priv->add_lang_dialog); |