use new lrc API to clear all chat and call history
Now the views will actually get cleared, without having to restart
Ring (though the ContactMethods generated from the history will
still remain).
This also amends the outdated dialog message which asks the user
to confirm this operation.
Change-Id: Ib71f20f7a0e804648242638361f615aec8781ee1
Tuleap: #925
diff --git a/src/generalsettingsview.cpp b/src/generalsettingsview.cpp
index 294b3d3..ddcbcc7 100644
--- a/src/generalsettingsview.cpp
+++ b/src/generalsettingsview.cpp
@@ -28,6 +28,7 @@
#include <profile.h>
#include <profilemodel.h>
#include <categorizedhistorymodel.h>
+#include <media/recordingmodel.h>
// Ring client
#include "utils/files.h"
@@ -98,7 +99,7 @@
GtkWidget *dialog = gtk_message_dialog_new(NULL,
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
- _("Are you sure you want to clear all your history?\nThis operation will also reset the Frequent Contacts list"));
+ _("This is a destructive operation. Are you sure you want to delete all of your chat and call history?"));
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
@@ -128,8 +129,10 @@
{
g_return_if_fail(IS_GENERAL_SETTINGS_VIEW(self));
- if (clear_history_dialog(self) )
- CategorizedHistoryModel::instance().clearAllCollections();
+ if (clear_history_dialog(self) ) {
+ CategorizedHistoryModel::instance().clear();
+ Media::RecordingModel::instance().clear();
+ }
}
static void
diff --git a/ui/generalsettingsview.ui b/ui/generalsettingsview.ui
index 40d7d13..837481b 100644
--- a/ui/generalsettingsview.ui
+++ b/ui/generalsettingsview.ui
@@ -222,8 +222,9 @@
<property name="halign">start</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
</object>