Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-gnome
Commits
dd84cf9a
Commit
dd84cf9a
authored
Mar 19, 2015
by
Stepan Salenikovich
Browse files
gnome: libRingClient API update
Refs #68848 Change-Id: I4ce18b8cbffa499d9b5816945ae33793fe86403b
parent
c5f08156
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/backends/minimalhistorybackend.cpp
View file @
dd84cf9a
...
...
@@ -30,7 +30,7 @@
#include
<account.h>
#include
<person.h>
#include
<contactmethod.h>
#include
<historymodel.h>
#include
<
categorized
historymodel.h>
class
MinimalHistoryEditor
:
public
CollectionEditor
<
Call
>
{
...
...
@@ -104,7 +104,7 @@ bool MinimalHistoryEditor::regenFile(const Call* toIgnore)
QFile
file
(
QStandardPaths
::
writableLocation
(
QStandardPaths
::
DataLocation
)
+
QLatin1Char
(
'/'
)
+
"history.ini"
);
if
(
file
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Text
)
)
{
QTextStream
stream
(
&
file
);
for
(
const
Call
*
c
:
HistoryModel
::
instance
()
->
getHistoryCalls
())
{
for
(
const
Call
*
c
:
Categorized
HistoryModel
::
instance
()
->
getHistoryCalls
())
{
if
(
c
!=
toIgnore
)
saveCall
(
stream
,
c
);
}
...
...
src/ring_client.cpp
View file @
dd84cf9a
...
...
@@ -39,7 +39,7 @@
#include
<QtCore/QItemSelectionModel>
#include
<useractionmodel.h>
#include
<clutter-gtk/clutter-gtk.h>
#include
<historymodel.h>
#include
<
categorized
historymodel.h>
#include
"ring_client_options.h"
#include
"ringmainwindow.h"
...
...
@@ -126,7 +126,7 @@ ring_client_command_line(GApplication *app, GApplicationCommandLine *cmdline)
}
/* add backends */
HistoryModel
::
instance
()
->
addCollection
<
MinimalHistoryBackend
>
(
LoadOptions
::
FORCE_ENABLED
);
Categorized
HistoryModel
::
instance
()
->
addCollection
<
MinimalHistoryBackend
>
(
LoadOptions
::
FORCE_ENABLED
);
/* Override theme since we don't have appropriate icons for a dark them (yet) */
GtkSettings
*
gtk_settings
=
gtk_settings_get_default
();
...
...
src/ringmainwindow.cpp
View file @
dd84cf9a
...
...
@@ -38,7 +38,7 @@
#include
"incomingcallview.h"
#include
"currentcallview.h"
#include
<string.h>
#include
<historymodel.h>
#include
<
categorized
historymodel.h>
#include
<contactmethod.h>
#include
<QtCore/QSortFilterProxyModel>
#include
"models/gtkqsortfiltertreemodel.h"
...
...
@@ -463,8 +463,8 @@ ring_main_window_init(RingMainWindow *win)
/* sort the history in descending order by date */
QSortFilterProxyModel
*
proxyModel
=
new
QSortFilterProxyModel
(
HistoryModel
::
instance
());
proxyModel
->
setSourceModel
(
HistoryModel
::
instance
());
QSortFilterProxyModel
*
proxyModel
=
new
QSortFilterProxyModel
(
Categorized
HistoryModel
::
instance
());
proxyModel
->
setSourceModel
(
Categorized
HistoryModel
::
instance
());
proxyModel
->
setSortRole
(
static_cast
<
int
>
(
Call
::
Role
::
Date
));
proxyModel
->
sort
(
0
,
Qt
::
DescendingOrder
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment