From 529f8a142ef1b5cf04062216a442c5f492ec12e0 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 27 Oct 2004 19:54:57 +0000 Subject: Private data is 0-initialised, no need to set members to NULL, 0, or 2004-10-27 Christian Persch * embed/ephy-embed-dialog.c: (ephy_embed_dialog_init): * embed/ephy-embed-persist.c: (ephy_embed_persist_init), (ephy_embed_persist_to_string): * embed/ephy-embed-shell.c: (ephy_embed_shell_init): * embed/find-dialog.c: (find_dialog_init): * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-single.cpp: * lib/ephy-dialog.c: (ephy_dialog_set_modal), (ephy_dialog_init): * lib/ephy-file-chooser.c: (ephy_file_chooser_init): * lib/ephy-node-db.c: (ephy_node_db_init): * lib/widgets/ephy-node-view.c: (ephy_node_view_init): * lib/widgets/ephy-search-entry.c: (ephy_search_entry_init): * src/bookmarks/ephy-bookmark-action.c: (ephy_bookmark_action_init): * src/bookmarks/ephy-bookmark-properties.c: (ephy_bookmark_properties_init): * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init): * src/bookmarks/ephy-favorites-menu.c: (ephy_favorites_menu_init): * src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_init): * src/bookmarks/ephy-topics-selector.c: (ephy_topics_selector_init): * src/ephy-encoding-dialog.c: (ephy_encoding_dialog_init): * src/ephy-encoding-menu.c: (ephy_encoding_menu_init): * src/ephy-favicon-action.c: (ephy_favicon_action_init): * src/ephy-location-action.c: (ephy_location_action_init): * src/ephy-notebook.c: (ephy_notebook_init): * src/ephy-session.c: (ephy_session_init): * src/ephy-shell.c: (ephy_shell_init): * src/ephy-tab.c: (ephy_tab_init): * src/ephy-tabs-menu.c: (ephy_tabs_menu_init): * src/ephy-window.c: (ephy_window_init): * src/pdm-dialog.c: (pdm_dialog_init): * src/ppview-toolbar.c: (ppview_toolbar_init): Private data is 0-initialised, no need to set members to NULL, 0, or FALSE. --- embed/ephy-embed-dialog.c | 2 -- embed/ephy-embed-persist.c | 7 ------- embed/ephy-embed-shell.c | 6 ------ embed/find-dialog.c | 3 --- embed/mozilla/mozilla-embed-persist.cpp | 1 + embed/mozilla/mozilla-embed-single.cpp | 3 --- 6 files changed, 1 insertion(+), 21 deletions(-) (limited to 'embed') diff --git a/embed/ephy-embed-dialog.c b/embed/ephy-embed-dialog.c index 85e7069ea..938b8e950 100644 --- a/embed/ephy-embed-dialog.c +++ b/embed/ephy-embed-dialog.c @@ -110,8 +110,6 @@ static void ephy_embed_dialog_init (EphyEmbedDialog *dialog) { dialog->priv = EPHY_EMBED_DIALOG_GET_PRIVATE (dialog); - - dialog->priv->embed = NULL; } static void diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c index aeee7584d..ed9d03df3 100644 --- a/embed/ephy-embed-persist.c +++ b/embed/ephy-embed-persist.c @@ -442,13 +442,7 @@ ephy_embed_persist_init (EphyEmbedPersist *persist) LOG ("EphyEmbedPersist initialising %p", persist) - persist->priv->dest = NULL; - persist->priv->source = NULL; - persist->priv->fc_title = NULL; - persist->priv->fc_parent = NULL; - persist->priv->flags = 0; persist->priv->max_size = -1; - persist->priv->persist_key = NULL; } static void @@ -638,4 +632,3 @@ ephy_embed_persist_to_string (EphyEmbedPersist *persist) EphyEmbedPersistClass *klass = EPHY_EMBED_PERSIST_GET_CLASS (persist); return klass->to_string (persist); } - diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 8ff0c9c2a..bdba397d6 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -298,12 +298,6 @@ ephy_embed_shell_init (EphyEmbedShell *shell) /* globally accessible singleton */ g_assert (embed_shell == NULL); embed_shell = shell; - - shell->priv->global_history = NULL; - shell->priv->downloader_view = NULL; - shell->priv->favicon_cache = NULL; - shell->priv->encodings = NULL; - shell->priv->mime_table = NULL; } static void diff --git a/embed/find-dialog.c b/embed/find-dialog.c index 1c9624da3..08b941a1b 100755 --- a/embed/find-dialog.c +++ b/embed/find-dialog.c @@ -253,9 +253,6 @@ find_dialog_init (FindDialog *dialog) dialog->priv = EPHY_FIND_DIALOG_GET_PRIVATE (dialog); - dialog->priv->old_embed = NULL; - dialog->priv->initialised = FALSE; - ephy_dialog_construct (EPHY_DIALOG(dialog), properties, ephy_file ("epiphany.glade"), diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp index 4a375abd9..ac3940d6b 100644 --- a/embed/mozilla/mozilla-embed-persist.cpp +++ b/embed/mozilla/mozilla-embed-persist.cpp @@ -91,6 +91,7 @@ static void mozilla_embed_persist_init (MozillaEmbedPersist *persist) { persist->priv = MOZILLA_EMBED_PERSIST_GET_PRIVATE (persist); + persist->priv->mPersist = do_CreateInstance (NS_WEBBROWSERPERSIST_CONTRACTID); } diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index d60d4c62e..3a51db7bb 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -521,7 +521,6 @@ mozilla_embed_single_init (MozillaEmbedSingle *mes) { mes->priv = MOZILLA_EMBED_SINGLE_GET_PRIVATE (mes); - mes->priv->theme_window = NULL; mes->priv->user_prefs = g_build_filename (ephy_dot_dir (), MOZILLA_PROFILE_DIR, @@ -529,8 +528,6 @@ mozilla_embed_single_init (MozillaEmbedSingle *mes) MOZILLA_PROFILE_FILE, NULL); - mes->priv->mSingleObserver = nsnull; - if (!init_services (mes)) { GtkWidget *dialog; -- cgit v1.2.3