1
=== modified file 'plugins/security-privacy/CMakeLists.txt'
2
--- plugins/security-privacy/CMakeLists.txt	2014-08-27 05:19:24 +0000
3
+++ plugins/security-privacy/CMakeLists.txt	2014-09-29 11:03:33 +0000
4
@@ -47,6 +47,7 @@
5
47
include_directories(
47
include_directories(
6
48
    ${CMAKE_CURRENT_BINARY_DIR}
48
    ${CMAKE_CURRENT_BINARY_DIR}
7
49
    ${TRUST_STORE_INCLUDE_DIRS}
49
    ${TRUST_STORE_INCLUDE_DIRS}
8
50
    ${GLIB_INCLUDE_DIRS}
9
50
)
51
)
10
51
52
11
52
set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/SecurityPrivacy)
53
set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/SecurityPrivacy)
12
@@ -54,6 +55,7 @@
13
54
    uss-accountsservice
55
    uss-accountsservice
14
55
    ${ACCOUNTSSERVICE_LDFLAGS}
56
    ${ACCOUNTSSERVICE_LDFLAGS}
15
56
    ${TRUST_STORE_LDFLAGS}
57
    ${TRUST_STORE_LDFLAGS}
16
58
    ${GLIB_LDFLAGS}
17
57
)
59
)
18
58
install(TARGETS UbuntuSecurityPrivacyPanel UbuntuSecurityPrivacyHelper DESTINATION ${PLUG_DIR})
60
install(TARGETS UbuntuSecurityPrivacyPanel UbuntuSecurityPrivacyHelper DESTINATION ${PLUG_DIR})
19
59
install(FILES qmldir DESTINATION ${PLUG_DIR})
61
install(FILES qmldir DESTINATION ${PLUG_DIR})
20
60
62
21
=== modified file 'plugins/security-privacy/trust-store-model.cpp'
22
--- plugins/security-privacy/trust-store-model.cpp	2014-09-04 14:04:22 +0000
23
+++ plugins/security-privacy/trust-store-model.cpp	2014-09-29 11:03:33 +0000
24
@@ -25,12 +25,13 @@
25
25
#include <QList>
25
#include <QList>
26
26
#include <QMap>
26
#include <QMap>
27
27
#include <QSet>
27
#include <QSet>
28
28
#include <QSettings>
29
29
#include <QStandardPaths>
28
#include <QStandardPaths>
30
30
29
31
31
#include <core/trust/resolve.h>
30
#include <core/trust/resolve.h>
32
32
#include <core/trust/store.h>
31
#include <core/trust/store.h>
33
33
32
34
33
#include <glib.h>
35
34
36
34
class Application
35
class Application
37
35
{
36
{
38
36
public:
37
public:
39
@@ -39,12 +40,41 @@
40
39
    void setId(const QString &id) {
40
    void setId(const QString &id) {
41
40
        this->id = id;
41
        this->id = id;
42
41
42
43
43
        GKeyFile *desktopInfo = g_key_file_new();
44
42
        QString desktopFilename = resolveDesktopFilename(id);
44
        QString desktopFilename = resolveDesktopFilename(id);
50
43
        QSettings desktopFile(desktopFilename, QSettings::IniFormat);
45
51
44
        desktopFile.beginGroup("Desktop Entry");
46
        gboolean loaded = g_key_file_load_from_file(desktopInfo,
52
45
        displayName = desktopFile.value("Name").toString();
47
                                                    desktopFilename.toUtf8().data(),
53
46
        iconName = resolveIcon(desktopFile.value("Icon").toString(),
48
                                                    G_KEY_FILE_NONE,
54
47
                               desktopFile.value("Path").toString());
49
                                                    nullptr);
55
50
56
51
        if (!loaded) {
57
52
            g_warning("Couldn't parse the desktop: %s", desktopFilename.toUtf8().data());
58
53
            g_key_file_free(desktopInfo);
59
54
            return;
60
55
        }
61
56
62
57
        gchar *name = g_key_file_get_locale_string(desktopInfo,
63
58
                                                   G_KEY_FILE_DESKTOP_GROUP,
64
59
                                                   G_KEY_FILE_DESKTOP_KEY_NAME,
65
60
                                                   nullptr,
66
61
                                                   nullptr);
67
62
        displayName = QString::fromUtf8(name);
68
63
69
64
        gchar *icon = g_key_file_get_string(desktopInfo,
70
65
                                            G_KEY_FILE_DESKTOP_GROUP,
71
66
                                            G_KEY_FILE_DESKTOP_KEY_ICON,
72
67
                                            nullptr);
73
68
        gchar *path = g_key_file_get_string(desktopInfo,
74
69
                                            G_KEY_FILE_DESKTOP_GROUP,
75
70
                                            G_KEY_FILE_DESKTOP_KEY_PATH,
76
71
                                            nullptr);
77
72
        iconName = resolveIcon(QString::fromUtf8(icon),
78
73
                               QString::fromUtf8(path));
79
74
        g_free(name);
80
75
        g_free(icon);
81
76
        g_free(path);
82
77
        g_key_file_free(desktopInfo);
83
48
    }
78
    }
84
49
79
85
50
    QString resolveDesktopFilename(const QString &id) {
80
    QString resolveDesktopFilename(const QString &id) {
86
51
81
87
=== modified file 'tests/plugins/security-privacy/CMakeLists.txt'
88
--- tests/plugins/security-privacy/CMakeLists.txt	2014-08-18 07:50:41 +0000
89
+++ tests/plugins/security-privacy/CMakeLists.txt	2014-09-29 11:03:33 +0000
90
@@ -1,11 +1,11 @@
91
1
set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
1
set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
93
2
include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy)
2
include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy ${GLIB_INCLUDE_DIRS})
94
3
add_definitions(-DTESTS)
3
add_definitions(-DTESTS)
95
4
4
96
5
add_executable(tst-trust-store-model
5
add_executable(tst-trust-store-model
97
6
    tst_trust_store_model.cpp
6
    tst_trust_store_model.cpp
98
7
    ../../../plugins/security-privacy/trust-store-model.cpp
7
    ../../../plugins/security-privacy/trust-store-model.cpp
99
8
)
8
)
101
9
9
target_link_libraries (tst-trust-store-model ${GLIB_LDFLAGS})
102
10
qt5_use_modules(tst-trust-store-model Core Gui DBus Qml Test)
10
qt5_use_modules(tst-trust-store-model Core Gui DBus Qml Test)
103
11
add_test(NAME tst-trust-store-model COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-trust-store-model)
11
add_test(NAME tst-trust-store-model COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-trust-store-model)
Reviewer	Review Type	Date Requested	Status
Alberto Mardegan		2014-09-26	Approve on 2014-10-02
Ken VanDine			Approve on 2014-10-02
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-29
Review via email: mp+236137@code.launchpad.net
1	=== modified file 'plugins/security-privacy/CMakeLists.txt'
2	--- plugins/security-privacy/CMakeLists.txt 2014-08-27 05:19:24 +0000
3	+++ plugins/security-privacy/CMakeLists.txt 2014-09-29 11:03:33 +0000
4	@@ -47,6 +47,7 @@
5	47	include_directories(	47	include_directories(
6	48	${CMAKE_CURRENT_BINARY_DIR}	48	${CMAKE_CURRENT_BINARY_DIR}
7	49	${TRUST_STORE_INCLUDE_DIRS}	49	${TRUST_STORE_INCLUDE_DIRS}
8			50	${GLIB_INCLUDE_DIRS}
9	50	)	51	)
10	51		52
11	52	set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/SecurityPrivacy)	53	set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/SecurityPrivacy)
12	@@ -54,6 +55,7 @@
13	54	uss-accountsservice	55	uss-accountsservice
14	55	${ACCOUNTSSERVICE_LDFLAGS}	56	${ACCOUNTSSERVICE_LDFLAGS}
15	56	${TRUST_STORE_LDFLAGS}	57	${TRUST_STORE_LDFLAGS}
16			58	${GLIB_LDFLAGS}
17	57	)	59	)
18	58	install(TARGETS UbuntuSecurityPrivacyPanel UbuntuSecurityPrivacyHelper DESTINATION ${PLUG_DIR})	60	install(TARGETS UbuntuSecurityPrivacyPanel UbuntuSecurityPrivacyHelper DESTINATION ${PLUG_DIR})
19	59	install(FILES qmldir DESTINATION ${PLUG_DIR})	61	install(FILES qmldir DESTINATION ${PLUG_DIR})
20	60		62
21	=== modified file 'plugins/security-privacy/trust-store-model.cpp'
22	--- plugins/security-privacy/trust-store-model.cpp 2014-09-04 14:04:22 +0000
23	+++ plugins/security-privacy/trust-store-model.cpp 2014-09-29 11:03:33 +0000
24	@@ -25,12 +25,13 @@
25	25	#include <QList>	25	#include <QList>
26	26	#include <QMap>	26	#include <QMap>
27	27	#include <QSet>	27	#include <QSet>
28	28	#include <QSettings>
29	29	#include <QStandardPaths>	28	#include <QStandardPaths>
30	30		29
31	31	#include <core/trust/resolve.h>	30	#include <core/trust/resolve.h>
32	32	#include <core/trust/store.h>	31	#include <core/trust/store.h>
33	33		32
34			33	#include <glib.h>
35			34
36	34	class Application	35	class Application
37	35	{	36	{
38	36	public:	37	public:
39	@@ -39,12 +40,41 @@
40	39	void setId(const QString &id) {	40	void setId(const QString &id) {
41	40	this->id = id;	41	this->id = id;
42	41		42
43			43	GKeyFile *desktopInfo = g_key_file_new();
44	42	QString desktopFilename = resolveDesktopFilename(id);	44	QString desktopFilename = resolveDesktopFilename(id);
50	43	QSettings desktopFile(desktopFilename, QSettings::IniFormat);	45
51	44	desktopFile.beginGroup("Desktop Entry");	46	gboolean loaded = g_key_file_load_from_file(desktopInfo,
52	45	displayName = desktopFile.value("Name").toString();	47	desktopFilename.toUtf8().data(),
53	46	iconName = resolveIcon(desktopFile.value("Icon").toString(),	48	G_KEY_FILE_NONE,
54	47	desktopFile.value("Path").toString());	49	nullptr);
55			50
56			51	if (!loaded) {
57			52	g_warning("Couldn't parse the desktop: %s", desktopFilename.toUtf8().data());
58			53	g_key_file_free(desktopInfo);
59			54	return;
60			55	}
61			56
62			57	gchar *name = g_key_file_get_locale_string(desktopInfo,
63			58	G_KEY_FILE_DESKTOP_GROUP,
64			59	G_KEY_FILE_DESKTOP_KEY_NAME,
65			60	nullptr,
66			61	nullptr);
67			62	displayName = QString::fromUtf8(name);
68			63
69			64	gchar *icon = g_key_file_get_string(desktopInfo,
70			65	G_KEY_FILE_DESKTOP_GROUP,
71			66	G_KEY_FILE_DESKTOP_KEY_ICON,
72			67	nullptr);
73			68	gchar *path = g_key_file_get_string(desktopInfo,
74			69	G_KEY_FILE_DESKTOP_GROUP,
75			70	G_KEY_FILE_DESKTOP_KEY_PATH,
76			71	nullptr);
77			72	iconName = resolveIcon(QString::fromUtf8(icon),
78			73	QString::fromUtf8(path));
79			74	g_free(name);
80			75	g_free(icon);
81			76	g_free(path);
82			77	g_key_file_free(desktopInfo);
83	48	}	78	}
84	49		79
85	50	QString resolveDesktopFilename(const QString &id) {	80	QString resolveDesktopFilename(const QString &id) {
86	51		81
87	=== modified file 'tests/plugins/security-privacy/CMakeLists.txt'
88	--- tests/plugins/security-privacy/CMakeLists.txt 2014-08-18 07:50:41 +0000
89	+++ tests/plugins/security-privacy/CMakeLists.txt 2014-09-29 11:03:33 +0000
90	@@ -1,11 +1,11 @@
91	1	set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")	1	set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
93	2	include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy)	2	include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy ${GLIB_INCLUDE_DIRS})
94	3	add_definitions(-DTESTS)	3	add_definitions(-DTESTS)
95	4		4
96	5	add_executable(tst-trust-store-model	5	add_executable(tst-trust-store-model
97	6	tst_trust_store_model.cpp	6	tst_trust_store_model.cpp
98	7	../../../plugins/security-privacy/trust-store-model.cpp	7	../../../plugins/security-privacy/trust-store-model.cpp
99	8	)	8	)
101	9		9	target_link_libraries (tst-trust-store-model ${GLIB_LDFLAGS})
102	10	qt5_use_modules(tst-trust-store-model Core Gui DBus Qml Test)	10	qt5_use_modules(tst-trust-store-model Core Gui DBus Qml Test)
103	11	add_test(NAME tst-trust-store-model COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-trust-store-model)	11	add_test(NAME tst-trust-store-model COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-trust-store-model)