debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clear Private Data: Merge Closed Tabs with History

Browse source 
It would be misleading to delete one but not the other and
assume the pages are actually gone.
This commit is contained in:
Christian Dywan 2011-10-26 19:39:04 +02:00
parent 21529a9154
commit 5ddcfa7be6
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/main.c
View file

@ -2643,7 +2643,7 @@ main (int argc,
midori_remove_config_file (clear_prefs, MIDORI_CLEAR_SESSION, "session.xbel"); midori_remove_config_file (clear_prefs, MIDORI_CLEAR_SESSION, "session.xbel");
midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "history.db"); midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "history.db");
midori_remove_config_file (clear_prefs, MIDORI_CLEAR_TRASH, "tabtrash.xbel"); midori_remove_config_file (clear_prefs, MIDORI_CLEAR_HISTORY, "tabtrash.xbel");
for (; data_items != NULL; data_items = g_list_next (data_items)) for (; data_items != NULL; data_items = g_list_next (data_items))
{ {

15
midori/midori-browser.c
View file

@ -4512,14 +4512,10 @@ midori_browser_clear_private_data_response_cb (GtkWidget* dialog,
if (gtk_toggle_button_get_active (button)) if (gtk_toggle_button_get_active (button))
{ {
katze_array_clear (browser->history); katze_array_clear (browser->history);
clear_prefs |= MIDORI_CLEAR_HISTORY;
}
button = g_object_get_data (G_OBJECT (dialog), "trash");
if (gtk_toggle_button_get_active (button) && browser->trash)
{
katze_array_clear (browser->trash); katze_array_clear (browser->trash);
_midori_browser_update_actions (browser); _midori_browser_update_actions (browser);
clear_prefs |= MIDORI_CLEAR_TRASH; clear_prefs |= MIDORI_CLEAR_HISTORY;
clear_prefs |= MIDORI_CLEAR_TRASH; /* For backward-compatibility */
} }
if (clear_prefs != saved_prefs) if (clear_prefs != saved_prefs)
{ {
@ -4618,17 +4614,12 @@ _action_clear_private_data_activate (GtkAction* action,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_object_set_data (G_OBJECT (dialog), "session", button); g_object_set_data (G_OBJECT (dialog), "session", button);
gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
/* i18n: Browsing history, visited web pages */ /* i18n: Browsing history, visited web pages, closed tabs */
button = gtk_check_button_new_with_mnemonic (_("_History")); button = gtk_check_button_new_with_mnemonic (_("_History"));
if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY) if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_object_set_data (G_OBJECT (dialog), "history", button); g_object_set_data (G_OBJECT (dialog), "history", button);
gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
button = gtk_check_button_new_with_mnemonic (_("_Closed Tabs"));
if ((clear_prefs & MIDORI_CLEAR_TRASH) == MIDORI_CLEAR_TRASH)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_object_set_data (G_OBJECT (dialog), "trash", button);
gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
data_items = sokoke_register_privacy_item (NULL, NULL, NULL); data_items = sokoke_register_privacy_item (NULL, NULL, NULL);
for (; data_items != NULL; data_items = g_list_next (data_items)) for (; data_items != NULL; data_items = g_list_next (data_items))

2
midori/midori-websettings.h
View file

@ -41,7 +41,7 @@ enum
MIDORI_CLEAR_COOKIES = 2, /* deprecated */ MIDORI_CLEAR_COOKIES = 2, /* deprecated */
MIDORI_CLEAR_FLASH_COOKIES = 4, /* deprecated */ MIDORI_CLEAR_FLASH_COOKIES = 4, /* deprecated */
MIDORI_CLEAR_WEBSITE_ICONS = 8, /* deprecated */ MIDORI_CLEAR_WEBSITE_ICONS = 8, /* deprecated */
MIDORI_CLEAR_TRASH = 16, MIDORI_CLEAR_TRASH = 16, /* deprecated */
MIDORI_CLEAR_ON_QUIT = 32, MIDORI_CLEAR_ON_QUIT = 32,
MIDORI_CLEAR_WEB_CACHE = 64, /* deprecated */ MIDORI_CLEAR_WEB_CACHE = 64, /* deprecated */
MIDORI_CLEAR_SESSION = 128, MIDORI_CLEAR_SESSION = 128,