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. --- ChangeLog | 39 ++++++++++++++++++++++++++++++++ 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 --- lib/ephy-dialog.c | 20 ++++++---------- lib/ephy-file-chooser.c | 2 -- lib/ephy-node-db.c | 2 -- lib/widgets/ephy-node-view.c | 5 ---- lib/widgets/ephy-search-entry.c | 3 --- src/bookmarks/ephy-bookmark-action.c | 4 ---- src/bookmarks/ephy-bookmark-properties.c | 2 -- src/bookmarks/ephy-bookmarks.c | 4 +--- src/bookmarks/ephy-favorites-menu.c | 3 --- src/bookmarks/ephy-new-bookmark.c | 4 ---- src/bookmarks/ephy-topics-selector.c | 2 -- src/ephy-encoding-dialog.c | 3 --- src/ephy-encoding-menu.c | 6 ----- src/ephy-favicon-action.c | 2 -- src/ephy-location-action.c | 1 - src/ephy-notebook.c | 3 --- src/ephy-session.c | 5 ---- src/ephy-shell.c | 10 -------- src/ephy-tab.c | 9 -------- src/ephy-tabs-menu.c | 3 --- src/ephy-window.c | 9 -------- src/pdm-dialog.c | 3 --- src/ppview-toolbar.c | 2 -- 30 files changed, 48 insertions(+), 120 deletions(-) diff --git a/ChangeLog b/ChangeLog index 569e9f504..3a821f853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +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. + 2004-10-27 Christian Persch * lib/widgets/ephy-node-view.h: 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; diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c index 36e86769a..114658828 100644 --- a/lib/ephy-dialog.c +++ b/lib/ephy-dialog.c @@ -83,11 +83,12 @@ struct EphyDialogPrivate GHashTable *props; GtkWidget *parent; GtkWidget *dialog; - gboolean modal; - gboolean has_default_size; - gboolean disposing; - gboolean initialized; - gboolean persist_position; + + gboolean modal : 1; + gboolean has_default_size : 1; + gboolean disposing : 1; + gboolean initialized : 1; + gboolean persist_position : 1; int default_width; int default_height; }; @@ -1088,7 +1089,7 @@ void ephy_dialog_set_modal (EphyDialog *dialog, gboolean is_modal) { - dialog->priv->modal = is_modal; + dialog->priv->modal = is_modal != FALSE; gtk_window_set_modal (GTK_WINDOW(dialog->priv->dialog), is_modal); } @@ -1298,13 +1299,6 @@ ephy_dialog_init (EphyDialog *dialog) { dialog->priv = EPHY_DIALOG_GET_PRIVATE (dialog); - dialog->priv->parent = NULL; - dialog->priv->dialog = NULL; - dialog->priv->name = NULL; - dialog->priv->initialized = FALSE; - dialog->priv->has_default_size = FALSE; - dialog->priv->disposing = FALSE; - dialog->priv->persist_position = FALSE; dialog->priv->default_width = -1; dialog->priv->default_height = -1; diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c index fc0fcf7fa..7c933a3a5 100644 --- a/lib/ephy-file-chooser.c +++ b/lib/ephy-file-chooser.c @@ -98,8 +98,6 @@ static void ephy_file_chooser_init (EphyFileChooser *dialog) { dialog->priv = EPHY_FILE_CHOOSER_GET_PRIVATE (dialog); - - dialog->priv->persist_key = NULL; } static GObject * diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c index 27e27073b..09c6272c4 100644 --- a/lib/ephy-node-db.c +++ b/lib/ephy-node-db.c @@ -182,8 +182,6 @@ ephy_node_db_init (EphyNodeDb *db) { db->priv = EPHY_NODE_DB_GET_PRIVATE (db); - db->priv->name = NULL; - /* id to node */ db->priv->id_to_node = g_ptr_array_new (); diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index a67709e9b..2ef02b648 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -1281,13 +1281,8 @@ ephy_node_view_init (EphyNodeView *view) { view->priv = EPHY_NODE_VIEW_GET_PRIVATE (view); - view->priv->remove_if_cancelled = FALSE; view->priv->toggle_column = -1; - view->priv->filter = NULL; - view->priv->editable_renderer = NULL; - view->priv->edited_node = NULL; view->priv->searchable_data_column = -1; - view->priv->source_target_list = NULL; view->priv->priority_column = -1; view->priv->priority_prop_id = 0; view->priv->sort_column = -1; diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c index bb84a323c..0c4469e32 100644 --- a/lib/widgets/ephy-search-entry.c +++ b/lib/widgets/ephy-search-entry.c @@ -141,9 +141,6 @@ ephy_search_entry_init (EphySearchEntry *entry) { entry->priv = EPHY_SEARCH_ENTRY_GET_PRIVATE (entry); - entry->priv->clearing = FALSE; - entry->priv->timeout = 0; - g_signal_connect (G_OBJECT (entry), "destroy", G_CALLBACK (ephy_search_entry_destroy_cb), diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index 33b04ba55..f8bc243f8 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -959,10 +959,6 @@ ephy_bookmark_action_init (EphyBookmarkAction *action) action->priv = EPHY_BOOKMARK_ACTION_GET_PRIVATE (action); - action->priv->prop_dialog = NULL; - action->priv->cache_handler = 0; - action->priv->motion_handler = 0; - bookmarks = ephy_shell_get_bookmarks (ephy_shell); node = ephy_bookmarks_get_smart_bookmarks (bookmarks); ephy_node_signal_connect_object (node, EPHY_NODE_CHILD_ADDED, diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index d95f2412b..51b15b454 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -425,8 +425,6 @@ static void ephy_bookmark_properties_init (EphyBookmarkProperties *editor) { editor->priv = EPHY_BOOKMARK_PROPERTIES_GET_PRIVATE (editor); - - editor->priv->bookmark = NULL; } GtkWidget * diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 2e6c0ca9a..ac2de3b28 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -678,12 +678,10 @@ ephy_bookmarks_init (EphyBookmarks *eb) EphyNodeDb *db; eb->priv = EPHY_BOOKMARKS_GET_PRIVATE (eb); - eb->priv->toolbars_model = NULL; db = ephy_node_db_new (EPHY_NODE_DB_BOOKMARKS); eb->priv->db = db; - eb->priv->dirty = FALSE; - eb->priv->save_timeout_id = 0; + eb->priv->xml_file = g_build_filename (ephy_dot_dir (), "ephy-bookmarks.xml", NULL); diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c index 673d7b407..f3d79e43b 100644 --- a/src/bookmarks/ephy-favorites-menu.c +++ b/src/bookmarks/ephy-favorites-menu.c @@ -279,9 +279,6 @@ ephy_favorites_menu_init (EphyFavoritesMenu *menu) menu->priv = p; menu->priv->bookmarks = ephy_shell_get_bookmarks (ephy_shell); - menu->priv->ui_id = 0; - menu->priv->update_tag = 0; - menu->priv->action_group = NULL; fav = ephy_bookmarks_get_favorites (menu->priv->bookmarks); ephy_node_signal_connect_object (fav, diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c index 1b37f6fa5..82cb28dfd 100644 --- a/src/bookmarks/ephy-new-bookmark.c +++ b/src/bookmarks/ephy-new-bookmark.c @@ -434,10 +434,6 @@ static void ephy_new_bookmark_init (EphyNewBookmark *editor) { editor->priv = EPHY_NEW_BOOKMARK_GET_PRIVATE (editor); - - editor->priv->location = NULL; - editor->priv->icon = NULL; - editor->priv->id = 0; } void diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c index 01aca9a41..b6d268c3a 100644 --- a/src/bookmarks/ephy-topics-selector.c +++ b/src/bookmarks/ephy-topics-selector.c @@ -261,8 +261,6 @@ static void ephy_topics_selector_init (EphyTopicsSelector *selector) { selector->priv = EPHY_TOPICS_SELECTOR_GET_PRIVATE (selector); - selector->priv->bookmark = NULL; - selector->priv->topics = NULL; selector->priv->filter = ephy_node_filter_new (); ephy_node_filter_add_expression (selector->priv->filter, diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c index dbc43262a..bf5d16bb1 100644 --- a/src/ephy-encoding-dialog.c +++ b/src/ephy-encoding-dialog.c @@ -298,9 +298,6 @@ ephy_encoding_dialog_init (EphyEncodingDialog *dialog) EPHY_ENCODINGS (ephy_embed_shell_get_encodings (EPHY_EMBED_SHELL (ephy_shell))); - dialog->priv->update_tag = FALSE; - dialog->priv->selected_node = NULL; - ephy_dialog_construct (EPHY_DIALOG (dialog), properties, ephy_file ("epiphany.glade"), diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index e2a10a014..1e48e795b 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -103,12 +103,6 @@ ephy_encoding_menu_init (EphyEncodingMenu *menu) menu->priv->encodings = EPHY_ENCODINGS (ephy_embed_shell_get_encodings (EPHY_EMBED_SHELL (ephy_shell))); - - menu->priv->update_tag = FALSE; - menu->priv->action_group = NULL; - menu->priv->merge_id = 0; - menu->priv->encodings_radio_group = NULL; - menu->priv->dialog = NULL; } static int diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c index 0951b1ede..95f14edb9 100644 --- a/src/ephy-favicon-action.c +++ b/src/ephy-favicon-action.c @@ -306,8 +306,6 @@ ephy_favicon_action_init (EphyFaviconAction *action) { action->priv = EPHY_FAVICON_ACTION_GET_PRIVATE (action); - action->priv->icon = NULL; - action->priv->cache = EPHY_FAVICON_CACHE (ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell))); diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index bfb3440bf..eae9a6a6b 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -498,7 +498,6 @@ ephy_location_action_init (EphyLocationAction *action) action->priv = EPHY_LOCATION_ACTION_GET_PRIVATE (action); action->priv->address = g_strdup (""); - action->priv->actions = NULL; action->priv->editable = TRUE; action->priv->bookmarks = ephy_shell_get_bookmarks (ephy_shell); action->priv->smart_bmks = ephy_bookmarks_get_smart_bookmarks diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c index 8c97d9228..d4fafb810 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -678,9 +678,6 @@ ephy_notebook_init (EphyNotebook *notebook) g_object_ref (G_OBJECT (notebook->priv->title_tips)); gtk_object_sink (GTK_OBJECT (notebook->priv->title_tips)); - notebook->priv->drag_in_progress = FALSE; - notebook->priv->motion_notify_handler_id = 0; - notebook->priv->focused_pages = NULL; notebook->priv->show_tabs = TRUE; g_signal_connect (notebook, "button-press-event", diff --git a/src/ephy-session.c b/src/ephy-session.c index 42a6b8af5..60fb877c7 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -269,11 +269,6 @@ ephy_session_init (EphySession *session) LOG ("EphySession initialising") - session->priv->windows = NULL; - session->priv->tool_windows = NULL; - session->priv->resume_dialog = NULL; - session->priv->resuming = FALSE; - ensure_session_directory (); } diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 49ff5d9a7..78ad65c59 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -175,16 +175,6 @@ ephy_shell_init (EphyShell *shell) shell->priv = EPHY_SHELL_GET_PRIVATE (shell); - shell->priv->session = NULL; - shell->priv->bookmarks = NULL; - shell->priv->bme = NULL; - shell->priv->history_window = NULL; - shell->priv->pdm_dialog = NULL; - shell->priv->print_setup_dialog = NULL; - shell->priv->toolbars_model = NULL; - shell->priv->fs_toolbars_model = NULL; - shell->priv->extensions_manager = NULL; - /* globally accessible singleton */ g_assert (ephy_shell == NULL); ephy_shell = shell; diff --git a/src/ephy-tab.c b/src/ephy-tab.c index aba0f8f40..f63e94ccd 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -1558,23 +1558,14 @@ ephy_tab_init (EphyTab *tab) tab->priv = EPHY_TAB_GET_PRIVATE (tab); - tab->priv->status_message = NULL; - tab->priv->link_message = NULL; tab->priv->total_requests = 0; tab->priv->cur_requests = 0; tab->priv->width = -1; tab->priv->height = -1; - tab->priv->title = NULL; - tab->priv->address = NULL; - tab->priv->icon_address = NULL; tab->priv->load_percent = 0; tab->priv->load_status = FALSE; - tab->priv->link_message = NULL; tab->priv->security_level = STATE_IS_UNKNOWN; - tab->priv->hidden_popups = NULL; - tab->priv->shown_popups = NULL; tab->priv->zoom = 1.0; - tab->priv->setting_zoom = FALSE; tab->priv->address_expire = TAB_ADDRESS_EXPIRE_NOW; embed = ephy_embed_factory_new_object (EPHY_TYPE_EMBED); diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index d59ecfc45..2ba5115dc 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -220,9 +220,6 @@ static void ephy_tabs_menu_init (EphyTabsMenu *menu) { menu->priv = EPHY_TABS_MENU_GET_PRIVATE (menu); - - menu->priv->ui_id = 0; - menu->priv->action_group = NULL; } static void diff --git a/src/ephy-window.c b/src/ephy-window.c index 02bfb8a8a..4d7942014 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2300,16 +2300,7 @@ ephy_window_init (EphyWindow *window) window->priv = EPHY_WINDOW_GET_PRIVATE (window); - window->priv->active_tab = NULL; - window->priv->closing = FALSE; - window->priv->ppview_toolbar = NULL; - window->priv->exit_fullscreen_popup = NULL; - window->priv->num_tabs = 0; - window->priv->has_size = FALSE; window->priv->chrome = EPHY_EMBED_CHROME_ALL; - window->priv->should_save_chrome = FALSE; - window->priv->fullscreen_mode = FALSE; - window->priv->ppv_mode = FALSE; g_object_ref (ephy_shell); diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 1432c637e..97b3bd2f0 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -807,9 +807,6 @@ pdm_dialog_init (PdmDialog *dialog) dialog->priv = EPHY_PDM_DIALOG_GET_PRIVATE (dialog); - dialog->priv->cookies = NULL; - dialog->priv->passwords = NULL; - ephy_dialog_construct (EPHY_DIALOG(dialog), properties, ephy_file ("epiphany.glade"), diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c index 219e163b1..fee8e5e4e 100755 --- a/src/ppview-toolbar.c +++ b/src/ppview-toolbar.c @@ -249,8 +249,6 @@ ppview_toolbar_init (PPViewToolbar *t) { t->priv = EPHY_PPVIEW_TOOLBAR_GET_PRIVATE (t); - t->priv->window = NULL; - t->priv->manager = NULL; t->priv->current_page = 1; } -- cgit v1.2.3