Merge lp:~artmello/ubuntu-push/ubuntu-push-fix_1611848 into lp:ubuntu-push

Proposed by Arthur Mello on 2016-08-12
Status: Merged
Approved by: Jonas G. Drange on 2016-08-25
Approved revision: 169
Merged at revision: 171
Proposed branch: lp:~artmello/ubuntu-push/ubuntu-push-fix_1611848
Merge into: lp:ubuntu-push
Diff against target: 20 lines (+2/-1)
1 file modified
click/cnotificationsettings/cnotificationsettings.go (+2/-1)
To merge this branch: bzr merge lp:~artmello/ubuntu-push/ubuntu-push-fix_1611848
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) 2016-08-12 Approve on 2016-08-25
system-apps-ci-bot continuous-integration Needs Fixing on 2016-08-12
Review via email: mp+302857@code.launchpad.net

Commit message

Fix check for empty package name when receiving notifications from legacy deb apps

Description of the change

Fix check for empty package name when receiving notifications from legacy deb apps

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/cnotificationsettings/cnotificationsettings.go'
2--- click/cnotificationsettings/cnotificationsettings.go 2016-07-08 17:05:38 +0000
3+++ click/cnotificationsettings/cnotificationsettings.go 2016-08-12 21:15:58 +0000
4@@ -23,6 +23,7 @@
5 #cgo pkg-config: glib-2.0
6
7 #include <stdlib.h>
8+#include <string.h>
9 #include <gio/gio.h>
10
11 #define NOTIFICATION_APPS_SETTINGS_SCHEMA_ID "com.ubuntu.notifications.settings.applications"
12@@ -73,7 +74,7 @@
13 }
14
15 // Define notifications settings GSettings path
16- if (pkgname == "") {
17+ if (strcmp(pkgname, "") == 0) {
18 // Use "dpkg" as package name for legacy apps
19 path = g_strconcat(SETTINGS_BASE_PATH, "dpkg/", appname, "/", NULL);
20 } else {

Subscribers

People subscribed via source and target branches